raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-19 18:36:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

shader: retain resource guards for 64-bit scalar comparisons

Browse Source
This commit is contained in:
nmzik
2026-10-18 20:22:54 +02:00
parent 8639e0de81
commit e9bcc77e0b
2 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ResourceTrackingTests.cpp
+60
View File
@@ -5408,6 +5408,65 @@ void TestSrtFlatteningAndRuntimeMemoization() {
"flattened typed SRT reads were not collected");
}
void TestScalarDataReadControlFlow() {
namespace CFG = Libs::Graphics::ShaderRecompiler::CFG;
for (const auto comparison : {ValueOpcode::Void, ValueOpcode::IEqual64,
ValueOpcode::INotEqual64}) {
Fixture fixture;
const auto low = fixture.UserData(0);
const auto high = fixture.UserData(1);
const auto address = fixture.Address(low, high);
auto* use = fixture.block;
if (comparison != ValueOpcode::Void) {
const auto pointer = fixture.Emit(ValueOpcode::CompositeConstructU64, {low, high});
auto enabled = fixture.Emit(comparison, {pointer, Value(uint64_t{0})});
if (comparison == ValueOpcode::IEqual64)
enabled = fixture.Emit(ValueOpcode::LogicalNot, {enabled});
const auto lane = fixture.Emit(ValueOpcode::GetBuiltin,
{Value(static_cast<uint32_t>(StageInputKind::LocalInvocationId)), Value(0u)});
const auto varying = fixture.Emit(ValueOpcode::INotEqual32, {lane, Value(0u)});
fixture.block->condition = fixture.Emit(ValueOpcode::LogicalAnd, {varying, enabled});
use = fixture.AddBlock();
auto* done = fixture.AddBlock();
fixture.block->AddBranch(use);
fixture.block->AddBranch(done);
use->AddBranch(done);
fixture.block->terminator = {.kind = CFG::TerminatorKind::ConditionalBranch,
.true_block = use, .false_block = done};
use->terminator = {.kind = CFG::TerminatorKind::Branch, .true_block = done};
done->terminator.kind = CFG::TerminatorKind::Return;
}
MemoryInfo scalar;
scalar.kind = ResourceKind::ScalarAddress;
fixture.Emit(ValueOpcode::LoadAddressU32,
{address, Value(0u), Value(0u), Value(true)}, fixture.AddMemory(scalar, 4), use);
fixture.PlanAndTrack();
auto plan = ExtractResourcePlan(fixture.program);
Check(plan.srt_reads.size() == 1 && !fixture.program.info.uses_dma &&
bool(plan.srt_code) == (comparison == ValueOpcode::Void),
"scalar data lost flattening or conditional reads entered the unconditional JIT");
uint32_t reads = 0;
std::array<uint32_t, 2> user_data {};
SrtRuntime runtime {.user_data = user_data,
.read_memory = +[](void* data, uint64_t address, std::span<uint32_t> words) {
++*static_cast<uint32_t*>(data);
if (address == 0) return false;
words[0] = 42;
return true;
}, .userdata = &reads};
ResourceSnapshot snapshot;
ResourceSpecialization specialization;
for (const uint64_t pointer : {uint64_t{0}, uint64_t{0x1000}, uint64_t{1} << 32u}) {
if (pointer == 0 && comparison == ValueOpcode::Void) continue;
user_data = {static_cast<uint32_t>(pointer), static_cast<uint32_t>(pointer >> 32u)};
reads = 0;
Check(MaterializeResources(plan, runtime, snapshot, specialization) &&
reads == (pointer != 0) && snapshot.flattened_srt[0] == (pointer ? 42u : 0u),
"scalar data refresh ignored a mixed EXEC/64-bit null-pointer branch");
}
}
}
void TestDynamicSrtReadRemainsExplicit() {
Fixture fixture;
const auto base =
@@ -8311,6 +8370,7 @@ int main() {
Run("shared append selector bounds", TestSharedAppendSelectorBounds);
Run("descending image range", TestDescendingImageRange);
Run("SRT runtime", TestSrtFlatteningAndRuntimeMemoization);
Run("scalar data control flow", TestScalarDataReadControlFlow);
Run("dynamic SRT", TestDynamicSrtReadRemainsExplicit);
Run("writable descriptor phi", TestWritableDescriptorPhi);
Run("bounded formatted buffer store", TestBoundedFormattedBufferStore);