diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 25f5984494..6c960f0988 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -4430,7 +4430,7 @@ bool spu_thread::process_mfc_cmd() // Need to check twice for it to be accurate, the code is before and not after this check for: // 1. Reduce time between reservation accesses so TSX panelty would be lowered // 2. Increase the chance of change detection: if GETLLAR has been called again new data is probably wanted - if (rtime == vm::reservation_acquire(addr) && (!g_cfg.core.spu_accurate_getllar || cmp_rdata(rdata, data))) + if (rtime == vm::reservation_acquire(addr) && cmp_rdata(rdata, data)) { if ([&]() -> bool { @@ -4607,7 +4607,7 @@ bool spu_thread::process_mfc_cmd() continue; } - if (g_cfg.core.spu_accurate_getllar && !cmp_rdata(rdata, data)) + if (!cmp_rdata(rdata, data)) { i += 2; continue; diff --git a/rpcs3/Emu/system_config.h b/rpcs3/Emu/system_config.h index 8a1fb364b9..25b82427ab 100644 --- a/rpcs3/Emu/system_config.h +++ b/rpcs3/Emu/system_config.h @@ -41,7 +41,6 @@ struct cfg_root : cfg::node cfg::_bool spu_loop_detection{ this, "SPU loop detection", false }; // Try to detect wait loops and trigger thread yield cfg::_int<0, 6> max_spurs_threads{ this, "Max SPURS Threads", 6 }; // HACK. If less then 6, max number of running SPURS threads in each thread group. cfg::_enum spu_block_size{ this, "SPU Block Size", spu_block_size_type::safe }; - cfg::_bool spu_accurate_getllar{ this, "Accurate GETLLAR", false, true }; cfg::_bool spu_accurate_dma{ this, "Accurate SPU DMA", false }; cfg::_bool spu_accurate_reservations{ this, "Accurate SPU Reservations", true }; cfg::_bool accurate_cache_line_stores{ this, "Accurate Cache Line Stores", false }; diff --git a/rpcs3/rpcs3qt/emu_settings_type.h b/rpcs3/rpcs3qt/emu_settings_type.h index 9f1ac6e29b..54a9495925 100644 --- a/rpcs3/rpcs3qt/emu_settings_type.h +++ b/rpcs3/rpcs3qt/emu_settings_type.h @@ -21,7 +21,6 @@ enum class emu_settings_type MaxLLVMThreads, LLVMPrecompilation, EnableTSX, - AccurateGETLLAR, AccurateSpuDMA, AccurateClineStores, AccurateRSXAccess, @@ -213,7 +212,6 @@ inline static const QMap settings_location = { emu_settings_type::MaxLLVMThreads, { "Core", "Max LLVM Compile Threads"}}, { emu_settings_type::LLVMPrecompilation, { "Core", "LLVM Precompilation"}}, { emu_settings_type::EnableTSX, { "Core", "Enable TSX"}}, - { emu_settings_type::AccurateGETLLAR, { "Core", "Accurate GETLLAR"}}, { emu_settings_type::AccurateSpuDMA, { "Core", "Accurate SPU DMA"}}, { emu_settings_type::AccurateClineStores, { "Core", "Accurate Cache Line Stores"}}, { emu_settings_type::AccurateRSXAccess, { "Core", "Accurate RSX reservation access"}}, diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index cc2dfd05a6..5122ffc363 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1461,9 +1461,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std SubscribeTooltip(ui->accurateDFMA, tooltips.settings.accurate_dfma); ui->accurateDFMA->setDisabled(utils::has_fma3() || utils::has_fma4()); - m_emu_settings->EnhanceCheckBox(ui->accurateGETLLAR, emu_settings_type::AccurateGETLLAR); - SubscribeTooltip(ui->accurateGETLLAR, tooltips.settings.accurate_getllar); - m_emu_settings->EnhanceCheckBox(ui->accurateRSXAccess, emu_settings_type::AccurateRSXAccess); SubscribeTooltip(ui->accurateRSXAccess, tooltips.settings.accurate_rsx_access); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 3f52e0aa60..336e3a309f 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -2389,13 +2389,6 @@ - - - - Accurate GETLLAR - - - diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3qt/tooltips.h index b6aa24c174..cb8834f72a 100644 --- a/rpcs3/rpcs3qt/tooltips.h +++ b/rpcs3/rpcs3qt/tooltips.h @@ -26,7 +26,6 @@ public: const QString lib_default_lle = tr("Select to HLE. (LLE by default)"); const QString debug_console_mode = tr("Increases the amount of usable system memory to match a DECR console and more.\nCauses some software to behave differently than on retail hardware."); - const QString accurate_getllar = tr("Accurately processes SPU MFC_GETLLAR operation."); const QString accurate_rsx_access = tr("Forces RSX pauses on SPU MFC_GETLLAR and SPU MFC_PUTLLUC operations."); const QString accurate_spu_dma = tr("Accurately processes SPU DMA operations."); const QString fixup_ppunj = tr("Legacy option. Fixup result vector values in Non-Java Mode in PPU LLVM.\nIf unsure, do not modify this setting.");