From 582913dc31c88dabe57969f9a47aefa02c16ea3b Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 18 Jul 2017 01:12:13 +0300 Subject: [PATCH] spu: Simplify watchdog design (PC is purely HLE and occupies SPU code kernel space only, max 256K) --- rpcs3/Emu/Cell/SPUThread.cpp | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 156b582fcc..a23f3f0c83 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -59,33 +59,19 @@ namespace spu { namespace scheduler { - struct executable_block_map - { - std::array, 1024> locations; - - std::atomic& operator[](u32 offset) - { - return locations[offset]; - } - }; - - //TODO: Only initialize loaded memory blocks to save RAM - //TODO: Concurrent spu thread limit can be configurable - std::array atomic_instruction_table; + std::array, 65536> atomic_instruction_table = {}; constexpr u32 native_jiffy_duration_us = 2000000; void acquire_pc_address(u32 pc, u32 timeout_ms = 3) { const u8 max_concurrent_instructions = (u8)g_cfg.core.preferred_spu_threads; - - const u32 block = pc >> 12; - const u32 offset = (pc & 0xFFF) >> 2; + const u32 pc_offset = pc >> 2; if (timeout_ms > 0) { while (timeout_ms--) { - if (atomic_instruction_table[block][offset].load(std::memory_order_consume) >= max_concurrent_instructions) + if (atomic_instruction_table[pc_offset].load(std::memory_order_consume) >= max_concurrent_instructions) std::this_thread::sleep_for(1ms); } } @@ -94,15 +80,14 @@ namespace spu std::this_thread::yield(); } - atomic_instruction_table[block][offset]++; + atomic_instruction_table[pc_offset]++; } void release_pc_address(u32 pc) { - const u32 block = pc >> 12; - const u32 offset = (pc & 0xFFF) >> 2; + const u32 pc_offset = pc >> 2; - atomic_instruction_table[block][offset]--; + atomic_instruction_table[pc_offset]--; } struct concurrent_execution_watchdog