From e3fbe48f7cc3b52431d66ebedf1a583a4ef8de1e Mon Sep 17 00:00:00 2001 From: lioncash Date: Thu, 2 Dec 2021 23:56:53 -0500 Subject: [PATCH 1/4] JitSymbols: Make use of unique_ptr Ensures that the FILE pointer will always be handled. --- External/FEXCore/Source/Common/JitSymbols.cpp | 20 ++++++++----------- External/FEXCore/Source/Common/JitSymbols.h | 7 ++++++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/External/FEXCore/Source/Common/JitSymbols.cpp b/External/FEXCore/Source/Common/JitSymbols.cpp index fd3037c47..2355bbff7 100644 --- a/External/FEXCore/Source/Common/JitSymbols.cpp +++ b/External/FEXCore/Source/Common/JitSymbols.cpp @@ -5,22 +5,18 @@ #include namespace FEXCore { - JITSymbols::JITSymbols() { + JITSymbols::JITSymbols() : fp{nullptr, std::fclose} { std::stringstream PerfMap; PerfMap << "/tmp/perf-" << getpid() << ".map"; - fp = fopen(PerfMap.str().c_str(), "wb"); + fp.reset(fopen(PerfMap.str().c_str(), "wb")); if (fp) { // Disable buffering on this file - setvbuf(fp, nullptr, _IONBF, 0); + setvbuf(fp.get(), nullptr, _IONBF, 0); } } - JITSymbols::~JITSymbols() { - if (fp) { - fclose(fp); - } - } + JITSymbols::~JITSymbols() = default; void JITSymbols::Register(void *HostAddr, uint64_t GuestAddr, uint32_t CodeSize) { if (!fp) return; @@ -29,7 +25,7 @@ namespace FEXCore { // ` \n` std::stringstream String; String << std::hex << HostAddr << " " << CodeSize << " " << "JIT_0x" << GuestAddr << "_" << HostAddr << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp); + fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); } void JITSymbols::Register(void *HostAddr, uint32_t CodeSize, std::string const &Name) { @@ -39,7 +35,7 @@ namespace FEXCore { // ` \n` std::stringstream String; String << std::hex << HostAddr << " " << CodeSize << " " << Name << "_" << HostAddr << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp); + fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); } void JITSymbols::RegisterNamedRegion(void *HostAddr, uint32_t CodeSize, std::string const &Name) { @@ -49,7 +45,7 @@ namespace FEXCore { // ` \n` std::stringstream String; String << std::hex << HostAddr << " " << CodeSize << " " << Name << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp); + fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); } void JITSymbols::RegisterJITSpace(void *HostAddr, uint32_t CodeSize) { @@ -59,7 +55,7 @@ namespace FEXCore { // ` \n` std::stringstream String; String << std::hex << HostAddr << " " << CodeSize << " FEXJIT" << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp); + fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); } } diff --git a/External/FEXCore/Source/Common/JitSymbols.h b/External/FEXCore/Source/Common/JitSymbols.h index 52e120cda..3f649cc8a 100644 --- a/External/FEXCore/Source/Common/JitSymbols.h +++ b/External/FEXCore/Source/Common/JitSymbols.h @@ -1,6 +1,8 @@ #pragma once + #include #include +#include #include namespace FEXCore { @@ -8,12 +10,15 @@ class JITSymbols final { public: JITSymbols(); ~JITSymbols(); + void Register(void *HostAddr, uint64_t GuestAddr, uint32_t CodeSize); void Register(void *HostAddr, uint32_t CodeSize, std::string const &Name); void RegisterNamedRegion(void *HostAddr, uint32_t CodeSize, std::string const &Name); void RegisterJITSpace(void *HostAddr, uint32_t CodeSize); private: - FILE* fp{}; + using FILEPtr = std::unique_ptr; + + FILEPtr fp; }; } From 69413d51bfe80c47f10bd3fe9122d56b7cf42e21 Mon Sep 17 00:00:00 2001 From: lioncash Date: Fri, 3 Dec 2021 02:35:05 -0500 Subject: [PATCH 2/4] JitSymbols: Make use of fmt Makes the constructed strings a little quicker to read. --- External/FEXCore/Source/Common/JitSymbols.cpp | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/External/FEXCore/Source/Common/JitSymbols.cpp b/External/FEXCore/Source/Common/JitSymbols.cpp index 2355bbff7..ad013bf25 100644 --- a/External/FEXCore/Source/Common/JitSymbols.cpp +++ b/External/FEXCore/Source/Common/JitSymbols.cpp @@ -1,15 +1,15 @@ #include "Common/JitSymbols.h" #include -#include #include +#include + namespace FEXCore { JITSymbols::JITSymbols() : fp{nullptr, std::fclose} { - std::stringstream PerfMap; - PerfMap << "/tmp/perf-" << getpid() << ".map"; + const auto PerfMap = fmt::format("/tmp/perf-{}.map", getpid()); - fp.reset(fopen(PerfMap.str().c_str(), "wb")); + fp.reset(fopen(PerfMap.c_str(), "wb")); if (fp) { // Disable buffering on this file setvbuf(fp.get(), nullptr, _IONBF, 0); @@ -23,9 +23,7 @@ namespace FEXCore { // Linux perf format is very straightforward // ` \n` - std::stringstream String; - String << std::hex << HostAddr << " " << CodeSize << " " << "JIT_0x" << GuestAddr << "_" << HostAddr << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); + fmt::print(fp.get(), "{:x} {:x} JIT_0x{:x}_{:x}\n", HostAddr, CodeSize, GuestAddr, HostAddr); } void JITSymbols::Register(void *HostAddr, uint32_t CodeSize, std::string const &Name) { @@ -33,9 +31,7 @@ namespace FEXCore { // Linux perf format is very straightforward // ` \n` - std::stringstream String; - String << std::hex << HostAddr << " " << CodeSize << " " << Name << "_" << HostAddr << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); + fmt::print(fp.get(), "{:x} {:x} {}_{:x}\n", HostAddr, CodeSize, Name, HostAddr); } void JITSymbols::RegisterNamedRegion(void *HostAddr, uint32_t CodeSize, std::string const &Name) { @@ -43,9 +39,7 @@ namespace FEXCore { // Linux perf format is very straightforward // ` \n` - std::stringstream String; - String << std::hex << HostAddr << " " << CodeSize << " " << Name << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); + fmt::print(fp.get(), "{:x} {:x} {}\n", HostAddr, CodeSize, Name); } void JITSymbols::RegisterJITSpace(void *HostAddr, uint32_t CodeSize) { @@ -53,10 +47,7 @@ namespace FEXCore { // Linux perf format is very straightforward // ` \n` - std::stringstream String; - String << std::hex << HostAddr << " " << CodeSize << " FEXJIT" << std::endl; - fwrite(String.str().c_str(), 1, String.str().size(), fp.get()); + fmt::print(fp.get(), "{:x} {:x} FEXJIT\n", HostAddr, CodeSize); } -} - +} // namespace FEXCore From 2b190f1713223e54d92f3e6f1bc524fb9150fbea Mon Sep 17 00:00:00 2001 From: lioncash Date: Fri, 3 Dec 2021 02:37:59 -0500 Subject: [PATCH 3/4] JitSymbols: Make HostAddr const We can seamlessly format const pointers, so we can allow this in the interface. --- External/FEXCore/Source/Common/JitSymbols.cpp | 8 ++++---- External/FEXCore/Source/Common/JitSymbols.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/External/FEXCore/Source/Common/JitSymbols.cpp b/External/FEXCore/Source/Common/JitSymbols.cpp index ad013bf25..4ae9946ed 100644 --- a/External/FEXCore/Source/Common/JitSymbols.cpp +++ b/External/FEXCore/Source/Common/JitSymbols.cpp @@ -18,7 +18,7 @@ namespace FEXCore { JITSymbols::~JITSymbols() = default; - void JITSymbols::Register(void *HostAddr, uint64_t GuestAddr, uint32_t CodeSize) { + void JITSymbols::Register(const void *HostAddr, uint64_t GuestAddr, uint32_t CodeSize) { if (!fp) return; // Linux perf format is very straightforward @@ -26,7 +26,7 @@ namespace FEXCore { fmt::print(fp.get(), "{:x} {:x} JIT_0x{:x}_{:x}\n", HostAddr, CodeSize, GuestAddr, HostAddr); } - void JITSymbols::Register(void *HostAddr, uint32_t CodeSize, std::string const &Name) { + void JITSymbols::Register(const void *HostAddr, uint32_t CodeSize, std::string const &Name) { if (!fp) return; // Linux perf format is very straightforward @@ -34,7 +34,7 @@ namespace FEXCore { fmt::print(fp.get(), "{:x} {:x} {}_{:x}\n", HostAddr, CodeSize, Name, HostAddr); } - void JITSymbols::RegisterNamedRegion(void *HostAddr, uint32_t CodeSize, std::string const &Name) { + void JITSymbols::RegisterNamedRegion(const void *HostAddr, uint32_t CodeSize, std::string const &Name) { if (!fp) return; // Linux perf format is very straightforward @@ -42,7 +42,7 @@ namespace FEXCore { fmt::print(fp.get(), "{:x} {:x} {}\n", HostAddr, CodeSize, Name); } - void JITSymbols::RegisterJITSpace(void *HostAddr, uint32_t CodeSize) { + void JITSymbols::RegisterJITSpace(const void *HostAddr, uint32_t CodeSize) { if (!fp) return; // Linux perf format is very straightforward diff --git a/External/FEXCore/Source/Common/JitSymbols.h b/External/FEXCore/Source/Common/JitSymbols.h index 3f649cc8a..b9765ef20 100644 --- a/External/FEXCore/Source/Common/JitSymbols.h +++ b/External/FEXCore/Source/Common/JitSymbols.h @@ -11,10 +11,10 @@ public: JITSymbols(); ~JITSymbols(); - void Register(void *HostAddr, uint64_t GuestAddr, uint32_t CodeSize); - void Register(void *HostAddr, uint32_t CodeSize, std::string const &Name); - void RegisterNamedRegion(void *HostAddr, uint32_t CodeSize, std::string const &Name); - void RegisterJITSpace(void *HostAddr, uint32_t CodeSize); + void Register(const void *HostAddr, uint64_t GuestAddr, uint32_t CodeSize); + void Register(const void *HostAddr, uint32_t CodeSize, std::string const &Name); + void RegisterNamedRegion(const void *HostAddr, uint32_t CodeSize, std::string const &Name); + void RegisterJITSpace(const void *HostAddr, uint32_t CodeSize); private: using FILEPtr = std::unique_ptr; From ec8f077e603b754f6c27b72305e0c892abff56f6 Mon Sep 17 00:00:00 2001 From: lioncash Date: Fri, 3 Dec 2021 02:40:32 -0500 Subject: [PATCH 4/4] JitSymbols: Take std::string_view instead of std::string Now that we're using fmt, we can make the API itself non-allocating and allow passing any kind of character buffer to it. --- External/FEXCore/Source/Common/JitSymbols.cpp | 4 ++-- External/FEXCore/Source/Common/JitSymbols.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/External/FEXCore/Source/Common/JitSymbols.cpp b/External/FEXCore/Source/Common/JitSymbols.cpp index 4ae9946ed..e85145922 100644 --- a/External/FEXCore/Source/Common/JitSymbols.cpp +++ b/External/FEXCore/Source/Common/JitSymbols.cpp @@ -26,7 +26,7 @@ namespace FEXCore { fmt::print(fp.get(), "{:x} {:x} JIT_0x{:x}_{:x}\n", HostAddr, CodeSize, GuestAddr, HostAddr); } - void JITSymbols::Register(const void *HostAddr, uint32_t CodeSize, std::string const &Name) { + void JITSymbols::Register(const void *HostAddr, uint32_t CodeSize, std::string_view Name) { if (!fp) return; // Linux perf format is very straightforward @@ -34,7 +34,7 @@ namespace FEXCore { fmt::print(fp.get(), "{:x} {:x} {}_{:x}\n", HostAddr, CodeSize, Name, HostAddr); } - void JITSymbols::RegisterNamedRegion(const void *HostAddr, uint32_t CodeSize, std::string const &Name) { + void JITSymbols::RegisterNamedRegion(const void *HostAddr, uint32_t CodeSize, std::string_view Name) { if (!fp) return; // Linux perf format is very straightforward diff --git a/External/FEXCore/Source/Common/JitSymbols.h b/External/FEXCore/Source/Common/JitSymbols.h index b9765ef20..afe394e28 100644 --- a/External/FEXCore/Source/Common/JitSymbols.h +++ b/External/FEXCore/Source/Common/JitSymbols.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include namespace FEXCore { class JITSymbols final { @@ -12,8 +12,8 @@ public: ~JITSymbols(); void Register(const void *HostAddr, uint64_t GuestAddr, uint32_t CodeSize); - void Register(const void *HostAddr, uint32_t CodeSize, std::string const &Name); - void RegisterNamedRegion(const void *HostAddr, uint32_t CodeSize, std::string const &Name); + void Register(const void *HostAddr, uint32_t CodeSize, std::string_view Name); + void RegisterNamedRegion(const void *HostAddr, uint32_t CodeSize, std::string_view Name); void RegisterJITSpace(const void *HostAddr, uint32_t CodeSize); private: