RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 20:22:30 +01:00
Code Issues Releases Wiki Activity

SPU: Notify threads on RdEventStat properly

Browse Source
This commit is contained in:
Elad Ashkenazi 2024-06-18 18:43:03 +03:00
parent dbb02241c5
commit 649714429b
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
rpcs3/Emu/Cell/SPUThread.cpp
View File

@ -5507,7 +5507,9 @@ s64 spu_thread::get_ch_value(u32 ch)
} }
} }
#ifdef __linux__ #ifdef __linux__
get_resrv_waiters_count(raddr)++;
vm::reservation_notifier(raddr).wait(rtime, atomic_wait_timeout{50'000}); vm::reservation_notifier(raddr).wait(rtime, atomic_wait_timeout{50'000});
get_resrv_waiters_count(raddr)--;
#else #else
if (raddr - spurs_addr <= 0x80 && !g_cfg.core.spu_accurate_reservations && mask1 == SPU_EVENT_LR) if (raddr - spurs_addr <= 0x80 && !g_cfg.core.spu_accurate_reservations && mask1 == SPU_EVENT_LR)
{ {
@ -5525,6 +5527,11 @@ s64 spu_thread::get_ch_value(u32 ch)
continue; continue;
} }
static thread_local bool s_tls_try_notify = false;
s_tls_try_notify = false;
const u32 _raddr = this->raddr;
atomic_wait_engine::set_one_time_use_wait_callback(mask1 != SPU_EVENT_LR ? nullptr : +[](u64 attempts) -> bool atomic_wait_engine::set_one_time_use_wait_callback(mask1 != SPU_EVENT_LR ? nullptr : +[](u64 attempts) -> bool
{ {
const auto _this = static_cast<spu_thread*>(cpu_thread::get_current()); const auto _this = static_cast<spu_thread*>(cpu_thread::get_current());
@ -5543,19 +5550,47 @@ s64 spu_thread::get_ch_value(u32 ch)
return true; return true;
} }
if (!vm::check_addr(_this->raddr) || !cmp_rdata(_this->rdata, *_this->resrv_mem)) bool set_lr = false;
const u32 raddr = _this->raddr;
if (!raddr)
{
return true;
}
if (!vm::check_addr(raddr))
{
set_lr = true;
}
else if (!cmp_rdata(_this->rdata, *_this->resrv_mem))
{
// Only data changed, try to notify waiters
if (get_resrv_waiters_count(raddr) >= 2 && vm::reservation_acquire(raddr).compare_and_swap_test(_this->rtime, _this->rtime + 128))
{
s_tls_try_notify = true;
}
set_lr = true;
}
if (set_lr)
{ {
_this->set_events(SPU_EVENT_LR);
_this->raddr = 0; _this->raddr = 0;
_this->set_events(SPU_EVENT_LR);
return false; return false;
} }
return true; return true;
}); });
get_resrv_waiters_count(raddr)++; get_resrv_waiters_count(_raddr)++;
vm::reservation_notifier(raddr).wait(rtime, atomic_wait_timeout{80'000}); vm::reservation_notifier(_raddr).wait(rtime, atomic_wait_timeout{80'000});
get_resrv_waiters_count(raddr)--; get_resrv_waiters_count(_raddr)--;
if (s_tls_try_notify && get_resrv_waiters_count(_raddr) && vm::reservation_acquire(_raddr) == rtime + 128)
{
vm::reservation_notifier(_raddr).notify_all();
}
#endif #endif
} }
else else