mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-28 23:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SPURS Task limit hotfix (#16140)

Browse Source
This commit is contained in:
Elad 2024-09-27 22:15:06 +03:00 committed by GitHub
parent 88adaa9d2d
commit f0c60b42c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4899,7 +4899,7 @@ bool spu_thread::process_mfc_cmd()
if (is_spurs_task_wait) if (is_spurs_task_wait)
{ {
// Wait for other threads to complete their tasks (temporarily) // Wait for other threads to complete their tasks (temporarily)
const u32 max_run = group->max_run; u32 max_run = group->max_run;
u32 prev_running = group->spurs_running; u32 prev_running = group->spurs_running;
@ -4915,8 +4915,9 @@ bool spu_thread::process_mfc_cmd()
break; break;
} }
thread_ctrl::wait_on(group->spurs_running, prev_running, 20000 - (current - before)); thread_ctrl::wait_on(group->spurs_running, prev_running, 5000 - (current - before));
max_run = group->max_run;
prev_running = group->spurs_running; prev_running = group->spurs_running;
if (prev_running <= max_run) if (prev_running <= max_run)
@ -4926,7 +4927,7 @@ bool spu_thread::process_mfc_cmd()
current = get_system_time(); current = get_system_time();
if (current - before >= 18000u) if (current - before >= 5000u)
{ {
// Timed-out // Timed-out
break; break;
@ -5535,31 +5536,17 @@ s64 spu_thread::get_ch_value(u32 ch)
case SPU_RdEventStat: case SPU_RdEventStat:
{ {
const bool is_spurs_task_wait = pc == 0x11a8 && spurs_addr == raddr && group->max_run != group->max_num && !spurs_waited;
if (is_spurs_task_wait)
{
const u32 prev_running = group->spurs_running.fetch_op([](u32& x)
{
if (x)
{
x--;
return true;
}
return false;
}).first;
if (prev_running == group->max_run)
{
group->spurs_running.notify_one();
}
}
const u32 mask1 = ch_events.load().mask; const u32 mask1 = ch_events.load().mask;
auto events = get_events(mask1, false, true); auto events = get_events(mask1, false, true);
if (events.count)
{
return events.events & mask1;
}
const bool is_spurs_task_wait = pc == 0x11a8 && spurs_addr == raddr && group->max_run != group->max_num && !spurs_waited;
const auto wait_spurs_task = [&] const auto wait_spurs_task = [&]
{ {
if (is_spurs_task_wait) if (is_spurs_task_wait)
@ -5567,7 +5554,7 @@ s64 spu_thread::get_ch_value(u32 ch)
// Wait for other threads to complete their tasks (temporarily) // Wait for other threads to complete their tasks (temporarily)
if (!is_stopped()) if (!is_stopped())
{ {
const u32 max_run = group->max_run; u32 max_run = group->max_run;
u32 prev_running = group->spurs_running.fetch_op([max_run](u32& x) u32 prev_running = group->spurs_running.fetch_op([max_run](u32& x)
{ {
@ -5594,7 +5581,9 @@ s64 spu_thread::get_ch_value(u32 ch)
break; break;
} }
thread_ctrl::wait_on(group->spurs_running, prev_running, 20000 - (current - before)); thread_ctrl::wait_on(group->spurs_running, prev_running, 5000 - (current - before));
max_run = group->max_run;
prev_running = group->spurs_running.fetch_op([max_run](u32& x) prev_running = group->spurs_running.fetch_op([max_run](u32& x)
{ {
@ -5614,7 +5603,7 @@ s64 spu_thread::get_ch_value(u32 ch)
current = get_system_time(); current = get_system_time();
if (current - before >= 18000u) if (current - before >= 5000u)
{ {
// Timed-out // Timed-out
group->spurs_running++; group->spurs_running++;
@ -5626,10 +5615,23 @@ s64 spu_thread::get_ch_value(u32 ch)
} }
}; };
if (events.count) if (is_spurs_task_wait)
{ {
wait_spurs_task(); const u32 prev_running = group->spurs_running.fetch_op([](u32& x)
return events.events & mask1; {
if (x)
{
x--;
return true;
}
return false;
}).first;
if (prev_running == group->max_run)
{
group->spurs_running.notify_one();
}
} }
spu_function_logger logger(*this, "MFC Events read"); spu_function_logger logger(*this, "MFC Events read");
@ -5725,27 +5727,27 @@ s64 spu_thread::get_ch_value(u32 ch)
if (raddr && (mask1 & ~SPU_EVENT_TM) == SPU_EVENT_LR) if (raddr && (mask1 & ~SPU_EVENT_TM) == SPU_EVENT_LR)
{ {
if (u32 max_threads = std::min<u32>(g_cfg.core.max_spurs_threads, group ? group->max_num : u32{umax}); group && group->max_run != max_threads)
{
constexpr std::string_view spurs_suffix = "CellSpursKernelGroup"sv;
if (group->name.ends_with(spurs_suffix) && !group->name.substr(0, group->name.size() - spurs_suffix.size()).ends_with("_libsail"))
{
// Hack: don't run more SPURS threads than specified.
if (u32 old = atomic_storage<u32>::exchange(group->max_run, max_threads); old > max_threads)
{
spu_log.success("HACK: '%s' (0x%x) limited to %u threads.", group->name, group->id, max_threads);
}
else if (u32 running = group->spurs_running; old < max_threads && running >= old && running < max_threads)
{
group->spurs_running.notify_all();
}
}
}
// Don't busy-wait with TSX - memory is sensitive // Don't busy-wait with TSX - memory is sensitive
if (g_use_rtm || !reservation_busy_waiting) if (g_use_rtm || !reservation_busy_waiting)
{ {
if (u32 max_threads = std::min<u32>(g_cfg.core.max_spurs_threads, group->max_num); group->max_run != max_threads)
{
constexpr std::string_view spurs_suffix = "CellSpursKernelGroup"sv;
if (group->name.ends_with(spurs_suffix) && !group->name.substr(0, group->name.size() - spurs_suffix.size()).ends_with("_libsail"))
{
// Hack: don't run more SPURS threads than specified.
if (u32 old = atomic_storage<u32>::exchange(group->max_run, max_threads); old > max_threads)
{
spu_log.success("HACK: '%s' (0x%x) limited to %u threads.", group->name, group->id, max_threads);
}
else if (u32 running = group->spurs_running; old < max_threads && running >= old && running < max_threads)
{
group->spurs_running.notify_all();
}
}
}
if (u32 work_count = g_spu_work_count) if (u32 work_count = g_spu_work_count)
{ {
const u32 true_free = utils::sub_saturate<u32>(utils::get_thread_count(), 10); const u32 true_free = utils::sub_saturate<u32>(utils::get_thread_count(), 10);