raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-25 04:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

shader: new fill pattern

Browse Source
This commit is contained in:
nmzik
2026-10-17 06:24:29 +02:00
parent f6f1ac8b40
commit ec08ea197b
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/shader/recompiler/ir/passes/ResourceTracking.cpp
+8 -8
View File
@@ -4047,18 +4047,18 @@ UniformFillPlan RecognizePatternFill(Program& program, const Decoder::Program& d
struct Pattern { struct Pattern {
size_t code_words; size_t code_words;
uint64_t hash; uint64_t hash;
uint32_t wave_size; uint32_t wave_size_mask;
bool bounded; bool bounded;
}; };
constexpr std::array patterns { constexpr std::array patterns {
// Bounded 64-lane variant. // Bounded 64-lane variant.
Pattern {.code_words = 69, .hash = 0x0704b9818e3cba06ull, .wave_size = 64, .bounded = true}, Pattern {.code_words = 69, .hash = 0x0704b9818e3cba06ull, .wave_size_mask = 64, .bounded = true},
// Dispatch thread dimensions, 64-lane variants. // Dispatch thread dimensions, 64-lane variants.
Pattern {.code_words = 42, .hash = 0x92ce57f21310ef02ull, .wave_size = 64, .bounded = false}, Pattern {.code_words = 42, .hash = 0x92ce57f21310ef02ull, .wave_size_mask = 64, .bounded = false},
Pattern {.code_words = 40, .hash = 0x374161027f58bee7ull, .wave_size = 64, .bounded = false}, Pattern {.code_words = 40, .hash = 0x374161027f58bee7ull, .wave_size_mask = 64, .bounded = false},
Pattern {.code_words = 40, .hash = 0x7d7172c56c2e296dull, .wave_size = 64, .bounded = false}, Pattern {.code_words = 40, .hash = 0x7d7172c56c2e296dull, .wave_size_mask = 64, .bounded = false},
// Dispatch thread dimensions, 32-lane variant. // Dispatch thread dimensions, valid in both wave sizes.
Pattern {.code_words = 38, .hash = 0xacbda1a1ccdd4198ull, .wave_size = 32, .bounded = false}, Pattern {.code_words = 38, .hash = 0xacbda1a1ccdd4198ull, .wave_size_mask = 32 | 64, .bounded = false},
}; };
if (program.stage != ShaderType::Compute || input.compute == nullptr || if (program.stage != ShaderType::Compute || input.compute == nullptr ||
decoded.instructions.empty() || program.user_data_base != 0 || program.user_data_count < 10 || decoded.instructions.empty() || program.user_data_base != 0 || program.user_data_count < 10 ||
@@ -4078,7 +4078,7 @@ UniformFillPlan RecognizePatternFill(Program& program, const Decoder::Program& d
const auto pattern = std::ranges::find_if(patterns, [&](const Pattern& candidate) { const auto pattern = std::ranges::find_if(patterns, [&](const Pattern& candidate) {
return candidate.code_words == words && candidate.hash == hash; return candidate.code_words == words && candidate.hash == hash;
}); });
if (pattern == patterns.end() || program.wave_size != pattern->wave_size || if (pattern == patterns.end() || (program.wave_size & pattern->wave_size_mask) == 0 ||
cs.dispatch_thread_dimensions != !pattern->bounded) return {}; cs.dispatch_thread_dimensions != !pattern->bounded) return {};
std::array<Value, 10> userdata; std::array<Value, 10> userdata;
for (auto* block: program.blocks) { for (auto* block: program.blocks) {
tests/shaderCfgTests.cpp
+3
View File
@@ -14508,6 +14508,7 @@ void TestPatternFill() {
const PatternCase cases[] = { const PatternCase cases[] = {
{bounded_shader, 64, true, 10}, {bounded_shader, 64, true, 10},
{thread_dimension_shader, 32, false, 8}, {thread_dimension_shader, 32, false, 8},
{thread_dimension_shader, 64, false, 8},
{thread_dimension_wave64_shader, 64, false, 9}, {thread_dimension_wave64_shader, 64, false, 9},
{thread_dimension_wave64_scalar_shader, 64, false, 8}, {thread_dimension_wave64_scalar_shader, 64, false, 8},
{thread_dimension_wave64_vector_shader, 64, false, 8}, {thread_dimension_wave64_vector_shader, 64, false, 8},
@@ -14584,6 +14585,8 @@ void TestPatternFill() {
Check(Build(changed).uniform_fill.fill.kind == UniformFillKind::None, Check(Build(changed).uniform_fill.fill.kind == UniformFillKind::None,
"pattern recognition accepted modified executable instructions"); "pattern recognition accepted modified executable instructions");
for (const uint32_t invalid_input : {0u, 1u, 2u, 3u}) { for (const uint32_t invalid_input : {0u, 1u, 2u, 3u}) {
// Both wave sizes are covered above for this executable.
if (invalid_input == 1 && shader.data() == thread_dimension_shader) continue;
const auto saved_compute = compute; const auto saved_compute = compute;
const auto saved_wave = options.wave_size; const auto saved_wave = options.wave_size;
if (invalid_input == 0) compute.workgroup_register = 11; if (invalid_input == 0) compute.workgroup_register = 11;