diff options
author | Timur Kristóf <timur.kristof@gmail.com> | 2019-12-31 13:39:56 +0100 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-01-07 09:20:49 -0800 |
commit | 180a8a73e0a39b1705bb2051e89a8849da282d30 (patch) | |
tree | 771337360b0bd5216757bb450c3e4debce3dce92 | |
parent | e1e84f65020b7b71e6bf204ee5c925095fc95534 (diff) |
aco: Fix uniform i2i64.
Fixes 240 failing test cases in dEQP-VK.spirv_assembly which
were failing due to a bad s_ashr_i32 instruction. This commit
fixes the instruction format along with the definitions of the
instruction.
Fixes: 11f43caaeca166c96ae49dbd506b6f58dd4a13fb
Cc: 19.3 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
(cherry picked from commit 11e62a9734c631fa38f1e7b415f5b98f6a28589f)
-rw-r--r-- | src/amd/compiler/aco_instruction_selection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 6156f7cff9f..4a2ca6321d7 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -1977,7 +1977,7 @@ void visit_alu_instr(isel_context *ctx, nir_alu_instr *instr) case nir_op_i2i64: { Temp src = get_alu_src(ctx, instr->src[0]); if (src.regClass() == s1) { - Temp high = bld.sopc(aco_opcode::s_ashr_i32, bld.def(s1, scc), src, Operand(31u)); + Temp high = bld.sop2(aco_opcode::s_ashr_i32, bld.def(s1), bld.def(s1, scc), src, Operand(31u)); bld.pseudo(aco_opcode::p_create_vector, Definition(dst), src, high); } else if (src.regClass() == v1) { Temp high = bld.vop2(aco_opcode::v_ashrrev_i32, bld.def(v1), Operand(31u), src); |