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

Merge pull request #11810 from lioncash/jitreg 

Common/JitRegister: Move interface into Common namespace
This commit is contained in:
JosJuice 2023-05-03 17:43:01 +02:00 committed by GitHub
parent c6510f2bf4 4db186f9ff
commit 2319210d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/JitRegister.cpp
View File

@ -36,7 +36,7 @@ static op_agent_t s_agent = nullptr;
static File::IOFile s_perf_map_file; static File::IOFile s_perf_map_file;
namespace JitRegister namespace Common::JitRegister
{ {
static bool s_is_enabled = false; static bool s_is_enabled = false;
@ -108,4 +108,4 @@ void Register(const void* base_address, u32 code_size, const std::string& symbol
const auto entry = fmt::format("{} {:x} {}\n", fmt::ptr(base_address), code_size, symbol_name); const auto entry = fmt::format("{} {:x} {}\n", fmt::ptr(base_address), code_size, symbol_name);
s_perf_map_file.WriteBytes(entry.data(), entry.size()); s_perf_map_file.WriteBytes(entry.data(), entry.size());
} }
} // namespace JitRegister } // namespace Common::JitRegister

4
Source/Core/Common/JitRegister.h
View File

@ -9,7 +9,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
namespace JitRegister namespace Common::JitRegister
{ {
void Init(const std::string& perf_dir); void Init(const std::string& perf_dir);
void Shutdown(); void Shutdown();
@ -30,4 +30,4 @@ inline void Register(const void* start, const void* end, fmt::format_string<Args
u32 code_size = (u32)((const char*)end - (const char*)start); u32 code_size = (u32)((const char*)end - (const char*)start);
Register(start, code_size, fmt::format(format, std::forward<Args>(args)...)); Register(start, code_size, fmt::format(format, std::forward<Args>(args)...));
} }
} // namespace JitRegister } // namespace Common::JitRegister

2
Source/Core/Core/PowerPC/Jit64/JitAsm.cpp
View File

@ -209,7 +209,7 @@ void Jit64AsmRoutineManager::Generate()
ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8, 16); ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8, 16);
RET(); RET();
JitRegister::Register(enter_code, GetCodePtr(), "JIT_Loop"); Common::JitRegister::Register(enter_code, GetCodePtr(), "JIT_Loop");
GenerateCommon(); GenerateCommon();
} }

16
Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp
View File

@ -110,7 +110,7 @@ void CommonAsmRoutines::GenConvertDoubleToSingle()
OR(32, R(RSCRATCH), R(RSCRATCH2)); OR(32, R(RSCRATCH), R(RSCRATCH2));
RET(); RET();
JitRegister::Register(start, GetCodePtr(), "JIT_cdts"); Common::JitRegister::Register(start, GetCodePtr(), "JIT_cdts");
} }
void CommonAsmRoutines::GenFrsqrte() void CommonAsmRoutines::GenFrsqrte()
@ -213,7 +213,7 @@ void CommonAsmRoutines::GenFrsqrte()
ABI_PopRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8); ABI_PopRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8);
RET(); RET();
JitRegister::Register(start, GetCodePtr(), "JIT_Frsqrte"); Common::JitRegister::Register(start, GetCodePtr(), "JIT_Frsqrte");
} }
void CommonAsmRoutines::GenFres() void CommonAsmRoutines::GenFres()
@ -284,7 +284,7 @@ void CommonAsmRoutines::GenFres()
ABI_PopRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8); ABI_PopRegistersAndAdjustStack(QUANTIZED_REGS_TO_SAVE, 8);
RET(); RET();
JitRegister::Register(start, GetCodePtr(), "JIT_Fres"); Common::JitRegister::Register(start, GetCodePtr(), "JIT_Fres");
} }
void CommonAsmRoutines::GenMfcr() void CommonAsmRoutines::GenMfcr()
@ -325,7 +325,7 @@ void CommonAsmRoutines::GenMfcr()
} }
RET(); RET();
JitRegister::Register(start, GetCodePtr(), "JIT_Mfcr"); Common::JitRegister::Register(start, GetCodePtr(), "JIT_Mfcr");
} }
// Safe + Fast Quantizers, originally from JITIL by magumagu // Safe + Fast Quantizers, originally from JITIL by magumagu
@ -369,8 +369,8 @@ const u8* CommonAsmRoutines::GenQuantizedStoreRuntime(bool single, EQuantizeType
const u8* load = AlignCode4(); const u8* load = AlignCode4();
GenQuantizedStore(single, type, -1); GenQuantizedStore(single, type, -1);
RET(); RET();
JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedStore_{}_{}", static_cast<u32>(type), Common::JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedStore_{}_{}",
single); static_cast<u32>(type), single);
return load; return load;
} }
@ -401,8 +401,8 @@ const u8* CommonAsmRoutines::GenQuantizedLoadRuntime(bool single, EQuantizeType
const u8* load = AlignCode4(); const u8* load = AlignCode4();
GenQuantizedLoad(single, type, -1); GenQuantizedLoad(single, type, -1);
RET(); RET();
JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedLoad_{}_{}", static_cast<u32>(type), Common::JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedLoad_{}_{}",
single); static_cast<u32>(type), single);
return load; return load;
} }

