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

Merge pull request #2258 from krishalivaibhav/codex/spirv13-image-regression 

test(shader): cover SPIR-V 1.3 image compilation without a GPU
This commit is contained in:
Adrià 2026-10-11 13:53:14 +02:00 committed by GitHub
parent c5a304a824 4361d8c53a
commit 2e2c531441
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,6 +439,10 @@ set_target_properties(agc_spirv_narrow_constant_store_tests PROPERTIES CXX_EXTEN
configure_windows_unwind(agc_spirv_narrow_constant_store_tests)
if(ANYPS5_ENABLE_SPIRV_TOOLS)
target_link_libraries(agc_spirv_narrow_constant_store_tests PRIVATE SPIRV-Tools-static)
add_test_executable(agc_spirv13_image_tests EXCLUDE_FROM_ALL tests/Spirv13Image.cpp)
target_link_libraries(agc_spirv13_image_tests PRIVATE shader_recompiler_agc_driver libc)
set_target_properties(agc_spirv13_image_tests PROPERTIES CXX_EXTENSIONS OFF)
configure_windows_unwind(agc_spirv13_image_tests)
add_test_executable(agc_spirv_optimizer_tests EXCLUDE_FROM_ALL tests/SpirvOptimizer.cpp)
target_link_libraries(agc_spirv_optimizer_tests PRIVATE shader_recompiler_agc_driver libc SPIRV-Tools-static)
set_target_properties(agc_spirv_optimizer_tests PROPERTIES CXX_EXTENSIONS OFF)
@ -1071,7 +1075,7 @@ if(BUILD_TESTING)
"PATH=path_list_prepend:$<TARGET_FILE_DIR:libc>")
endif()
foreach(agcTest IN ITEMS agc_spirv_narrow_constant_store_tests agc_spirv_optimizer_tests agc_driver_constant_store_tests)
foreach(agcTest IN ITEMS agc_spirv_narrow_constant_store_tests agc_spirv13_image_tests agc_spirv_optimizer_tests agc_driver_constant_store_tests)
if(NOT TARGET ${agcTest})
continue()
endif()
@ -1089,6 +1093,9 @@ if(BUILD_TESTING)
${agcSpirvEnvironment} "$<TARGET_FILE:${agcTest}>")
set_tests_properties(${agcTestName} PROPERTIES
ENVIRONMENT "ANYPS5_NO_SHADER_CACHE=1" TIMEOUT 60 SKIP_RETURN_CODE 77)
if(agcTest STREQUAL "agc_spirv13_image_tests")
set_tests_properties(${agcTestName} PROPERTIES TIMEOUT 30)
endif()
if(agcTest STREQUAL "agc_driver_constant_store_tests")
set_tests_properties(${agcTestName} PROPERTIES RUN_SERIAL TRUE)
endif()

75
core/libs/prx/libSceAgcDriver/tests/Spirv13Image.cpp Normal file
View File

@ -0,0 +1,75 @@
#include "BdaAbi.hpp"
#include "Recompiler.hpp"
#include <spirv/unified1/spirv.hpp>
#include <algorithm>
#include <array>
#include <cstdio>
#include <stdexcept>
#include <string_view>
namespace {
using namespace ShaderRecompiler;
alignas(256) std::array<std::uint32_t, 65536> Output{};
alignas(256) std::array<std::uint8_t, 32768> Texture{};
alignas(256) constexpr std::array<std::uint32_t, 17> Code{
0x7e080218u, 0x343c0885u, 0x4a3c3d00u, 0x34063c84u, 0x2c3e3c87u, 0x363c3cffu, 0x0000007fu,
0x7e140280u, 0x7e160280u, 0x7e180280u, 0x7e1a0280u, 0xf0001f08u, 0x00010a1eu,
0xbf8c3f70u, 0xe0781000u, 0x80000a03u, 0xbf810000u,
};
void CheckImage(std::uint32_t version) {
const auto outputAddress = reinterpret_cast<std::uintptr_t>(Output.data());
const auto textureAddress = reinterpret_cast<std::uintptr_t>(Texture.data());
const std::array<std::uint32_t, 4> buffer{
static_cast<std::uint32_t>(outputAddress), static_cast<std::uint32_t>((outputAddress >> 32u) & 0xffffu),
static_cast<std::uint32_t>(Output.size() * 4u), 0x31016facu,
};
const std::array<std::uint32_t, 8> image{
static_cast<std::uint32_t>(textureAddress >> 8u),
static_cast<std::uint32_t>((textureAddress >> 40u) & 0xffu) | (6u << 20u) | (3u << 30u),
31u | (127u << 14u), 0x24cu | (9u << 28u), 0u, 0u, 0u, 0u,
};
const std::array<std::uint32_t, 4> sampler{0x92u, 0x00fff000u, 0u, 0u};
std::array<std::uint32_t, 24> userData{};
std::copy(buffer.begin(), buffer.end(), userData.begin());
std::copy(image.begin(), image.end(), userData.begin() + 4);
std::copy(sampler.begin(), sampler.end(), userData.begin() + 12);
const std::array<MemoryRegion, 1> memory{{{reinterpret_cast<std::uintptr_t>(Code.data()), std::as_bytes(std::span(Code))}}};
const std::array<std::uint32_t, 15> capabilities{
spv::CapabilityShader, spv::CapabilityInt64, spv::CapabilityPhysicalStorageBufferAddresses,
spv::CapabilityGroupNonUniform, spv::CapabilityGroupNonUniformBallot, spv::CapabilityGroupNonUniformShuffle,
spv::CapabilityImageQuery, spv::CapabilityStorageImageExtendedFormats, spv::CapabilityStorageImageReadWithoutFormat,
spv::CapabilityStorageImageWriteWithoutFormat, spv::CapabilitySampled1D, spv::CapabilityImage1D,
spv::CapabilitySampledBuffer, spv::CapabilityImageBuffer, spv::CapabilityFloat16,
};
const std::array<std::string_view, 4> extensions{
"SPV_EXT_descriptor_indexing", "SPV_KHR_float_controls", "SPV_KHR_physical_storage_buffer", "SPV_KHR_16bit_storage",
};
RecompileRequest request{};
request.shader = {ShaderStage::Compute, reinterpret_cast<std::uintptr_t>(Code.data()), Code, 0, {}};
request.context = {32, 0, userData, ShaderComputeStageInfo{{32, 1, 1}, 0, {true, false, false}, false, 1}, std::nullopt, std::nullopt, memory};
request.target = {0x00401000u, version, 32, BdaAbi::Version, capabilities, extensions, false, {1024, 1024, 64}, 1024, 32768, {}, {}};
request.layout = {0, 0, 0, 128};
request.useCache = false;
const auto result = Recompile(request);
const auto& words = result.spirv.Words();
if (words.size() < 5 || words[0] != spv::MagicNumber || words[1] > version) {
throw std::runtime_error("image compilation did not preserve the requested SPIR-V target");
}
}
}
int main() {
try {
CheckImage(0x00010300u);
CheckImage(0x00010400u);
std::puts("SPIR-V 1.3 and 1.4 image compilation passed");
return 0;
} catch (const std::exception& error) {
std::fprintf(stderr, "%s\n", error.what());
return 1;
}
}