From 83d2a73b73a58006d9835a93a64c3946a5923cda Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 22 Jun 2020 09:17:02 +0200 Subject: [PATCH] aco: improve validation checks for readlane/writelane MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This allows literals for the lane select on GFX10+. The doc says that is should be a SGPR or a constant but VOP3 on GFX10+ allows literals. Some later validation code checks if literals are allowed anyways. Signed-off-by: Samuel Pitoiset Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/aco_validate.cpp | 40 +++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp index b7c773ca8f6..83457e54fdf 100644 --- a/src/amd/compiler/aco_validate.cpp +++ b/src/amd/compiler/aco_validate.cpp @@ -226,12 +226,17 @@ void validate(Program* program, FILE * output) if (instr->isSDWA()) scalar_mask = program->chip_class >= GFX9 ? 0x7 : 0x4; - check(instr->definitions[0].getTemp().type() == RegType::vgpr || - (int) instr->format & (int) Format::VOPC || - instr->opcode == aco_opcode::v_readfirstlane_b32 || - instr->opcode == aco_opcode::v_readlane_b32 || - instr->opcode == aco_opcode::v_readlane_b32_e64, - "Wrong Definition type for VALU instruction", instr.get()); + if ((int) instr->format & (int) Format::VOPC || + instr->opcode == aco_opcode::v_readfirstlane_b32 || + instr->opcode == aco_opcode::v_readlane_b32 || + instr->opcode == aco_opcode::v_readlane_b32_e64) { + check(instr->definitions[0].getTemp().type() == RegType::sgpr, + "Wrong Definition type for VALU instruction", instr.get()); + } else { + check(instr->definitions[0].getTemp().type() == RegType::vgpr, + "Wrong Definition type for VALU instruction", instr.get()); + } + unsigned num_sgprs = 0; unsigned sgpr[] = {0, 0}; for (unsigned i = 0; i < instr->operands.size(); i++) @@ -239,11 +244,26 @@ void validate(Program* program, FILE * output) Operand op = instr->operands[i]; if (instr->opcode == aco_opcode::v_readfirstlane_b32 || instr->opcode == aco_opcode::v_readlane_b32 || - instr->opcode == aco_opcode::v_readlane_b32_e64 || - instr->opcode == aco_opcode::v_writelane_b32 || + instr->opcode == aco_opcode::v_readlane_b32_e64) { + check(i != 1 || + (op.isTemp() && op.regClass().type() == RegType::sgpr) || + op.isConstant(), + "Must be a SGPR or a constant", instr.get()); + check(i == 1 || + (op.isTemp() && op.regClass().type() == RegType::vgpr && op.bytes() <= 4), + "Wrong Operand type for VALU instruction", instr.get()); + continue; + } + + if (instr->opcode == aco_opcode::v_writelane_b32 || instr->opcode == aco_opcode::v_writelane_b32_e64) { - check(!op.isLiteral(), "No literal allowed on VALU instruction", instr.get()); - check(i == 1 || (op.isTemp() && op.regClass().type() == RegType::vgpr && op.bytes() <= 4), "Wrong Operand type for VALU instruction", instr.get()); + check(i != 2 || + (op.isTemp() && op.regClass().type() == RegType::vgpr && op.bytes() <= 4), + "Wrong Operand type for VALU instruction", instr.get()); + check(i == 2 || + (op.isTemp() && op.regClass().type() == RegType::sgpr) || + op.isConstant(), + "Must be a SGPR or a constant", instr.get()); continue; } if (op.isTemp() && instr->operands[i].regClass().type() == RegType::sgpr) { -- 2.30.2