ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jit64: Inline the profiler calls.

This commit is contained in:
degasus 2017-08-12 21:09:27 +02:00
parent b073db51e5
commit 8ab34b1a3e
3 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -16,6 +16,7 @@
#include "Common/File.h" #include "Common/File.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MemoryUtil.h" #include "Common/MemoryUtil.h"
#include "Common/PerformanceCounter.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/x64ABI.h" #include "Common/x64ABI.h"
#include "Core/Core.h" #include "Core/Core.h"
@ -648,15 +649,17 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer* code_buf, JitBloc
} }
// Conditionally add profiling code. // Conditionally add profiling code.
b->ticCounter = 0;
b->ticStart = 0;
b->ticStop = 0;
if (Profiler::g_ProfileBlocks) if (Profiler::g_ProfileBlocks)
{ {
MOV(64, R(RSCRATCH), ImmPtr(&b->runCount)); MOV(64, R(RSCRATCH), ImmPtr(&b->runCount));
ADD(32, MatR(RSCRATCH), Imm8(1)); ADD(32, MatR(RSCRATCH), Imm8(1));
b->ticCounter = 0;
b->ticStart = 0;
b->ticStop = 0;
// get start tic // get start tic
PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStart); MOV(64, R(ABI_PARAM1), Imm64(reinterpret_cast<u64>(&b->ticStart)));
ABI_CallFunction(QueryPerformanceCounter);
} }
#if defined(_DEBUG) || defined(DEBUGFAST) || defined(NAN_CHECK) #if defined(_DEBUG) || defined(DEBUGFAST) || defined(NAN_CHECK)
// should help logged stack-traces become more accurate // should help logged stack-traces become more accurate
@ -734,12 +737,18 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer* code_buf, JitBloc
if (Profiler::g_ProfileBlocks) if (Profiler::g_ProfileBlocks)
{ {
// WARNING - cmp->branch merging will screw this up. // WARNING - cmp->branch merging will screw this up.
PROFILER_VPUSH; BitSet32 registersInUse = CallerSavedRegistersInUse();
ABI_PushRegistersAndAdjustStack(registersInUse, 0);
// get end tic // get end tic
PROFILER_QUERY_PERFORMANCE_COUNTER(&b->ticStop); MOV(64, R(ABI_PARAM1), Imm64(reinterpret_cast<u64>(&b->ticStop)));
ABI_CallFunction(QueryPerformanceCounter);
// tic counter += (end tic - start tic) // tic counter += (end tic - start tic)
PROFILER_UPDATE_TIME(b); MOV(64, R(RSCRATCH2), Imm64((u64)b));
PROFILER_VPOP; MOV(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticStop)));
SUB(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticStart)));
ADD(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticCounter)));
MOV(64, MDisp(RSCRATCH2, offsetof(struct JitBlock, ticCounter)), R(RSCRATCH));
ABI_PopRegistersAndAdjustStack(registersInUse, 0);
} }
js.isLastInstruction = true; js.isLastInstruction = true;
} }

1
Source/Core/Core/PowerPC/Profiler.cpp
View File

@ -5,6 +5,7 @@
#include "Core/PowerPC/Profiler.h" #include "Core/PowerPC/Profiler.h"
#include <string> #include <string>
#include "Common/PerformanceCounter.h"
#include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/JitInterface.h"
namespace Profiler namespace Profiler

31
Source/Core/Core/PowerPC/Profiler.h
View File

@ -10,37 +10,6 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/PerformanceCounter.h"
#if defined(_M_X86_64)
#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) \
MOV(64, R(ABI_PARAM1), Imm64(reinterpret_cast<u64>(pt))); \
ABI_CallFunction(QueryPerformanceCounter)
// block->ticCounter += block->ticStop - block->ticStart
#define PROFILER_UPDATE_TIME(block) \
MOV(64, R(RSCRATCH2), Imm64((u64)block)); \
MOV(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticStop))); \
SUB(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticStart))); \
ADD(64, R(RSCRATCH), MDisp(RSCRATCH2, offsetof(struct JitBlock, ticCounter))); \
MOV(64, MDisp(RSCRATCH2, offsetof(struct JitBlock, ticCounter)), R(RSCRATCH));
#define PROFILER_VPUSH \
BitSet32 registersInUse = CallerSavedRegistersInUse(); \
ABI_PushRegistersAndAdjustStack(registersInUse, 0);
#define PROFILER_VPOP ABI_PopRegistersAndAdjustStack(registersInUse, 0);
#else
#define PROFILER_QUERY_PERFORMANCE_COUNTER(pt)
#define PROFILER_UPDATE_TIME(b)
#define PROFILER_VPUSH
#define PROFILER_VPOP
#endif
struct BlockStat struct BlockStat
{ {
BlockStat(u32 _addr, u64 c, u64 ticks, u64 run, u32 size) BlockStat(u32 _addr, u64 c, u64 ticks, u64 run, u32 size)