Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-18 01:14:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

shader_recompiler: Insert end of divergence scope at last relevant instruction. (#2325)

Browse source
This commit is contained in:
squidbus 2025-02-02 14:51:45 -08:00 • committed by GitHub
parent 1d8c607c15
commit 831903799b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/shader_recompiler/frontend/control_flow_graph.cpp
View file

@ -161,6 +161,12 @@ void CFG::EmitDivergenceLabels() {
// scope. // scope.
const auto start = inst_list.begin() + curr_begin + 1; const auto start = inst_list.begin() + curr_begin + 1;
if (!std::ranges::all_of(start, inst_list.begin() + index, IgnoresExecMask)) { if (!std::ranges::all_of(start, inst_list.begin() + index, IgnoresExecMask)) {
// Determine the last instruction affected by the exec mask, so that any
// trailing instructions not affected can be excluded from the scope.
s32 curr_end = index;
while (IgnoresExecMask(inst_list[curr_end - 1])) {
--curr_end;
}
// Add a label to the instruction right after the open scope call. // Add a label to the instruction right after the open scope call.
// It is the start of a new basic block. // It is the start of a new basic block.
const auto& save_inst = inst_list[curr_begin]; const auto& save_inst = inst_list[curr_begin];
@ -173,8 +179,8 @@ void CFG::EmitDivergenceLabels() {
// * Normal instruction at the end of the block // * Normal instruction at the end of the block
// For the last case we must NOT add a label as that would cause // For the last case we must NOT add a label as that would cause
// the instruction to be separated into its own basic block. // the instruction to be separated into its own basic block.
if (is_close) { if (curr_end != end_index - 1) {
AddLabel(index_to_pc[index]); AddLabel(index_to_pc[curr_end]);
} }
} }
// Reset scope begin. // Reset scope begin.