4
Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp
View File

@ -48,7 +48,7 @@ const u8* TrampolineCache::GenerateReadTrampoline(const TrampolineInfo& info)
JMP(info.start + info.len, true); JMP(info.start + info.len, true);
JitRegister::Register(trampoline, GetCodePtr(), "JIT_ReadTrampoline_{:x}", info.pc); Common::JitRegister::Register(trampoline, GetCodePtr(), "JIT_ReadTrampoline_{:x}", info.pc);
return trampoline; return trampoline;
} }
@ -67,6 +67,6 @@ const u8* TrampolineCache::GenerateWriteTrampoline(const TrampolineInfo& info)
JMP(info.start + info.len, true); JMP(info.start + info.len, true);
JitRegister::Register(trampoline, GetCodePtr(), "JIT_WriteTrampoline_{:x}", info.pc); Common::JitRegister::Register(trampoline, GetCodePtr(), "JIT_WriteTrampoline_{:x}", info.pc);
return trampoline; return trampoline;
} }

16
Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
View File

@ -205,7 +205,7 @@ void JitArm64::GenerateAsm()
ABI_PopRegisters(regs_to_save); ABI_PopRegisters(regs_to_save);
RET(ARM64Reg::X30); RET(ARM64Reg::X30);
JitRegister::Register(enter_code, GetCodePtr(), "JIT_Dispatcher"); Common::JitRegister::Register(enter_code, GetCodePtr(), "JIT_Dispatcher");
GenerateCommonAsm(); GenerateCommonAsm();
@ -216,25 +216,25 @@ void JitArm64::GenerateCommonAsm()
{ {
GetAsmRoutines()->fres = GetCodePtr(); GetAsmRoutines()->fres = GetCodePtr();
GenerateFres(); GenerateFres();
JitRegister::Register(GetAsmRoutines()->fres, GetCodePtr(), "JIT_fres"); Common::JitRegister::Register(GetAsmRoutines()->fres, GetCodePtr(), "JIT_fres");
GetAsmRoutines()->frsqrte = GetCodePtr(); GetAsmRoutines()->frsqrte = GetCodePtr();
GenerateFrsqrte(); GenerateFrsqrte();
JitRegister::Register(GetAsmRoutines()->frsqrte, GetCodePtr(), "JIT_frsqrte"); Common::JitRegister::Register(GetAsmRoutines()->frsqrte, GetCodePtr(), "JIT_frsqrte");
GetAsmRoutines()->cdts = GetCodePtr(); GetAsmRoutines()->cdts = GetCodePtr();
GenerateConvertDoubleToSingle(); GenerateConvertDoubleToSingle();
JitRegister::Register(GetAsmRoutines()->cdts, GetCodePtr(), "JIT_cdts"); Common::JitRegister::Register(GetAsmRoutines()->cdts, GetCodePtr(), "JIT_cdts");
GetAsmRoutines()->cstd = GetCodePtr(); GetAsmRoutines()->cstd = GetCodePtr();
GenerateConvertSingleToDouble(); GenerateConvertSingleToDouble();
JitRegister::Register(GetAsmRoutines()->cstd, GetCodePtr(), "JIT_cstd"); Common::JitRegister::Register(GetAsmRoutines()->cstd, GetCodePtr(), "JIT_cstd");
GetAsmRoutines()->fprf_single = GetCodePtr(); GetAsmRoutines()->fprf_single = GetCodePtr();
GenerateFPRF(true); GenerateFPRF(true);
GetAsmRoutines()->fprf_double = GetCodePtr(); GetAsmRoutines()->fprf_double = GetCodePtr();
GenerateFPRF(false); GenerateFPRF(false);
JitRegister::Register(GetAsmRoutines()->fprf_single, GetCodePtr(), "JIT_FPRF"); Common::JitRegister::Register(GetAsmRoutines()->fprf_single, GetCodePtr(), "JIT_FPRF");
GenerateQuantizedLoads(); GenerateQuantizedLoads();
GenerateQuantizedStores(); GenerateQuantizedStores();
@ -677,7 +677,7 @@ void JitArm64::GenerateQuantizedLoads()
RET(ARM64Reg::X30); RET(ARM64Reg::X30);
} }
JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedLoad"); Common::JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedLoad");
paired_load_quantized = reinterpret_cast<const u8**>(AlignCode16()); paired_load_quantized = reinterpret_cast<const u8**>(AlignCode16());
ReserveCodeSpace(8 * sizeof(u8*)); ReserveCodeSpace(8 * sizeof(u8*));
@ -896,7 +896,7 @@ void JitArm64::GenerateQuantizedStores()
RET(ARM64Reg::X30); RET(ARM64Reg::X30);
} }
JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedStore"); Common::JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedStore");
paired_store_quantized = reinterpret_cast<const u8**>(AlignCode16()); paired_store_quantized = reinterpret_cast<const u8**>(AlignCode16());
ReserveCodeSpace(8 * sizeof(u8*)); ReserveCodeSpace(8 * sizeof(u8*));

