Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPU: optimize conflicting PUTLLUC (No-TSX)

Browse Source 
Enable previously TSX-only optimization.
This commit is contained in:
Nekotekina
2022-05-05 12:55:17 +03:00
committed by Ivan
parent 2706486559
commit 10b33d0f79
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Cell/SPUThread.cpp
+12 -19
View File
@@ -2795,7 +2795,6 @@ void do_cell_atomic_128_store(u32 addr, const void* to_write)
shared_mem = addr; shared_mem = addr;
} }
if (g_use_rtm) [[likely]]
{ {
auto& sdata = *vm::get_super_ptr<spu_rdata_t>(addr); auto& sdata = *vm::get_super_ptr<spu_rdata_t>(addr);
auto& res = *utils::bless<atomic_t<u128>>(vm::g_reservations + (addr & 0xff80) / 2); auto& res = *utils::bless<atomic_t<u128>>(vm::g_reservations + (addr & 0xff80) / 2);
@@ -2861,12 +2860,22 @@ void do_cell_atomic_128_store(u32 addr, const void* to_write)
} }
} }
u64 result = 0; u64 result = 1;
if (cpu->state & cpu_flag::pause) if (cpu->state & cpu_flag::pause)
{ {
result = 0; result = 0;
} }
else if (!g_use_rtm)
{
// Provoke page fault
vm::_ref<atomic_t<u32>>(addr) += 0;
// Hard lock
vm::writer_lock lock(addr);
mov_rdata(sdata, *static_cast<const spu_rdata_t*>(to_write));
vm::reservation_acquire(addr) += 32;
}
else if (cpu->id_type() != 2) else if (cpu->id_type() != 2)
{ {
u64 stx, ftx; u64 stx, ftx;
@@ -2896,22 +2905,6 @@ void do_cell_atomic_128_store(u32 addr, const void* to_write)
static_cast<void>(cpu->test_stopped()); static_cast<void>(cpu->test_stopped());
} }
else
{
auto& data = vm::_ref<spu_rdata_t>(addr);
auto [res, time0] = vm::reservation_lock(addr);
*reinterpret_cast<atomic_t<u32>*>(&data) += 0;
auto& super_data = *vm::get_super_ptr<spu_rdata_t>(addr);
{
// Full lock (heavyweight)
// TODO: vm::check_addr
vm::writer_lock lock(addr);
mov_rdata(super_data, *static_cast<const spu_rdata_t*>(to_write));
res += 64;
}
}
} }
void spu_thread::do_putlluc(const spu_mfc_cmd& args) void spu_thread::do_putlluc(const spu_mfc_cmd& args)
@@ -3945,7 +3938,7 @@ s64 spu_thread::get_ch_value(u32 ch)
state += cpu_flag::wait; state += cpu_flag::wait;
using resrv_ptr = std::add_pointer_t<const decltype(rdata)>; using resrv_ptr = std::add_pointer_t<const decltype(rdata)>;
resrv_ptr resrv_mem = vm::get_super_ptr<decltype(rdata)>(raddr); resrv_ptr resrv_mem = vm::get_super_ptr<decltype(rdata)>(raddr);
std::shared_ptr<utils::shm> rdata_shm; std::shared_ptr<utils::shm> rdata_shm;