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

spu_putlluc_tx: diagnose loop count

Browse source
This commit is contained in:
Nekotekina 2018-05-19 23:14:02 +03:00
parent a33f297315
commit 295f782b30
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -339,7 +339,7 @@ const auto spu_getll_tx = build_function_asm<u64(*)(u32 raddr, void* rdata)>([](
c.jmp(begin); c.jmp(begin);
}); });
const auto spu_putlluc_tx = build_function_asm<void(*)(u32 raddr, const void* rdata)>([](asmjit::X86Assembler& c, auto& args) const auto spu_putlluc_tx = build_function_asm<u64(*)(u32 raddr, const void* rdata)>([](asmjit::X86Assembler& c, auto& args)
{ {
using namespace asmjit; using namespace asmjit;
@ -353,6 +353,7 @@ const auto spu_putlluc_tx = build_function_asm<void(*)(u32 raddr, const void* rd
c.lea(x86::r11, x86::qword_ptr(x86::r11, args[0])); c.lea(x86::r11, x86::qword_ptr(x86::r11, args[0]));
c.shr(args[0], 4); c.shr(args[0], 4);
c.lea(x86::r10, x86::qword_ptr(x86::r10, args[0])); c.lea(x86::r10, x86::qword_ptr(x86::r10, args[0]));
c.mov(args[0].r32(), 1);
// Prepare data // Prepare data
c.vmovups(x86::ymm0, x86::yword_ptr(args[1], 0)); c.vmovups(x86::ymm0, x86::yword_ptr(args[1], 0));
@ -373,6 +374,7 @@ const auto spu_putlluc_tx = build_function_asm<void(*)(u32 raddr, const void* rd
c.mov(x86::qword_ptr(x86::r10), x86::rax); c.mov(x86::qword_ptr(x86::r10), x86::rax);
c.xend(); c.xend();
c.vzeroupper(); c.vzeroupper();
c.mov(x86::rax, args[0]);
c.ret(); c.ret();
// Touch memory after transaction failure // Touch memory after transaction failure
@ -380,6 +382,7 @@ const auto spu_putlluc_tx = build_function_asm<void(*)(u32 raddr, const void* rd
c.pause(); c.pause();
c.lock().add(x86::qword_ptr(x86::r11), 0); c.lock().add(x86::qword_ptr(x86::r11), 0);
c.lock().add(x86::qword_ptr(x86::r10), 0); c.lock().add(x86::qword_ptr(x86::r10), 0);
c.add(args[0], 1);
c.jmp(begin); c.jmp(begin);
}); });
@ -1051,7 +1054,13 @@ void SPUThread::do_putlluc(const spu_mfc_cmd& args)
// Store unconditionally // Store unconditionally
if (g_use_rtm) if (g_use_rtm)
{ {
spu_putlluc_tx(addr, to_write.data()); const u64 count = spu_putlluc_tx(addr, to_write.data());
if (count > 5)
{
LOG_ERROR(SPU, "%s took too long: %u", args.cmd, count);
}
vm::reservation_notifier(addr, 128).notify_all(); vm::reservation_notifier(addr, 128).notify_all();
return; return;
} }