SPU: Limit SPU self notifying thread to 12+ threaded CPUs
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.6, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.6, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.6, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.6, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, arch -X86_64 .ci/build-mac.sh, Intel) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, .ci/build-mac-arm64.sh, Apple Silicon) (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Waiting to run
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run

This commit is contained in:
Elad 2025-09-05 10:31:23 +03:00 committed by Elad
parent fc62733d65
commit f84df03651

View File

@ -6122,13 +6122,14 @@ s64 spu_thread::get_ch_value(u32 ch)
val = static_cast<u8>(std::min<u32>(val + 1, u8{umax})); val = static_cast<u8>(std::min<u32>(val + 1, u8{umax}));
} }
if (!s_is_reservation_data_checking_thread)// && std::find(raddr_busy_wait_addr.begin(), raddr_busy_wait_addr.end(), raddr) != raddr_busy_wait_addr.end()) if (!s_is_reservation_data_checking_thread && utils::get_thread_count() >= 12)// && std::find(raddr_busy_wait_addr.begin(), raddr_busy_wait_addr.end(), raddr) != raddr_busy_wait_addr.end())
{ {
if (s_is_reservation_data_checking_thread.compare_and_swap_test(0, 1)) if (s_is_reservation_data_checking_thread.compare_and_swap_test(0, 1))
{ {
eventstat_busy_waiting_switch = 1; eventstat_busy_waiting_switch = 1;
is_reservation_data_checking_thread = true; is_reservation_data_checking_thread = true;
eventstat_raddr = 1; eventstat_raddr = 1;
eventstat_spin_count = 0;
} }
} }
} }
@ -6189,8 +6190,12 @@ s64 spu_thread::get_ch_value(u32 ch)
if (vm::reservation_acquire(raddr) == rtime) if (vm::reservation_acquire(raddr) == rtime)
{ {
// Confirm change in data only, register address for busy waiting // Confirm change in data only, register address for busy waiting
std::rotate(raddr_busy_wait_addr.rbegin(), raddr_busy_wait_addr.rbegin() + 1, raddr_busy_wait_addr.rend()); if (std::find(raddr_busy_wait_addr.begin(), raddr_busy_wait_addr.end(), raddr) == raddr_busy_wait_addr.end())
raddr_busy_wait_addr[0] = raddr; {
std::rotate(raddr_busy_wait_addr.rbegin(), raddr_busy_wait_addr.rbegin() + 1, raddr_busy_wait_addr.rend());
raddr_busy_wait_addr[0] = raddr;
}
vm::reservation_update(raddr); vm::reservation_update(raddr);
} }
@ -6382,10 +6387,12 @@ s64 spu_thread::get_ch_value(u32 ch)
} }
else if (!cmp_rdata(_this->rdata, *_this->resrv_mem)) else if (!cmp_rdata(_this->rdata, *_this->resrv_mem))
{ {
if (vm::reservation_acquire(raddr) == _this->rtime) auto& wait_addrs = _this->raddr_busy_wait_addr;
if (vm::reservation_acquire(raddr) == _this->rtime && std::find(wait_addrs.begin(), wait_addrs.end(), raddr) == wait_addrs.end())
{ {
std::rotate(_this->raddr_busy_wait_addr.rbegin(), _this->raddr_busy_wait_addr.rbegin() + 1, _this->raddr_busy_wait_addr.rend()); std::rotate(wait_addrs.rbegin(), wait_addrs.rbegin() + 1, wait_addrs.rend());
_this->raddr_busy_wait_addr[0] = raddr; wait_addrs[0] = raddr;
} }
// Notify threads manually, memory data has likely changed and broke the reservation for others // Notify threads manually, memory data has likely changed and broke the reservation for others