Module: Mesa Branch: master Commit: ddd767387f336ed1578f171a2af4ca33c564d7f3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ddd767387f336ed1578f171a2af4ca33c564d7f3
Author: Samuel Pitoiset <[email protected]> Date: Mon Feb 10 12:13:15 2020 +0100 aco: fix creating v_madak if v_mad_f32 has two sgpr literals Do not ignore that src1 can be a sgpr. Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2435 Cc: <[email protected]> Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Rhys Perry <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3759> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3759> --- src/amd/compiler/aco_optimizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index 0b9fccc379e..5f2e5637b71 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -2604,7 +2604,7 @@ void select_instruction(opt_ctx &ctx, aco_ptr<Instruction>& instr) continue; /* if one of the operands is sgpr, we cannot add a literal somewhere else on pre-GFX10 or operands other than the 1st */ if (instr->operands[i].getTemp().type() == RegType::sgpr && (i > 0 || ctx.program->chip_class < GFX10)) { - if (ctx.info[instr->operands[i].tempId()].is_literal()) { + if (!sgpr_used && ctx.info[instr->operands[i].tempId()].is_literal()) { literal_uses = ctx.uses[instr->operands[i].tempId()]; literal_idx = i; } else { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
