shifathosn
/
AnyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3662 from Celegans12/perf/recompiler-iteration-selection-storage 

perf(recompiler): reuse sorted sets for iteration selection merges
This commit is contained in:
Adrià 2026-10-11 23:44:59 +02:00 committed by GitHub
parent f6203c150b 76fa2beceb
commit f35bcafbee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/libs/prx/libSceAgcDriver/CMakeLists.txt
View File

@ -1047,8 +1047,12 @@ if(BUILD_TESTING)
endif()
add_test(NAME agc_structurizer_intersection_off COMMAND agc_structurizer_tests)
set_tests_properties(agc_structurizer_intersection_off PROPERTIES ENVIRONMENT "ANYPS5_NO_SHADER_CACHE=1;APS5_NO_PERF_DOM_INTERSECTION=1" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
add_test(NAME agc_structurizer_iteration_selection_off COMMAND agc_structurizer_tests)
set_tests_properties(agc_structurizer_iteration_selection_off PROPERTIES ENVIRONMENT "ANYPS5_NO_SHADER_CACHE=1;APS5_NO_PERF_ITERATION_SELECTION=1" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
add_test(NAME agc_shader_control_flow_iteration_selection_off COMMAND agc_shader_control_flow_tests)
set_tests_properties(agc_shader_control_flow_iteration_selection_off PROPERTIES ENVIRONMENT "ANYPS5_NO_SHADER_CACHE=1;APS5_NO_PERF_ITERATION_SELECTION=1" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
if(WIN32)
set_tests_properties(agc_structurizer_intersection_off PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:$<TARGET_FILE_DIR:libc>")
set_tests_properties(agc_structurizer_intersection_off agc_structurizer_iteration_selection_off agc_shader_control_flow_iteration_selection_off PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:$<TARGET_FILE_DIR:libc>")
endif()
add_test(NAME agc_driver_gated_dispatch_capture_short_timeout COMMAND agc_driver_gated_dispatch_capture_tests)
set_tests_properties(agc_driver_gated_dispatch_capture_short_timeout PROPERTIES

25
core/shader/recompiler/ControlFlow/src/Structurizer.cpp
View File

@ -484,6 +484,7 @@ std::uint32_t mergeBesideReturns(const ControlFlowGraph& graph, const BasicBlock
std::uint32_t iterationSelectionMerge(const ControlFlowGraph& graph, const NaturalLoop& loop, const BasicBlock& header, std::uint32_t join) {
const auto count = static_cast<std::uint32_t>(graph.blocks.size());
static const bool reuse = std::getenv("APS5_NO_PERF_ITERATION_SELECTION") == nullptr;
const auto escapes = [&](std::uint32_t blockId) { return blockId == loop.continueBlock || blockId == loop.mergeBlock; };
std::vector<bool> joins(count, false);
std::vector<std::uint32_t> pending = {join};
@ -511,16 +512,30 @@ std::uint32_t iterationSelectionMerge(const ControlFlowGraph& graph, const Natur
if (!joins[block.id] || block.id == join) {
continue;
}
auto next = allBlockIds(count);
bool seeded = !reuse;
auto next = seeded ? allBlockIds(count) : std::vector<std::uint32_t>{};
for (const auto successor : block.successors) {
if (joins[successor]) {
next = intersectSorted(next, postDominators[successor]);
if (!seeded) {
next = postDominators[successor];
seeded = true;
} else if (reuse) {
intersectAnalysisSet(next, postDominators[successor]);
} else {
next = intersectSorted(next, postDominators[successor]);
}
}
}
addUnique(next, block.id);
sortUnique(next);
if (!seeded) next = allBlockIds(count);
if (reuse) {
addSortedUnique(next, block.id);
} else {
addUnique(next, block.id);
sortUnique(next);
}
if (next != postDominators[block.id]) {
postDominators[block.id] = std::move(next);
if (reuse) replaceAnalysisSet(postDominators[block.id], std::move(next));
else postDominators[block.id] = std::move(next);
changed = true;
}
}

1
core/shader/recompiler/ShaderDiskCache.cpp
View File

@ -671,6 +671,7 @@ constexpr std::string_view NeutralSwitches[] = {
"APS5_NO_FAILURE_MEMO",
"APS5_NO_PERF_FRONTEND_PAIR",
"APS5_NO_PERF_DOM_INTERSECTION",
"APS5_NO_PERF_ITERATION_SELECTION",
"APS5_NO_RESULT_MEMO",
};