Commit 22e4439a20 for qemu.org
commit 22e4439a20c664ca34e23d3f98d762ba2352dce6
Author: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date: Wed Oct 28 11:49:42 2026 +0100
tcg/riscv64: Fix constant handling in vector comparisons and selects
tcg_out_cmpsel() takes constants as TCGReg and passes the whole
replicated value to the .vi encoders instead of one element. The
encoding is still correct, because encode_vi() keeps the low 5 bits,
but it trips the range assert added in 006352d69f14 in debug builds.
E.g. "cmlt v0.8h, #0" computes 0 - 1 in unsigned TCGReg, giving
0xffffffff instead of -1.
Use TCGArg for these operands and extract the element with vec_imm()
before encoding, including before the LT/GE adjustment, so the assert
keeps checking that the emitter agrees with the constraint matcher.
Fixes: 006352d69f14 ("tcg/riscv64: Assert immediate in range ...")
Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20261028143330.6518-5-philmd@oss.qualcomm.com>
diff --git a/tcg/riscv64/tcg-target.c.inc b/tcg/riscv64/tcg-target.c.inc
index 55685db44f..902e600a1f 100644
--- a/tcg/riscv64/tcg-target.c.inc
+++ b/tcg/riscv64/tcg-target.c.inc
@@ -1556,9 +1556,9 @@ static void tcg_out_cltz(TCGContext *s, TCGType type, RISCVInsn insn,
static void tcg_out_cmpsel(TCGContext *s, TCGType type, unsigned vece,
TCGCond cond, TCGReg ret,
- TCGReg cmp1, TCGReg cmp2, bool c_cmp2,
- TCGReg val1, bool c_val1,
- TCGReg val2, bool c_val2)
+ TCGReg cmp1, TCGArg cmp2, bool c_cmp2,
+ TCGArg val1, bool c_val1,
+ TCGArg val2, bool c_val2)
{
set_vtype_len_sew(s, type, vece);
@@ -1575,7 +1575,7 @@ static void tcg_out_cmpsel(TCGContext *s, TCGType type, unsigned vece,
/* Perform the comparison into V0 mask. */
if (c_cmp2) {
tcg_out_opc_vi(s, tcg_cmpcond_to_rvv_vi[cond].op, TCG_REG_V0, cmp1,
- cmp2 - tcg_cmpcond_to_rvv_vi[cond].adjust);
+ vec_imm(cmp2, vece) - tcg_cmpcond_to_rvv_vi[cond].adjust);
} else if (tcg_cmpcond_to_rvv_vv[cond].swap) {
tcg_out_opc_vv(s, tcg_cmpcond_to_rvv_vv[cond].op,
TCG_REG_V0, cmp2, cmp1);
@@ -1585,11 +1585,12 @@ static void tcg_out_cmpsel(TCGContext *s, TCGType type, unsigned vece,
}
if (c_val1) {
if (c_val2) {
- tcg_out_opc_vi(s, OPC_VMV_V_I, ret, 0, val2);
+ tcg_out_opc_vi(s, OPC_VMV_V_I, ret, 0, vec_imm(val2, vece));
val2 = ret;
}
/* vd[i] == v0.mask[i] ? imm : vs2[i] */
- tcg_out_opc_vim_mask(s, OPC_VMERGE_VIM, ret, val2, val1);
+ tcg_out_opc_vim_mask(s, OPC_VMERGE_VIM, ret, val2,
+ vec_imm(val1, vece));
} else {
/* vd[i] == v0.mask[i] ? vs1[i] : vs2[i] */
tcg_out_opc_vvm_mask(s, OPC_VMERGE_VVM, ret, val2, val1);