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

shader: FLAT_STORE_DWORD

Browse Source
This commit is contained in:
nmzik
2026-10-09 08:46:30 +02:00
parent 7b9997baea
commit 1fc520cd62
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/shader/recompiler/frontend/decode/MemoryOps.cpp
+1 -1
View File
@@ -371,7 +371,7 @@ void DecodeFlat(uint32_t pc, std::span<const uint32_t> code, uint32_t word_index
ApplyMemoryInfo(inst, info);
SetRawWords(inst, code, word_index, 2);
if (lds != 0 || inst.glc || inst.slc || seg == 3u) {
if (lds != 0 || inst.glc || (inst.slc && !IsFlatStoreOpcode(inst.opcode)) || seg == 3u) {
SetUnsupported(inst, Family::FLAT, opcode, "FLAT modifiers or segment are not implemented");
return;
}
tests/ShaderRecompilerComputeTests.cpp
+38
View File
@@ -30746,6 +30746,42 @@ TestCase FlatLoadDlcCaptured(u32 wave_size) {
return test;
}
TestCase FlatStoreSlcCaptured() {
TestCase test;
test.name = "FlatStoreSlcCaptured";
auto& code = test.code;
code.push_back(EncodeSop1(0x0b, 26, InlineU32(1))); // s26 = 0x80000000.
AppendVMovLiteral(&code, 12, 0x000c0008u); // Packed halfwords 8 and 12 select byte offset 8.
code.insert(code.end(), {0x260c18f9u, 0x0504060cu, // Unsigned minimum of the two halfwords.
0xd5590007u, 0x0431fe1au, 0x70000000u});
AppendVMovLiteral(&code, 3, 0x12345678u);
// Exercise an SLC store through v[6:7].
code.insert(code.end(), {0xdc720000u, 0x007d0306u});
AppendVMovLiteral(&code, 3, 0xdeadbeefu);
code.push_back(EncodeSop1(0x04, 126, InlineU32(0)));
code.insert(code.end(), {0xdc720000u, 0x007d0306u});
code.push_back(EncodeSop1(0x04, 126, 193)); // Restore EXEC before readback.
code.insert(code.end(), {0xd5590007u, 0x0431fe1au, 0x70000000u,
EncodeFlat0(0x0c, 0), EncodeFlat1(4, 0x7d, 0, 6)});
AppendStoreVgprAtLaneDwordOffset(&code, 4, 0, 0);
AppendEnd(&code);
test.initial.assign(65, 0xa5a5a5a5u);
test.expected.assign(64, 0x12345678u);
test.expected.push_back(0xa5a5a5a5u);
test.opcodes = {ShaderOpcode::S_BREV_B32, ShaderOpcode::V_MIN_U32,
ShaderOpcode::V_MED3_U32, ShaderOpcode::V_MOV_B32, ShaderOpcode::FLAT_STORE_DWORD,
ShaderOpcode::S_MOV_B64, ShaderOpcode::FLAT_LOAD_DWORD,
ShaderOpcode::BUFFER_STORE_DWORD, ShaderOpcode::S_ENDPGM};
test.compute_info.scratch_size_dwords = 4;
test.compute_info.threads_num[0] = 64;
test.compute_info.threads_num[1] = test.compute_info.threads_num[2] = 1;
test.compute_info.thread_ids_num = 1;
test.has_compute_info = true;
test.decoded_counts = {{"slc=1", 2}};
test.forbidden_spirv = {"get_bda_pointer"};
return test;
}
TestCase FlatLoadVariants() {
using O = ShaderOpcode;
@@ -36708,6 +36744,7 @@ std::vector<TestCase> MakeCases() {
AddCase(TBufferStoreVariants);
cases.push_back(FlatLoadDlcCaptured(32));
cases.push_back(FlatLoadDlcCaptured(64));
AddCase(FlatStoreSlcCaptured);
AddCase(FlatLoadVariants);
AddCase(FlatSubdwordLoadsApplyByteOffset);
cases.push_back(GlobalLoadShortD16Captured(32));
@@ -42249,6 +42286,7 @@ int main(int argc, char **argv) {
}
if (argc == 2 && std::strcmp(argv[1], "--flat-d16-only") == 0) {
VulkanHarness vulkan;
RunCase(&vulkan, FlatStoreSlcCaptured());
RunCase(&vulkan, FlatLoadDlcCaptured(32));
RunCase(&vulkan, FlatLoadDlcCaptured(64));
RunCase(&vulkan, GlobalLoadShortD16Captured(32));