archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-15 03:08:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make preferred spu threads dynamically adjustable

Browse source
This commit is contained in:
Eladash 2020-02-05 06:44:10 +02:00 • committed by Ani
parent 9a64d08c9f
commit 049e392a97
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -113,9 +113,8 @@ namespace spu
std::array<std::atomic<u8>, 65536> atomic_instruction_table = {}; std::array<std::atomic<u8>, 65536> atomic_instruction_table = {};
constexpr u32 native_jiffy_duration_us = 1500; //About 1ms resolution with a half offset constexpr u32 native_jiffy_duration_us = 1500; //About 1ms resolution with a half offset
void acquire_pc_address(spu_thread& spu, u32 pc, u32 timeout_ms = 3) void acquire_pc_address(spu_thread& spu, u32 pc, u32 timeout_ms, u32 max_concurrent_instructions)
{ {
const u32 max_concurrent_instructions = g_cfg.core.preferred_spu_threads;
const u32 pc_offset = pc >> 2; const u32 pc_offset = pc >> 2;
if (atomic_instruction_table[pc_offset].load(std::memory_order_consume) >= max_concurrent_instructions) if (atomic_instruction_table[pc_offset].load(std::memory_order_consume) >= max_concurrent_instructions)
@ -173,9 +172,9 @@ namespace spu
concurrent_execution_watchdog(spu_thread& spu) concurrent_execution_watchdog(spu_thread& spu)
:pc(spu.pc) :pc(spu.pc)
{ {
if (g_cfg.core.preferred_spu_threads > 0) if (const u32 max_concurrent_instructions = g_cfg.core.preferred_spu_threads)
{ {
acquire_pc_address(spu, pc, g_cfg.core.spu_delay_penalty); acquire_pc_address(spu, pc, g_cfg.core.spu_delay_penalty, max_concurrent_instructions);
active = true; active = true;
} }
} }

2
rpcs3/Emu/System.h
View file

@ -404,7 +404,7 @@ struct cfg_root : cfg::node
cfg::_enum<spu_decoder_type> spu_decoder{this, "SPU Decoder", spu_decoder_type::llvm}; cfg::_enum<spu_decoder_type> spu_decoder{this, "SPU Decoder", spu_decoder_type::llvm};
cfg::_bool lower_spu_priority{this, "Lower SPU thread priority"}; cfg::_bool lower_spu_priority{this, "Lower SPU thread priority"};
cfg::_bool spu_debug{this, "SPU Debug"}; cfg::_bool spu_debug{this, "SPU Debug"};
cfg::_int<0, 6> preferred_spu_threads{this, "Preferred SPU Threads", 0}; //Numnber of hardware threads dedicated to heavy simultaneous spu tasks cfg::_int<0, 6> preferred_spu_threads{this, "Preferred SPU Threads", 0, true}; //Numnber of hardware threads dedicated to heavy simultaneous spu tasks
cfg::_int<0, 16> spu_delay_penalty{this, "SPU delay penalty", 3}; //Number of milliseconds to block a thread if a virtual 'core' isn't free cfg::_int<0, 16> spu_delay_penalty{this, "SPU delay penalty", 3}; //Number of milliseconds to block a thread if a virtual 'core' isn't free
cfg::_bool spu_loop_detection{this, "SPU loop detection", true}; //Try to detect wait loops and trigger thread yield cfg::_bool spu_loop_detection{this, "SPU loop detection", true}; //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::_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.