From d4d7e9f5f632269be1258b5117454ac8605f351f Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Sat, 6 Jul 2024 10:27:57 +0300 Subject: [PATCH] removed hardware info seems make perfomance issues , will test something more lightweight --- .gitmodules | 3 --- CMakeLists.txt | 2 +- externals/CMakeLists.txt | 3 --- externals/hwinfo | 1 - src/emulator.cpp | 15 --------------- src/emulator.h | 1 - 6 files changed, 1 insertion(+), 24 deletions(-) delete mode 160000 externals/hwinfo diff --git a/.gitmodules b/.gitmodules index 5733f4fe..d6965722 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,6 +58,3 @@ [submodule "externals/tracy"] path = externals/tracy url = https://github.com/shadps4-emu/tracy.git -[submodule "externals/hwinfo"] - path = externals/hwinfo - url = https://github.com/lfreist/hwinfo.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d91224d..66dbe119 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -544,7 +544,7 @@ endif() create_target_directory_groups(shadps4) -target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient hwinfo::HWinfo) +target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient) target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::SPIRV glslang::glslang SDL3::SDL3) if (NOT ENABLE_QT_GUI) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index ceec21c0..ca9c6747 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -140,6 +140,3 @@ option(TRACY_ON_DEMAND "" ON) option(TRACY_NO_FRAME_IMAGE "" ON) option(TRACY_FIBERS "" ON) # For AmdGpu frontend profiling add_subdirectory(tracy) - -# hwinfo -add_subdirectory(hwinfo) \ No newline at end of file diff --git a/externals/hwinfo b/externals/hwinfo deleted file mode 160000 index 81ea6332..00000000 --- a/externals/hwinfo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 81ea6332fd4839890b1904f9668865145450f8da diff --git a/src/emulator.cpp b/src/emulator.cpp index 303accf3..16f20297 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -22,7 +22,6 @@ #include "core/linker.h" #include "core/memory.h" #include "emulator.h" -#include "hwinfo/hwinfo.h" Frontend::WindowSDL* g_window = nullptr; @@ -43,7 +42,6 @@ Emulator::Emulator() Common::Log::Initialize(); Common::Log::Start(); LOG_INFO(Loader, "Starting shadps4 emulator v{} ", Common::VERSION); - PrintSystemInfo(); } Emulator::~Emulator() { @@ -181,17 +179,4 @@ void Emulator::LoadSystemModules(const std::filesystem::path& file) { } } -void Emulator::PrintSystemInfo() { - auto cpus = hwinfo::getAllCPUs(); - for (const auto& cpu : cpus) { - LOG_INFO(Loader, "CPU #{} {}", cpu.id(), cpu.modelName()); - } - hwinfo::OS os; - LOG_INFO(Loader, "{}", os.name()); - auto gpus = hwinfo::getAllGPUs(); - for (auto& gpu : gpus) { - LOG_INFO(Loader, "GPU #{} {}", gpu.id(), gpu.name()); - } -} - } // namespace Core diff --git a/src/emulator.h b/src/emulator.h index fce612dc..b61ce95e 100644 --- a/src/emulator.h +++ b/src/emulator.h @@ -29,7 +29,6 @@ public: private: void LoadSystemModules(const std::filesystem::path& file); - void PrintSystemInfo(); Core::MemoryManager* memory; Input::GameController* controller = Common::Singleton::Instance();