From 816b7fb5cb622dd6c5d0fbcecdcb27779029f80f Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Fri, 8 Jan 2021 11:44:33 +0000 Subject: [PATCH] aco: fix unreachable() for uniform 8/16-bit nir_op_mov from VGPR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rhys Perry Reviewed-by: Daniel Schürmann Fixes: d20a752c0de ("aco: use Builder::copy more") Part-of: --- src/amd/compiler/aco_instruction_selection.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 191164727fb..5f1b57a8365 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -1240,12 +1240,14 @@ void visit_alu_instr(isel_context *ctx, nir_alu_instr *instr) } case nir_op_mov: { Temp src = get_alu_src(ctx, instr->src[0]); - if (src.bytes() != dst.bytes()) - unreachable("wrong src or dst register class for nir_op_mov"); - if (src.type() == RegType::vgpr && dst.type() == RegType::sgpr) + if (src.type() == RegType::vgpr && dst.type() == RegType::sgpr) { + /* use size() instead of bytes() for 8/16-bit */ + assert(src.size() == dst.size() && "wrong src or dst register class for nir_op_mov"); bld.pseudo(aco_opcode::p_as_uniform, Definition(dst), src); - else + } else { + assert(src.bytes() == dst.bytes() && "wrong src or dst register class for nir_op_mov"); bld.copy(Definition(dst), src); + } break; } case nir_op_inot: {