From a7b185edc5d1d7e98d6c8740cdaf4c18ea65d7de Mon Sep 17 00:00:00 2001 From: DarthMew Date: Sun, 26 Dec 2021 00:05:20 +0100 Subject: [PATCH] Separate fastmem rewrite feature into its own option & have CPU Execution Mode OSD message only appear when switching CPU Execution Mode --- .../cpu_recompiler_code_generator_generic.cpp | 4 ++-- src/core/host_interface.cpp | 15 ++++++++----- src/core/settings.cpp | 2 ++ src/core/settings.h | 1 + .../libretro_core_options.h | 21 +++++++++++++------ 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/core/cpu_recompiler_code_generator_generic.cpp b/src/core/cpu_recompiler_code_generator_generic.cpp index 5f35c2df..e70cb408 100644 --- a/src/core/cpu_recompiler_code_generator_generic.cpp +++ b/src/core/cpu_recompiler_code_generator_generic.cpp @@ -75,7 +75,7 @@ Value CodeGenerator::EmitLoadGuestMemory(const CodeBlockInstruction& cbi, const use_fastmem ? "yes" : "no"); } - if (g_settings.IsUsingFastmem() && use_fastmem && g_settings.cpu_fastmem_mode == CPUFastmemMode::MMap) + if (g_settings.IsUsingFastmem() && use_fastmem && g_settings.cpu_fastmem_rewrite) { EmitLoadGuestMemoryFastmem(cbi, address, size, result); } @@ -148,7 +148,7 @@ void CodeGenerator::EmitStoreGuestMemory(const CodeBlockInstruction& cbi, const use_fastmem ? "yes" : "no"); } - if (g_settings.IsUsingFastmem() && use_fastmem && g_settings.cpu_fastmem_mode == CPUFastmemMode::MMap) + if (g_settings.IsUsingFastmem() && use_fastmem && g_settings.cpu_fastmem_rewrite) { EmitStoreGuestMemoryFastmem(cbi, address, size, value); } diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index 53522661..1d2ee115 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -497,6 +497,7 @@ void HostInterface::SetDefaultSettings(SettingsInterface& si) si.SetBoolValue("CPU", "RecompilerBlockLinking", true); si.SetBoolValue("CPU", "ICache", false); si.SetBoolValue("CPU", "FastmemMode", Settings::GetCPUFastmemModeName(Settings::DEFAULT_CPU_FASTMEM_MODE)); + si.SetBoolValue("CPU", "FastmemRewrite", false); si.SetStringValue("GPU", "Renderer", Settings::GetRendererName(Settings::DEFAULT_GPU_RENDERER)); si.SetIntValue("GPU", "ResolutionScale", 1); @@ -737,12 +738,16 @@ void HostInterface::CheckForSettingsChanges(const Settings& old_settings) System::UpdateThrottlePeriod(); if (g_settings.cpu_execution_mode != old_settings.cpu_execution_mode || - g_settings.cpu_fastmem_mode != old_settings.cpu_fastmem_mode) + g_settings.cpu_fastmem_mode != old_settings.cpu_fastmem_mode || + g_settings.cpu_fastmem_rewrite != old_settings.cpu_fastmem_rewrite) { - AddFormattedOSDMessage( - 5.0f, TranslateString("OSDMessage", "Switching to %s CPU execution mode."), - TranslateString("CPUExecutionMode", Settings::GetCPUExecutionModeDisplayName(g_settings.cpu_execution_mode)) - .GetCharArray()); + if (g_settings.cpu_execution_mode != old_settings.cpu_execution_mode) + { + AddFormattedOSDMessage( + 5.0f, TranslateString("OSDMessage", "Switching to %s CPU execution mode."), + TranslateString("CPUExecutionMode", Settings::GetCPUExecutionModeDisplayName(g_settings.cpu_execution_mode)) + .GetCharArray()); + } CPU::CodeCache::Reinitialize(); CPU::ClearICache(); } diff --git a/src/core/settings.cpp b/src/core/settings.cpp index f20b90f3..eff8ff30 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -177,6 +177,7 @@ void Settings::Load(SettingsInterface& si) cpu_fastmem_mode = ParseCPUFastmemMode( si.GetStringValue("CPU", "FastmemMode", GetCPUFastmemModeName(DEFAULT_CPU_FASTMEM_MODE)).c_str()) .value_or(DEFAULT_CPU_FASTMEM_MODE); + cpu_fastmem_rewrite = si.GetBoolValue("CPU", "FastmemRewrite", false); gpu_renderer = ParseRendererName(si.GetStringValue("GPU", "Renderer", GetRendererName(DEFAULT_GPU_RENDERER)).c_str()) .value_or(DEFAULT_GPU_RENDERER); @@ -370,6 +371,7 @@ void Settings::Save(SettingsInterface& si) const si.SetBoolValue("CPU", "RecompilerBlockLinking", cpu_recompiler_block_linking); si.SetBoolValue("CPU", "RecompilerICache", cpu_recompiler_icache); si.SetStringValue("CPU", "FastmemMode", GetCPUFastmemModeName(cpu_fastmem_mode)); + si.SetBoolValue("CPU", "FastmemRewrite", cpu_fastmem_rewrite); si.SetStringValue("GPU", "Renderer", GetRendererName(gpu_renderer)); si.SetStringValue("GPU", "Adapter", gpu_adapter.c_str()); diff --git a/src/core/settings.h b/src/core/settings.h index 578fad45..c7b2596a 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -81,6 +81,7 @@ struct Settings bool cpu_recompiler_block_linking = true; bool cpu_recompiler_icache = false; CPUFastmemMode cpu_fastmem_mode = CPUFastmemMode::Disabled; + bool cpu_fastmem_rewrite = false; float emulation_speed = 1.0f; float fast_forward_speed = 0.0f; diff --git a/src/duckstation-libretro/libretro_core_options.h b/src/duckstation-libretro/libretro_core_options.h index 6d58b633..3ba8674c 100644 --- a/src/duckstation-libretro/libretro_core_options.h +++ b/src/duckstation-libretro/libretro_core_options.h @@ -2389,14 +2389,8 @@ struct retro_core_option_v2_definition option_defs_us[] = { "duckstation_CPU.FastmemMode", "CPU Recompiler Fast Memory Access", NULL, -#if defined(CPU_X64) || defined(CPU_AARCH64) - "Uses page faults to determine hardware memory accesses at runtime. Can provide a significant performance " - "improvement in some games, but make the core more difficult to debug. MMap provides even better performance " - "over LUT, but may cause issues.", -#else "Uses page faults to determine hardware memory accesses at runtime. Can provide a significant performance " "improvement in some games, but make the core more difficult to debug.", -#endif NULL, "advanced", { @@ -2409,6 +2403,21 @@ struct retro_core_option_v2_definition option_defs_us[] = { }, "LUT" }, + { + "duckstation_CPU.FastmemRewrite", + "CPU Recompiler Fast Memory Access Rewrite", + NULL, + "Enables rewrites when CPU Recompiler Fast Memory Access is enabled. Can provide a measurable speed boost, " + "but may cause the core to segfault on certain platforms.", + NULL, + "advanced", + { + { "true", "Enabled" }, + { "false", "Disabled" }, + { NULL, NULL }, + }, + "false" + }, { "duckstation_Debug.ShowVRAM", "Show VRAM",