[Project64] Cleanup ProfilingClass.cpp
This commit is contained in:
zilmar
parent
50df137466
commit
cf2d34fed3
|
|
@ -14,176 +14,176 @@
|
|||
|
||||
enum { MAX_FRAMES = 13 };
|
||||
|
||||
CProfiling::CProfiling () :
|
||||
m_CurrentTimerAddr(Timer_None),
|
||||
m_CurrentDisplayCount(MAX_FRAMES),
|
||||
m_StartTimeHi(0),
|
||||
m_StartTimeLo(0)
|
||||
CProfiling::CProfiling() :
|
||||
m_CurrentTimerAddr(Timer_None),
|
||||
m_CurrentDisplayCount(MAX_FRAMES),
|
||||
m_StartTimeHi(0),
|
||||
m_StartTimeLo(0)
|
||||
{
|
||||
}
|
||||
|
||||
SPECIAL_TIMERS CProfiling::StartTimer(SPECIAL_TIMERS Address)
|
||||
SPECIAL_TIMERS CProfiling::StartTimer(SPECIAL_TIMERS Address)
|
||||
{
|
||||
SPECIAL_TIMERS OldTimerAddr = StopTimer();
|
||||
m_CurrentTimerAddr = Address;
|
||||
SPECIAL_TIMERS OldTimerAddr = StopTimer();
|
||||
m_CurrentTimerAddr = Address;
|
||||
|
||||
#ifdef _M_IX86
|
||||
uint32_t HiValue, LoValue;
|
||||
_asm
|
||||
{
|
||||
pushad
|
||||
rdtsc
|
||||
mov HiValue, edx
|
||||
mov LoValue, eax
|
||||
popad
|
||||
}
|
||||
m_StartTimeHi = HiValue;
|
||||
m_StartTimeLo = LoValue;
|
||||
pushad
|
||||
rdtsc
|
||||
mov HiValue, edx
|
||||
mov LoValue, eax
|
||||
popad
|
||||
}
|
||||
m_StartTimeHi = HiValue;
|
||||
m_StartTimeLo = LoValue;
|
||||
#else
|
||||
g_Notify->BreakPoint(__FILE__, __LINE__);
|
||||
g_Notify->BreakPoint(__FILE__, __LINE__);
|
||||
#endif
|
||||
return OldTimerAddr;
|
||||
return OldTimerAddr;
|
||||
}
|
||||
|
||||
SPECIAL_TIMERS CProfiling::StopTimer() {
|
||||
uint32_t HiValue, LoValue;
|
||||
|
||||
if (m_CurrentTimerAddr == Timer_None) { return m_CurrentTimerAddr; }
|
||||
|
||||
if (m_CurrentTimerAddr == Timer_None) { return m_CurrentTimerAddr; }
|
||||
|
||||
#ifdef _M_IX86
|
||||
_asm {
|
||||
pushad
|
||||
rdtsc
|
||||
mov HiValue, edx
|
||||
mov LoValue, eax
|
||||
popad
|
||||
}
|
||||
_asm {
|
||||
pushad
|
||||
rdtsc
|
||||
mov HiValue, edx
|
||||
mov LoValue, eax
|
||||
popad
|
||||
}
|
||||
#else
|
||||
g_Notify->BreakPoint(__FILE__, __LINE__);
|
||||
g_Notify->BreakPoint(__FILE__, __LINE__);
|
||||
#endif
|
||||
|
||||
int64_t StopTime = ((uint64_t)HiValue << 32) + (uint64_t)LoValue;
|
||||
int64_t StopTime = ((uint64_t)HiValue << 32) + (uint64_t)LoValue;
|
||||
int64_t StartTime = ((uint64_t)m_StartTimeHi << 32) + (uint64_t)m_StartTimeLo;
|
||||
int64_t TimeTaken = StopTime - StartTime;
|
||||
|
||||
PROFILE_ENRTY Entry = m_Entries.find(m_CurrentTimerAddr);
|
||||
if (Entry != m_Entries.end()) {
|
||||
Entry->second += TimeTaken;
|
||||
} else {
|
||||
m_Entries.insert(PROFILE_ENRTIES::value_type(m_CurrentTimerAddr,TimeTaken));
|
||||
}
|
||||
|
||||
SPECIAL_TIMERS OldTimerAddr = m_CurrentTimerAddr;
|
||||
m_CurrentTimerAddr = Timer_None;
|
||||
return OldTimerAddr;
|
||||
PROFILE_ENRTY Entry = m_Entries.find(m_CurrentTimerAddr);
|
||||
if (Entry != m_Entries.end()) {
|
||||
Entry->second += TimeTaken;
|
||||
}
|
||||
else {
|
||||
m_Entries.insert(PROFILE_ENRTIES::value_type(m_CurrentTimerAddr, TimeTaken));
|
||||
}
|
||||
|
||||
SPECIAL_TIMERS OldTimerAddr = m_CurrentTimerAddr;
|
||||
m_CurrentTimerAddr = Timer_None;
|
||||
return OldTimerAddr;
|
||||
}
|
||||
|
||||
void CProfiling::ShowCPU_Usage() {
|
||||
int64_t TotalTime, CPU = 0, Alist = 0, Dlist = 0, Idle = 0;
|
||||
PROFILE_ENRTY Entry;
|
||||
|
||||
if (m_CurrentDisplayCount > 0) { m_CurrentDisplayCount -= 1; return; }
|
||||
m_CurrentDisplayCount = MAX_FRAMES;
|
||||
PROFILE_ENRTY Entry;
|
||||
|
||||
Entry = m_Entries.find(Timer_R4300);
|
||||
if (Entry != m_Entries.end()) { CPU = Entry->second; }
|
||||
if (m_CurrentDisplayCount > 0) { m_CurrentDisplayCount -= 1; return; }
|
||||
m_CurrentDisplayCount = MAX_FRAMES;
|
||||
|
||||
Entry = m_Entries.find(Timer_RefreshScreen);
|
||||
if (Entry != m_Entries.end()) { CPU += Entry->second; }
|
||||
Entry = m_Entries.find(Timer_R4300);
|
||||
if (Entry != m_Entries.end()) { CPU = Entry->second; }
|
||||
|
||||
Entry = m_Entries.find(Timer_RSP_Dlist);
|
||||
if (Entry != m_Entries.end()) { Dlist = Entry->second; }
|
||||
|
||||
Entry = m_Entries.find(Timer_UpdateScreen);
|
||||
if (Entry != m_Entries.end()) { Dlist += Entry->second; }
|
||||
Entry = m_Entries.find(Timer_RefreshScreen);
|
||||
if (Entry != m_Entries.end()) { CPU += Entry->second; }
|
||||
|
||||
Entry = m_Entries.find(Timer_RSP_Alist);
|
||||
if (Entry != m_Entries.end()) { Alist = Entry->second; }
|
||||
Entry = m_Entries.find(Timer_RSP_Dlist);
|
||||
if (Entry != m_Entries.end()) { Dlist = Entry->second; }
|
||||
|
||||
Entry = m_Entries.find(Timer_Idel);
|
||||
if (Entry != m_Entries.end()) { Idle = Entry->second; }
|
||||
Entry = m_Entries.find(Timer_UpdateScreen);
|
||||
if (Entry != m_Entries.end()) { Dlist += Entry->second; }
|
||||
|
||||
Entry = m_Entries.find(Timer_RSP_Alist);
|
||||
if (Entry != m_Entries.end()) { Alist = Entry->second; }
|
||||
|
||||
TotalTime = CPU + Alist + Dlist + Idle;
|
||||
Entry = m_Entries.find(Timer_Idel);
|
||||
if (Entry != m_Entries.end()) { Idle = Entry->second; }
|
||||
|
||||
g_Notify->DisplayMessage(0,stdstr_f("r4300i: %0.1f%c GFX: %0.1f%c Alist: %0.1f%c Idle: %0.1f%c",
|
||||
(float)(((double)CPU / (double)TotalTime) * 100),'%',
|
||||
(float)(((double)Dlist / (double)TotalTime) * 100),'%',
|
||||
(float)(((double)Alist / (double)TotalTime) * 100),'%',
|
||||
(float)(((double)Idle / (double)TotalTime) * 100),'%').ToUTF16().c_str());
|
||||
TotalTime = CPU + Alist + Dlist + Idle;
|
||||
|
||||
ResetCounters();
|
||||
g_Notify->DisplayMessage(0, stdstr_f("r4300i: %0.1f%c GFX: %0.1f%c Alist: %0.1f%c Idle: %0.1f%c",
|
||||
(float)(((double)CPU / (double)TotalTime) * 100), '%',
|
||||
(float)(((double)Dlist / (double)TotalTime) * 100), '%',
|
||||
(float)(((double)Alist / (double)TotalTime) * 100), '%',
|
||||
(float)(((double)Idle / (double)TotalTime) * 100), '%').ToUTF16().c_str());
|
||||
|
||||
ResetCounters();
|
||||
}
|
||||
|
||||
void CProfiling::ResetCounters() {
|
||||
m_Entries.clear();
|
||||
m_Entries.clear();
|
||||
}
|
||||
|
||||
struct TIMER_NAME {
|
||||
SPECIAL_TIMERS Timer;
|
||||
char * Name;
|
||||
SPECIAL_TIMERS Timer;
|
||||
char * Name;
|
||||
};
|
||||
|
||||
void CProfiling::GenerateLog() {
|
||||
stdstr LogFileName;
|
||||
{
|
||||
CLog Log;
|
||||
Log.Open("Profiling.txt");
|
||||
LogFileName = Log.FileName();
|
||||
stdstr LogFileName;
|
||||
{
|
||||
CLog Log;
|
||||
Log.Open("Profiling.txt");
|
||||
LogFileName = Log.FileName();
|
||||
|
||||
//Get the total time
|
||||
//Get the total time
|
||||
int64_t TotalTime = 0;
|
||||
for (PROFILE_ENRTY itemTime = m_Entries.begin(); itemTime != m_Entries.end(); itemTime++ ) {
|
||||
TotalTime += itemTime->second;
|
||||
}
|
||||
for (PROFILE_ENRTY itemTime = m_Entries.begin(); itemTime != m_Entries.end(); itemTime++) {
|
||||
TotalTime += itemTime->second;
|
||||
}
|
||||
|
||||
//Create a sortable list of items
|
||||
std::vector<PROFILE_VALUE *> ItemList;
|
||||
for (PROFILE_ENRTY Entry = m_Entries.begin(); Entry != m_Entries.end(); Entry++ ) {
|
||||
ItemList.push_back(&(*Entry));
|
||||
}
|
||||
|
||||
//sort the list with a basic bubble sort
|
||||
for (size_t OuterPass = 0; OuterPass < (ItemList.size() - 1); OuterPass++ ) {
|
||||
for (size_t InnerPass = 0; InnerPass < (ItemList.size() - 1); InnerPass++ ) {
|
||||
if (ItemList[InnerPass]->second < ItemList[InnerPass + 1]->second) {
|
||||
PROFILE_VALUE * TempPtr = ItemList[InnerPass];
|
||||
ItemList[InnerPass] = ItemList[InnerPass + 1];
|
||||
ItemList[InnerPass + 1] = TempPtr;
|
||||
}
|
||||
}
|
||||
}
|
||||
//Create a sortable list of items
|
||||
std::vector<PROFILE_VALUE *> ItemList;
|
||||
for (PROFILE_ENRTY Entry = m_Entries.begin(); Entry != m_Entries.end(); Entry++) {
|
||||
ItemList.push_back(&(*Entry));
|
||||
}
|
||||
|
||||
TIMER_NAME TimerNames[] = {
|
||||
{Timer_R4300, "R4300"},
|
||||
{Timer_RSP_Dlist, "RSP: Dlist"},
|
||||
{Timer_RSP_Alist, "RSP: Alist"},
|
||||
{Timer_RSP_Unknown, "RSP: Unknown"},
|
||||
{Timer_RefreshScreen, "Refresh Screen"},
|
||||
{Timer_UpdateScreen, "Update Screen"},
|
||||
{Timer_UpdateFPS, "Update FPS"},
|
||||
{Timer_FuncLookup, "Function Lookup"},
|
||||
{Timer_Done, "Timer_Done"},
|
||||
{Timer_GetBlockInfo, "Timer_GetBlockInfo"},
|
||||
{Timer_AnalyseBlock, "Timer_AnalyseBlock"},
|
||||
{Timer_CompileBlock, "Timer_CompileBlock"},
|
||||
{Timer_CompileDone, "Timer_CompileDone"},
|
||||
};
|
||||
|
||||
for (size_t count =0; count < ItemList.size(); count++ ) {
|
||||
char Buffer[255];
|
||||
double CpuUsage = ((double)ItemList[count]->second / (double)TotalTime) * 100;
|
||||
if (CpuUsage <= 0.2) { continue; }
|
||||
sprintf(Buffer,"Func 0x%08X",ItemList[count]->first);
|
||||
for (int NameID = 0; NameID < (sizeof(TimerNames) / sizeof(TIMER_NAME)); NameID++) {
|
||||
if (ItemList[count]->first == TimerNames[NameID].Timer) {
|
||||
strcpy(Buffer,TimerNames[NameID].Name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
Log.LogF("%s\t%2.2f",Buffer, CpuUsage);
|
||||
}
|
||||
}
|
||||
//sort the list with a basic bubble sort
|
||||
for (size_t OuterPass = 0; OuterPass < (ItemList.size() - 1); OuterPass++) {
|
||||
for (size_t InnerPass = 0; InnerPass < (ItemList.size() - 1); InnerPass++) {
|
||||
if (ItemList[InnerPass]->second < ItemList[InnerPass + 1]->second) {
|
||||
PROFILE_VALUE * TempPtr = ItemList[InnerPass];
|
||||
ItemList[InnerPass] = ItemList[InnerPass + 1];
|
||||
ItemList[InnerPass + 1] = TempPtr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ResetCounters();
|
||||
}
|
||||
TIMER_NAME TimerNames[] = {
|
||||
{ Timer_R4300, "R4300" },
|
||||
{ Timer_RSP_Dlist, "RSP: Dlist" },
|
||||
{ Timer_RSP_Alist, "RSP: Alist" },
|
||||
{ Timer_RSP_Unknown, "RSP: Unknown" },
|
||||
{ Timer_RefreshScreen, "Refresh Screen" },
|
||||
{ Timer_UpdateScreen, "Update Screen" },
|
||||
{ Timer_UpdateFPS, "Update FPS" },
|
||||
{ Timer_FuncLookup, "Function Lookup" },
|
||||
{ Timer_Done, "Timer_Done" },
|
||||
{ Timer_GetBlockInfo, "Timer_GetBlockInfo" },
|
||||
{ Timer_AnalyseBlock, "Timer_AnalyseBlock" },
|
||||
{ Timer_CompileBlock, "Timer_CompileBlock" },
|
||||
{ Timer_CompileDone, "Timer_CompileDone" },
|
||||
};
|
||||
|
||||
for (size_t count = 0; count < ItemList.size(); count++) {
|
||||
char Buffer[255];
|
||||
double CpuUsage = ((double)ItemList[count]->second / (double)TotalTime) * 100;
|
||||
if (CpuUsage <= 0.2) { continue; }
|
||||
sprintf(Buffer, "Func 0x%08X", ItemList[count]->first);
|
||||
for (int NameID = 0; NameID < (sizeof(TimerNames) / sizeof(TIMER_NAME)); NameID++) {
|
||||
if (ItemList[count]->first == TimerNames[NameID].Timer) {
|
||||
strcpy(Buffer, TimerNames[NameID].Name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
Log.LogF("%s\t%2.2f", Buffer, CpuUsage);
|
||||
}
|
||||
}
|
||||
|
||||
ResetCounters();
|
||||
}
|
||||
|
|
@ -18,27 +18,27 @@ typedef PROFILE_ENRTIES::value_type PROFILE_VALUE;
|
|||
class CProfiling
|
||||
{
|
||||
public:
|
||||
CProfiling();
|
||||
|
||||
//recording timing against current timer, returns the address of the timer stopped
|
||||
SPECIAL_TIMERS StartTimer(SPECIAL_TIMERS Address);
|
||||
SPECIAL_TIMERS StopTimer();
|
||||
CProfiling();
|
||||
|
||||
//Display the CPU Usage
|
||||
void ShowCPU_Usage();
|
||||
//recording timing against current timer, returns the address of the timer stopped
|
||||
SPECIAL_TIMERS StartTimer(SPECIAL_TIMERS Address);
|
||||
SPECIAL_TIMERS StopTimer();
|
||||
|
||||
//Reset all the counters back to 0
|
||||
void ResetCounters();
|
||||
//Display the CPU Usage
|
||||
void ShowCPU_Usage();
|
||||
|
||||
//Generate a log file with the current results, this will also reset the counters
|
||||
void GenerateLog();
|
||||
//Reset all the counters back to 0
|
||||
void ResetCounters();
|
||||
|
||||
//Generate a log file with the current results, this will also reset the counters
|
||||
void GenerateLog();
|
||||
|
||||
private:
|
||||
CProfiling(const CProfiling&); // Disable copy constructor
|
||||
CProfiling& operator=(const CProfiling&); // Disable assignment
|
||||
CProfiling(const CProfiling&); // Disable copy constructor
|
||||
CProfiling& operator=(const CProfiling&); // Disable assignment
|
||||
|
||||
SPECIAL_TIMERS m_CurrentTimerAddr;
|
||||
uint32_t m_CurrentDisplayCount;
|
||||
uint32_t m_StartTimeHi, m_StartTimeLo; //The Current Timer start time
|
||||
PROFILE_ENRTIES m_Entries;
|
||||
SPECIAL_TIMERS m_CurrentTimerAddr;
|
||||
uint32_t m_CurrentDisplayCount;
|
||||
uint32_t m_StartTimeHi, m_StartTimeLo; //The Current Timer start time
|
||||
PROFILE_ENRTIES m_Entries;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue