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

SPU: Enable PUTLLC16 with RTIME checks

Browse source
This commit is contained in:
Elad Ashkenazi 2024-06-10 08:18:13 +03:00
parent c73302f715
commit 8b1e7c6a48
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/Cell/SPUCommonRecompiler.cpp
View file

@ -6686,12 +6686,6 @@ spu_program spu_recompiler_base::analyse(const be_t<u32>* ls, u32 entry_point, s
auto& stats = g_fxo->get<putllc16_statistics_t>(); auto& stats = g_fxo->get<putllc16_statistics_t>();
had_putllc_evaluation = true; had_putllc_evaluation = true;
if (!g_cfg.core.spu_debug)
{
// TODO
continue;
}
if (!pattern.ls_write) if (!pattern.ls_write)
{ {
spu_log.success("PUTLLC0 Pattern Detected! (put_pc=0x%x, %s) (putllc0=%d, putllc16+0=%d, all=%d)", pattern.put_pc, func_hash, ++stats.nowrite, ++stats.single, +stats.all); spu_log.success("PUTLLC0 Pattern Detected! (put_pc=0x%x, %s) (putllc0=%d, putllc16+0=%d, all=%d)", pattern.put_pc, func_hash, ++stats.nowrite, ++stats.single, +stats.all);

9
rpcs3/Emu/Cell/SPULLVMRecompiler.cpp
View file

@ -1221,9 +1221,10 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
return; return;
} }
const u64 rtime = _spu->rtime;
auto& res = vm::reservation_acquire(eal); auto& res = vm::reservation_acquire(eal);
if (res & 127) if (res != rtime)
{ {
_spu->ch_atomic_stat.set_value(MFC_PUTLLC_FAILURE); _spu->ch_atomic_stat.set_value(MFC_PUTLLC_FAILURE);
_spu->set_events(SPU_EVENT_LR); _spu->set_events(SPU_EVENT_LR);
@ -1234,11 +1235,11 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
rsx::reservation_lock rsx_lock(raddr, 128); rsx::reservation_lock rsx_lock(raddr, 128);
// Touch memory // Touch memory
vm::_ref<atomic_t<u8>>(dest).compare_and_swap_test(0, 0); vm::_ref<atomic_t<u8>>(dest ^ (4096 / 2)).compare_and_swap_test(0, 0);
auto [old_res, ok] = res.fetch_op([&](u64& rval) auto [old_res, ok] = res.fetch_op([&](u64& rval)
{ {
if (rval & 127)// || rtime != rval) if (rtime != rval)
{ {
return false; return false;
} }
@ -1293,7 +1294,7 @@ class spu_llvm_recompiler : public spu_recompiler_base, public cpu_translator
const auto _new = m_ir->CreateAlignedLoad(get_type<u128>(), _ptr<u128>(m_lsptr, dest), llvm::MaybeAlign{16}); const auto _new = m_ir->CreateAlignedLoad(get_type<u128>(), _ptr<u128>(m_lsptr, dest), llvm::MaybeAlign{16});
const auto _rdata = m_ir->CreateAlignedLoad(get_type<u128>(), _ptr<u128>(spu_ptr<u8>(&spu_thread::rdata), m_ir->CreateAnd(diff, 0x7f)), llvm::MaybeAlign{16}); const auto _rdata = m_ir->CreateAlignedLoad(get_type<u128>(), _ptr<u128>(spu_ptr<u8>(&spu_thread::rdata), m_ir->CreateAnd(diff, 0x7f)), llvm::MaybeAlign{16});
const bool is_accurate_op = false && !!g_cfg.core.spu_accurate_reservations; const bool is_accurate_op = !!g_cfg.core.spu_accurate_reservations;
const auto compare_data_change_res = is_accurate_op ? m_ir->getTrue() : m_ir->CreateICmpNE(_new, _rdata); const auto compare_data_change_res = is_accurate_op ? m_ir->getTrue() : m_ir->CreateICmpNE(_new, _rdata);