10
Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
View File

@ -40,14 +40,14 @@ JitBaseBlockCache::~JitBaseBlockCache() = default;
void JitBaseBlockCache::Init() void JitBaseBlockCache::Init()
{ {
JitRegister::Init(Config::Get(Config::MAIN_PERF_MAP_DIR)); Common::JitRegister::Init(Config::Get(Config::MAIN_PERF_MAP_DIR));
Clear(); Clear();
} }
void JitBaseBlockCache::Shutdown() void JitBaseBlockCache::Shutdown()
{ {
JitRegister::Shutdown(); Common::JitRegister::Shutdown();
} }
// This clears the JIT cache. It's called from JitCache.cpp when the JIT cache // This clears the JIT cache. It's called from JitCache.cpp when the JIT cache
@ -129,15 +129,15 @@ void JitBaseBlockCache::FinalizeBlock(JitBlock& block, bool block_link,
} }
Common::Symbol* symbol = nullptr; Common::Symbol* symbol = nullptr;
if (JitRegister::IsEnabled() && if (Common::JitRegister::IsEnabled() &&
(symbol = g_symbolDB.GetSymbolFromAddr(block.effectiveAddress)) != nullptr) (symbol = g_symbolDB.GetSymbolFromAddr(block.effectiveAddress)) != nullptr)
{ {
JitRegister::Register(block.checkedEntry, block.codeSize, "JIT_PPC_{}_{:08x}", Common::JitRegister::Register(block.checkedEntry, block.codeSize, "JIT_PPC_{}_{:08x}",
symbol->function_name.c_str(), block.physicalAddress); symbol->function_name.c_str(), block.physicalAddress);
} }
else else
{ {
JitRegister::Register(block.checkedEntry, block.codeSize, "JIT_PPC_{:08x}", Common::JitRegister::Register(block.checkedEntry, block.codeSize, "JIT_PPC_{:08x}",
block.physicalAddress); block.physicalAddress);
} }
} }

4
Source/Core/VideoCommon/VertexLoaderX64.cpp
View File

@ -51,8 +51,8 @@ VertexLoaderX64::VertexLoaderX64(const TVtxDesc& vtx_desc, const VAT& vtx_att)
GenerateVertexLoader(); GenerateVertexLoader();
WriteProtect(); WriteProtect();
JitRegister::Register(region, GetCodePtr(), "VertexLoaderX64\nVtx desc: \n{}\nVAT:\n{}", vtx_desc, Common::JitRegister::Register(region, GetCodePtr(), "VertexLoaderX64\nVtx desc: \n{}\nVAT:\n{}",
vtx_att); vtx_desc, vtx_att);
} }
OpArg VertexLoaderX64::GetVertexAddr(CPArray array, VertexComponentFormat attribute) OpArg VertexLoaderX64::GetVertexAddr(CPArray array, VertexComponentFormat attribute)