archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

SPU: Power consumption reduction when using SPU inaccurate reservations

Browse source
This commit is contained in:
Eladash 2022-09-12 19:39:08 +03:00 • committed by Ivan
parent 92514e33bb
commit cfdc852f03
3 changed files with 55 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/CPU/CPUThread.cpp
View file

@ -5,6 +5,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/Memory/vm_locking.h" #include "Emu/Memory/vm_locking.h"
#include "Emu/Memory/vm_reservation.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/GDB.h" #include "Emu/GDB.h"
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
@ -892,6 +893,14 @@ cpu_thread& cpu_thread::operator=(thread_state)
if (old & cpu_flag::wait && old.none_of(cpu_flag::again + cpu_flag::exit)) if (old & cpu_flag::wait && old.none_of(cpu_flag::again + cpu_flag::exit))
{ {
state.notify_one(cpu_flag::exit); state.notify_one(cpu_flag::exit);
if (auto thread = try_get<spu_thread>())
{
if (u32 resv = atomic_storage<u32>::load(thread->raddr))
{
vm::reservation_notifier(resv).notify_one();
}
}
} }
return *this; return *this;

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

@ -4336,6 +4336,14 @@ s64 spu_thread::get_ch_value(u32 ch)
return true; return true;
}); });
if (raddr - spurs_addr <= 0x80 && !g_cfg.core.spu_accurate_reservations && mask1 == SPU_EVENT_LR)
{
// Wait without timeout, in this situation we have notifications for all writes making it possible
// Abort notifications are handled specially for performance reasons
vm::reservation_notifier(raddr).wait(rtime, -128);
continue;
}
vm::reservation_notifier(raddr).wait(rtime, -128, atomic_wait_timeout{80'000}); vm::reservation_notifier(raddr).wait(rtime, -128, atomic_wait_timeout{80'000});
} }
else else
@ -5219,6 +5227,8 @@ bool spu_thread::stop_and_signal(u32 code)
break; break;
} }
u32 prev_resv = 0;
for (auto& thread : group->threads) for (auto& thread : group->threads)
{ {
if (thread) if (thread)
@ -5227,9 +5237,25 @@ bool spu_thread::stop_and_signal(u32 code)
if (thread.get() != this && thread->state & cpu_flag::ret) if (thread.get() != this && thread->state & cpu_flag::ret)
{ {
thread_ctrl::notify(*thread); thread_ctrl::notify(*thread);
if (u32 resv = atomic_storage<u32>::load(thread->raddr))
{
if (prev_resv && prev_resv != resv)
{
// Batch reservation notifications if possible
vm::reservation_notifier(prev_resv).notify_all();
}
prev_resv = resv;
} }
} }
} }
}
if (prev_resv)
{
vm::reservation_notifier(prev_resv).notify_all();
}
check_state(); check_state();
return true; return true;

19
rpcs3/Emu/Cell/lv2/sys_spu.cpp
View file

@ -14,6 +14,7 @@
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
#include "Emu/Cell/RawSPUThread.h" #include "Emu/Cell/RawSPUThread.h"
#include "Emu/Cell/timers.hpp" #include "Emu/Cell/timers.hpp"
#include "Emu/Memory/vm_reservation.h"
#include "sys_interrupt.h" #include "sys_interrupt.h"
#include "sys_process.h" #include "sys_process.h"
#include "sys_memory.h" #include "sys_memory.h"
@ -1365,12 +1366,30 @@ error_code sys_spu_thread_group_terminate(ppu_thread& ppu, u32 id, s32 value)
} }
} }
u32 prev_resv = 0;
for (auto& thread : group->threads) for (auto& thread : group->threads)
{ {
while (thread && group->running && thread->state & cpu_flag::wait) while (thread && group->running && thread->state & cpu_flag::wait)
{ {
thread_ctrl::notify(*thread); thread_ctrl::notify(*thread);
if (u32 resv = atomic_storage<u32>::load(thread->raddr))
{
if (prev_resv && prev_resv != resv)
{
// Batch reservation notifications if possible
vm::reservation_notifier(prev_resv).notify_all();
} }
prev_resv = resv;
}
}
}
if (prev_resv)
{
vm::reservation_notifier(prev_resv).notify_all();
} }
group->exit_status = value; group->exit_status = value;