mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-29 06:16:55 +01:00
shader: implement V_MIN_U32
This commit is contained in:
@@ -824,7 +824,7 @@ constexpr Vop2SdwaRule VOP2_SDWA_RULES[] = {
|
|||||||
SdwaSelWords() | SdwaSelFull(), true, true},
|
SdwaSelWords() | SdwaSelFull(), true, true},
|
||||||
{Opcode::VMulI32I24, SdwaSelFull(), SdwaSelAll(), SdwaSelAll(), false, false},
|
{Opcode::VMulI32I24, SdwaSelFull(), SdwaSelAll(), SdwaSelAll(), false, false},
|
||||||
{Opcode::VMulU32U24, SdwaSelFull(), SdwaSelAll(), SdwaSelAll(), false, false},
|
{Opcode::VMulU32U24, SdwaSelFull(), SdwaSelAll(), SdwaSelAll(), false, false},
|
||||||
{Opcode::VMinU32, SdwaSelFull(), SdwaSelAll(), SdwaSelAll(), false, false},
|
{Opcode::VMinU32, SdwaSelAll(), SdwaSelAll(), SdwaSelAll(), true, false},
|
||||||
{Opcode::VMaxU32, SdwaSelFull(), SdwaSelAll(), SdwaSelAll(), false, false},
|
{Opcode::VMaxU32, SdwaSelFull(), SdwaSelAll(), SdwaSelAll(), false, false},
|
||||||
{Opcode::VLshrrevB32, SdwaSelFull(), SdwaSelFull(), SdwaSelWords() | SdwaSelFull(), false,
|
{Opcode::VLshrrevB32, SdwaSelFull(), SdwaSelFull(), SdwaSelWords() | SdwaSelFull(), false,
|
||||||
false},
|
false},
|
||||||
|
|||||||
@@ -10158,6 +10158,31 @@ TestCase Vop2SdwaSubNcPreservesByteAndWordDestinations() {
|
|||||||
{O::VMovB32, O::VSubNcU32, O::BufferStoreDword, O::SEndpgm}};
|
{O::VMovB32, O::VSubNcU32, O::BufferStoreDword, O::SEndpgm}};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TestCase Vop2SdwaMinU32PreservesWordDestination() {
|
||||||
|
using O = ShaderOpcode;
|
||||||
|
|
||||||
|
std::vector<u32> code;
|
||||||
|
AppendVMovLiteral(&code, 10, 0xa1b2c3d4u);
|
||||||
|
AppendVMovU32(&code, 12, 7);
|
||||||
|
code.push_back(0x261418f9u);
|
||||||
|
code.push_back(0x0686149fu);
|
||||||
|
AppendStoreVgpr(&code, 10, 0);
|
||||||
|
AppendVMovLiteral(&code, 10, 0xa1b2c3d4u);
|
||||||
|
AppendVMovU32(&code, 12, 64);
|
||||||
|
code.push_back(0x261418f9u);
|
||||||
|
code.push_back(0x0686149fu);
|
||||||
|
AppendStoreVgpr(&code, 10, 1);
|
||||||
|
AppendEnd(&code);
|
||||||
|
|
||||||
|
TestCase test;
|
||||||
|
test.name = "Vop2SdwaMinU32PreservesWordDestination";
|
||||||
|
test.code = code;
|
||||||
|
test.expected = {0xa1b20007u, 0xa1b2001fu};
|
||||||
|
test.opcodes = {O::VMovB32, O::VMinU32, O::BufferStoreDword, O::SEndpgm};
|
||||||
|
test.required_spirv = {"OpULessThan", "OpSelect", "OpBitwiseOr"};
|
||||||
|
return test;
|
||||||
|
}
|
||||||
|
|
||||||
TestCase VectorShiftCountsMaskLowBits() {
|
TestCase VectorShiftCountsMaskLowBits() {
|
||||||
using O = ShaderOpcode;
|
using O = ShaderOpcode;
|
||||||
|
|
||||||
@@ -15120,6 +15145,7 @@ std::vector<TestCase> MakeCases() {
|
|||||||
AddCase(VectorIntegerOps);
|
AddCase(VectorIntegerOps);
|
||||||
AddCase(Vop2SdwaSubNcExactByte2Destination);
|
AddCase(Vop2SdwaSubNcExactByte2Destination);
|
||||||
AddCase(Vop2SdwaSubNcPreservesByteAndWordDestinations);
|
AddCase(Vop2SdwaSubNcPreservesByteAndWordDestinations);
|
||||||
|
AddCase(Vop2SdwaMinU32PreservesWordDestination);
|
||||||
AddCase(VectorShiftCountsMaskLowBits);
|
AddCase(VectorShiftCountsMaskLowBits);
|
||||||
AddCase(VectorVop3IntegerOps);
|
AddCase(VectorVop3IntegerOps);
|
||||||
AddCase(VectorBfeI32ArithmeticShiftMasksField);
|
AddCase(VectorBfeI32ArithmeticShiftMasksField);
|
||||||
|
|||||||
@@ -2426,6 +2426,8 @@ void TestNewShaderRecompilerBootB16PackedAndSdwaOpcodes() {
|
|||||||
0x0d860688u, // v_add_nc_u32 v6, 8, sign-extended v6.hi
|
0x0d860688u, // v_add_nc_u32 v6, 8, sign-extended v6.hi
|
||||||
0x4c1616f9u,
|
0x4c1616f9u,
|
||||||
0x0686128du, // v_sub_nc_u32 v11.byte2, 13, v11; preserve other destination bytes
|
0x0686128du, // v_sub_nc_u32 v11.byte2, 13, v11; preserve other destination bytes
|
||||||
|
0x261418f9u,
|
||||||
|
0x0686149fu, // v_min_u32 v10.word0, 31, v12; preserve upper destination word
|
||||||
0xbf810000u,
|
0xbf810000u,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -2476,6 +2478,8 @@ void TestNewShaderRecompilerBootB16PackedAndSdwaOpcodes() {
|
|||||||
"new decoder did not decode V_ADD_NC_U32 SDWA sign-extended high word");
|
"new decoder did not decode V_ADD_NC_U32 SDWA sign-extended high word");
|
||||||
Check(Common::ContainsStr(result.decoded_dump, "v_sub_nc_u32 v11.sdwa(sel=2"),
|
Check(Common::ContainsStr(result.decoded_dump, "v_sub_nc_u32 v11.sdwa(sel=2"),
|
||||||
"new decoder did not decode V_SUB_NC_U32 SDWA byte-2 destination");
|
"new decoder did not decode V_SUB_NC_U32 SDWA byte-2 destination");
|
||||||
|
Check(Common::ContainsStr(result.decoded_dump, "v_min_u32 v10.sdwa(sel=4"),
|
||||||
|
"new decoder did not decode V_MIN_U32 SDWA low-word destination");
|
||||||
Check(!Common::ContainsStr(result.decoded_dump, "unsupported family=VOP2 opcode=0x00"),
|
Check(!Common::ContainsStr(result.decoded_dump, "unsupported family=VOP2 opcode=0x00"),
|
||||||
"literal/SDWA extension words were decoded as phantom VOP2 instructions");
|
"literal/SDWA extension words were decoded as phantom VOP2 instructions");
|
||||||
Check(!Common::ContainsStr(result.decoded_dump,
|
Check(!Common::ContainsStr(result.decoded_dump,
|
||||||
@@ -2511,6 +2515,8 @@ void TestNewShaderRecompilerBootB16PackedAndSdwaOpcodes() {
|
|||||||
"V_ADD_NC_U32 SDWA sign-extended high word did not lower to IR");
|
"V_ADD_NC_U32 SDWA sign-extended high word did not lower to IR");
|
||||||
Check(Common::ContainsStr(result.ir_dump, "ISubU32 v11.sdwa(sel=2"),
|
Check(Common::ContainsStr(result.ir_dump, "ISubU32 v11.sdwa(sel=2"),
|
||||||
"V_SUB_NC_U32 SDWA byte-2 destination did not lower to IR");
|
"V_SUB_NC_U32 SDWA byte-2 destination did not lower to IR");
|
||||||
|
Check(Common::ContainsStr(result.ir_dump, "UMinU32 v10.sdwa(sel=4"),
|
||||||
|
"V_MIN_U32 SDWA low-word destination did not lower to IR");
|
||||||
Check(SpirvContainsOpcode(result.spirv, 128),
|
Check(SpirvContainsOpcode(result.spirv, 128),
|
||||||
"SPIR-V binary does not contain OpIAdd for U16 operations");
|
"SPIR-V binary does not contain OpIAdd for U16 operations");
|
||||||
Check(SpirvContainsOpcode(result.spirv, 202),
|
Check(SpirvContainsOpcode(result.spirv, 202),
|
||||||
|
|||||||
Reference in New Issue
Block a user