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

SPU: report too many PUTLLC attempts (TSX)

Browse source 
Mirrored to PPU STCX code and PUTLLUC (STORE128).
This commit is contained in:
Nekotekina 2020-10-19 15:31:10 +03:00
parent 8ce5392390
commit 72d1ac22aa
2 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/Cell/PPUThread.cpp
View file

@ -1511,14 +1511,14 @@ const auto ppu_stcx_accurate_tx = build_function_asm<u32(*)(u32 raddr, u64 rtime
c.xend(); c.xend();
c.lock().add(x86::qword_ptr(x86::rbx), 127); c.lock().add(x86::qword_ptr(x86::rbx), 127);
c.mov(x86::eax, 1); c.lea(x86::rax, x86::qword_ptr(x86::r12, 1));
c.jmp(_ret); c.jmp(_ret);
c.bind(fall2); c.bind(fall2);
c.sar(x86::eax, 24); c.sar(x86::eax, 24);
c.js(fail2); c.js(fail2);
c.bind(fail3); c.bind(fail3);
c.mov(x86::eax, 2); c.mov(x86::eax, -1);
c.jmp(_ret); c.jmp(_ret);
c.bind(fail); c.bind(fail);
@ -1617,18 +1617,26 @@ static bool ppu_store_reservation(ppu_thread& ppu, u32 addr, u64 reg_value)
{ {
if (g_use_rtm) [[likely]] if (g_use_rtm) [[likely]]
{ {
switch (ppu_stcx_accurate_tx(addr & -8, rtime, ppu.rdata, reg_value)) switch (u32 count = ppu_stcx_accurate_tx(addr & -8, rtime, ppu.rdata, reg_value))
{ {
case 0: case 0:
{ {
// Reservation lost // Reservation lost
return false; return false;
} }
case 1: case UINT32_MAX:
{ {
break;
}
default:
{
if (count > 60 && g_cfg.core.perf_report) [[unlikely]]
{
perf_log.warning("STCX: took too long: %u", count);
}
return true; return true;
} }
default: break;
} }
return cpu_thread::suspend_all(&ppu, [&] return cpu_thread::suspend_all(&ppu, [&]

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

@ -562,14 +562,14 @@ const auto spu_putllc_tx = build_function_asm<u32(*)(u32 raddr, u64 rtime, const
c.xend(); c.xend();
c.lock().add(x86::qword_ptr(x86::rbx), 127); c.lock().add(x86::qword_ptr(x86::rbx), 127);
c.mov(x86::eax, 1); c.lea(x86::rax, x86::qword_ptr(x86::r12, 1));
c.jmp(_ret); c.jmp(_ret);
c.bind(fall2); c.bind(fall2);
c.sar(x86::eax, 24); c.sar(x86::eax, 24);
c.js(fail2); c.js(fail2);
c.bind(fail3); c.bind(fail3);
c.mov(x86::eax, 2); c.mov(x86::eax, -1);
c.jmp(_ret); c.jmp(_ret);
c.bind(fail); c.bind(fail);
@ -766,7 +766,7 @@ const auto spu_putlluc_tx = build_function_asm<u32(*)(u32 raddr, const void* rda
c.xend(); c.xend();
c.lock().add(x86::qword_ptr(x86::rbx), 127); c.lock().add(x86::qword_ptr(x86::rbx), 127);
c.mov(x86::eax, 1); c.lea(x86::rax, x86::qword_ptr(x86::r12, 1));
c.jmp(_ret); c.jmp(_ret);
c.bind(fall2); c.bind(fall2);
@ -2095,9 +2095,9 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
if (g_use_rtm) [[likely]] if (g_use_rtm) [[likely]]
{ {
switch (spu_putllc_tx(addr, rtime, rdata, to_write)) switch (u32 count = spu_putllc_tx(addr, rtime, rdata, to_write))
{ {
case 2: case UINT32_MAX:
{ {
const auto render = rsx::get_rsx_if_needs_res_pause(addr); const auto render = rsx::get_rsx_if_needs_res_pause(addr);
@ -2124,9 +2124,16 @@ bool spu_thread::do_putllc(const spu_mfc_cmd& args)
if (render) render->unpause(); if (render) render->unpause();
return ok; return ok;
} }
case 1: return true;
case 0: return false; case 0: return false;
default: ASSUME(0); default:
{
if (count > 60 && g_cfg.core.perf_report) [[unlikely]]
{
perf_log.warning("PUTLLC: took too long: %u", count);
}
return true;
}
} }
} }
@ -2225,6 +2232,10 @@ void do_cell_atomic_128_store(u32 addr, const void* to_write)
vm::reservation_acquire(addr, 128) += 127; vm::reservation_acquire(addr, 128) += 127;
}); });
} }
else if (result > 60 && g_cfg.core.perf_report) [[unlikely]]
{
perf_log.warning("STORE128: took too long: %u", result);
}
if (render) render->unpause(); if (render) render->unpause();
static_cast<void>(cpu->test_stopped()); static_cast<void>(cpu->test_stopped());