mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 12:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SPU LLVM: Fix savestates with LLVM

Browse Source 
Sneaky bug: allow invalidation from blocks that do not contain a store but do a gpr-state critical operation.
This commit is contained in:
Eladash 2023-12-28 21:14:58 +02:00 committed by Elad Ashkenazi
parent 526aaf7302
commit bd687b41d3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpcs3/Emu/Cell/SPURecompiler.cpp
View File

@ -6080,7 +6080,7 @@ public:
llvm::SetVector<llvm::BasicBlock*> work_list; llvm::SetVector<llvm::BasicBlock*> work_list;
std::unordered_map<llvm::BasicBlock*, bool> worked_on; std::unordered_map<llvm::BasicBlock*, bool> worked_on;
if (std::count(killers.begin(), killers.end(), common_pdom) == 0) if (!common_pdom || std::count(killers.begin(), killers.end(), common_pdom) == 0)
{ {
if (common_pdom) if (common_pdom)
{ {
@ -6099,6 +6099,7 @@ public:
} }
} }
// bool flag indicates the presence of a memory barrier before the killer store
std::vector<std::pair<llvm::BasicBlock*, bool>> work2_list; std::vector<std::pair<llvm::BasicBlock*, bool>> work2_list;
for (usz wi = 0; wi < work_list.size(); wi++) for (usz wi = 0; wi < work_list.size(); wi++)
@ -6137,6 +6138,9 @@ public:
worked_on[work2_list[wi].first] = true; worked_on[work2_list[wi].first] = true;
} }
// Need to treat tails differently: do not require checking barrier (checked before in a suitable manner)
const usz work_list_tail_blocks_max_index = work2_list.size();
for (usz wi = 0; wi < work2_list.size(); wi++) for (usz wi = 0; wi < work2_list.size(); wi++)
{ {
auto [cur, found_user] = work2_list[wi]; auto [cur, found_user] = work2_list[wi];
@ -6153,9 +6157,15 @@ public:
continue; continue;
} }
if (!found_user && bb_to_info[cur] && bb_to_info[cur]->store_context_last_id[i]) if (!found_user && wi >= work_list_tail_blocks_max_index)
{ {
found_user = true; if (auto info = bb_to_info[cur])
{
if (info->store_context_ctr[i] != 1)
{
found_user = true;
}
}
} }
for (auto* p : llvm::predecessors(cur)) for (auto* p : llvm::predecessors(cur))