Re: [PATCH v4 079/163] tcg: Merge INDEX_op_brcond_{i32,i64}

2025-04-15 Thread Pierrick Bouvier 

On 4/15/25 12:23, Richard Henderson wrote:

Reviewed-by: Philippe Mathieu-Daudé 
Signed-off-by: Richard Henderson 
---
  include/tcg/tcg-opc.h|  4 +---
  tcg/optimize.c   |  6 +++---
  tcg/tcg-op.c |  4 ++--
  tcg/tcg.c| 24 
  tcg/tci.c|  6 ++
  docs/devel/tcg-ops.rst   |  2 +-
  tcg/tci/tcg-target.c.inc |  4 ++--
  7 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h
index f40bb5796a..d40ca001c2 100644
--- a/include/tcg/tcg-opc.h
+++ b/include/tcg/tcg-opc.h
@@ -34,6 +34,7 @@ DEF(set_label, 0, 0, 1, TCG_OPF_BB_END | TCG_OPF_NOT_PRESENT)
  DEF(call, 0, 0, 3, TCG_OPF_CALL_CLOBBER | TCG_OPF_NOT_PRESENT)
  
  DEF(br, 0, 0, 1, TCG_OPF_BB_END | TCG_OPF_NOT_PRESENT)

+DEF(brcond, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH | TCG_OPF_INT)
  
  DEF(mb, 0, 0, 1, TCG_OPF_NOT_PRESENT)
  
@@ -89,8 +90,6 @@ DEF(extract_i32, 1, 1, 2, 0)

  DEF(sextract_i32, 1, 1, 2, 0)
  DEF(extract2_i32, 1, 2, 1, 0)
  
-DEF(brcond_i32, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH)

-
  DEF(add2_i32, 2, 4, 0, 0)
  DEF(sub2_i32, 2, 4, 0, 0)
  DEF(brcond2_i32, 0, 4, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH)
@@ -124,7 +123,6 @@ DEF(extu_i32_i64, 1, 1, 0, 0)
  DEF(extrl_i64_i32, 1, 1, 0, 0)
  DEF(extrh_i64_i32, 1, 1, 0, 0)
  
-DEF(brcond_i64, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH)

  DEF(bswap16_i64, 1, 1, 1, 0)
  DEF(bswap32_i64, 1, 1, 1, 0)
  DEF(bswap64_i64, 1, 1, 1, 0)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 4b78b0ba82..9e6a2e3ec1 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -1517,14 +1517,14 @@ static bool fold_brcond2(OptContext *ctx, TCGOp *op)
  break;
  
  do_brcond_low:

-op->opc = INDEX_op_brcond_i32;
+op->opc = INDEX_op_brcond;
  op->args[1] = op->args[2];
  op->args[2] = cond;
  op->args[3] = label;
  return fold_brcond(ctx, op);
  
  do_brcond_high:

-op->opc = INDEX_op_brcond_i32;
+op->opc = INDEX_op_brcond;
  op->args[0] = op->args[1];
  op->args[1] = op->args[3];
  op->args[2] = cond;
@@ -2852,7 +2852,7 @@ void tcg_optimize(TCGContext *s)
  case INDEX_op_andc_vec:
  done = fold_andc(&ctx, op);
  break;
-CASE_OP_32_64(brcond):
+case INDEX_op_brcond:
  done = fold_brcond(&ctx, op);
  break;
  case INDEX_op_brcond2_i32:
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 477dfc25b7..041ca95f0d 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -529,7 +529,7 @@ void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, 
TCGv_i32 arg2, TCGLabel *l)
  if (cond == TCG_COND_ALWAYS) {
  tcg_gen_br(l);
  } else if (cond != TCG_COND_NEVER) {
-TCGOp *op = tcg_gen_op4ii_i32(INDEX_op_brcond_i32,
+TCGOp *op = tcg_gen_op4ii_i32(INDEX_op_brcond,
arg1, arg2, cond, label_arg(l));
  add_as_label_use(l, op);
  }
@@ -1874,7 +1874,7 @@ void tcg_gen_brcond_i64(TCGCond cond, TCGv_i64 arg1, 
TCGv_i64 arg2, TCGLabel *l)
 TCGV_HIGH(arg1), TCGV_LOW(arg2),
 TCGV_HIGH(arg2), cond, label_arg(l));
  } else {
-op = tcg_gen_op4ii_i64(INDEX_op_brcond_i64, arg1, arg2, cond,
+op = tcg_gen_op4ii_i64(INDEX_op_brcond, arg1, arg2, cond,
 label_arg(l));
  }
  add_as_label_use(l, op);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index a16ee78090..61bc76365a 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1048,8 +1048,7 @@ static const TCGOutOp * const all_outop[NB_OPS] = {
  OUTOP(INDEX_op_add, TCGOutOpBinary, outop_add),
  OUTOP(INDEX_op_and, TCGOutOpBinary, outop_and),
  OUTOP(INDEX_op_andc, TCGOutOpBinary, outop_andc),
-OUTOP(INDEX_op_brcond_i32, TCGOutOpBrcond, outop_brcond),
-OUTOP(INDEX_op_brcond_i64, TCGOutOpBrcond, outop_brcond),
+OUTOP(INDEX_op_brcond, TCGOutOpBrcond, outop_brcond),
  OUTOP(INDEX_op_clz, TCGOutOpBinary, outop_clz),
  OUTOP(INDEX_op_ctpop, TCGOutOpUnary, outop_ctpop),
  OUTOP(INDEX_op_ctz, TCGOutOpBinary, outop_ctz),
@@ -2282,6 +2281,7 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, 
unsigned flags)
  
  case INDEX_op_add:

  case INDEX_op_and:
+case INDEX_op_brcond:
  case INDEX_op_mov:
  case INDEX_op_negsetcond:
  case INDEX_op_or:
@@ -2289,7 +2289,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, 
unsigned flags)
  case INDEX_op_xor:
  return has_type;
  
-case INDEX_op_brcond_i32:

  case INDEX_op_movcond_i32:
  case INDEX_op_ld8u_i32:
  case INDEX_op_ld8s_i32:
@@ -2319,7 +2318,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, 
unsigned flags)
  case INDEX_op_setcond2_i32:
  return TCG_TARGET_REG_BITS == 32;
  
-case INDEX_op_brcond_i64:

  case

[PATCH v4 079/163] tcg: Merge INDEX_op_brcond_{i32,i64}

2025-04-15 Thread Richard Henderson 
Reviewed-by: Philippe Mathieu-Daudé 
Signed-off-by: Richard Henderson 
---
 include/tcg/tcg-opc.h|  4 +---
 tcg/optimize.c   |  6 +++---
 tcg/tcg-op.c |  4 ++--
 tcg/tcg.c| 24 
 tcg/tci.c|  6 ++
 docs/devel/tcg-ops.rst   |  2 +-
 tcg/tci/tcg-target.c.inc |  4 ++--
 7 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h
index f40bb5796a..d40ca001c2 100644
--- a/include/tcg/tcg-opc.h
+++ b/include/tcg/tcg-opc.h
@@ -34,6 +34,7 @@ DEF(set_label, 0, 0, 1, TCG_OPF_BB_END | TCG_OPF_NOT_PRESENT)
 DEF(call, 0, 0, 3, TCG_OPF_CALL_CLOBBER | TCG_OPF_NOT_PRESENT)
 
 DEF(br, 0, 0, 1, TCG_OPF_BB_END | TCG_OPF_NOT_PRESENT)
+DEF(brcond, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH | TCG_OPF_INT)
 
 DEF(mb, 0, 0, 1, TCG_OPF_NOT_PRESENT)
 
@@ -89,8 +90,6 @@ DEF(extract_i32, 1, 1, 2, 0)
 DEF(sextract_i32, 1, 1, 2, 0)
 DEF(extract2_i32, 1, 2, 1, 0)
 
-DEF(brcond_i32, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH)
-
 DEF(add2_i32, 2, 4, 0, 0)
 DEF(sub2_i32, 2, 4, 0, 0)
 DEF(brcond2_i32, 0, 4, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH)
@@ -124,7 +123,6 @@ DEF(extu_i32_i64, 1, 1, 0, 0)
 DEF(extrl_i64_i32, 1, 1, 0, 0)
 DEF(extrh_i64_i32, 1, 1, 0, 0)
 
-DEF(brcond_i64, 0, 2, 2, TCG_OPF_BB_END | TCG_OPF_COND_BRANCH)
 DEF(bswap16_i64, 1, 1, 1, 0)
 DEF(bswap32_i64, 1, 1, 1, 0)
 DEF(bswap64_i64, 1, 1, 1, 0)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 4b78b0ba82..9e6a2e3ec1 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -1517,14 +1517,14 @@ static bool fold_brcond2(OptContext *ctx, TCGOp *op)
 break;
 
 do_brcond_low:
-op->opc = INDEX_op_brcond_i32;
+op->opc = INDEX_op_brcond;
 op->args[1] = op->args[2];
 op->args[2] = cond;
 op->args[3] = label;
 return fold_brcond(ctx, op);
 
 do_brcond_high:
-op->opc = INDEX_op_brcond_i32;
+op->opc = INDEX_op_brcond;
 op->args[0] = op->args[1];
 op->args[1] = op->args[3];
 op->args[2] = cond;
@@ -2852,7 +2852,7 @@ void tcg_optimize(TCGContext *s)
 case INDEX_op_andc_vec:
 done = fold_andc(&ctx, op);
 break;
-CASE_OP_32_64(brcond):
+case INDEX_op_brcond:
 done = fold_brcond(&ctx, op);
 break;
 case INDEX_op_brcond2_i32:
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 477dfc25b7..041ca95f0d 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -529,7 +529,7 @@ void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, 
TCGv_i32 arg2, TCGLabel *l)
 if (cond == TCG_COND_ALWAYS) {
 tcg_gen_br(l);
 } else if (cond != TCG_COND_NEVER) {
-TCGOp *op = tcg_gen_op4ii_i32(INDEX_op_brcond_i32,
+TCGOp *op = tcg_gen_op4ii_i32(INDEX_op_brcond,
   arg1, arg2, cond, label_arg(l));
 add_as_label_use(l, op);
 }
@@ -1874,7 +1874,7 @@ void tcg_gen_brcond_i64(TCGCond cond, TCGv_i64 arg1, 
TCGv_i64 arg2, TCGLabel *l)
TCGV_HIGH(arg1), TCGV_LOW(arg2),
TCGV_HIGH(arg2), cond, label_arg(l));
 } else {
-op = tcg_gen_op4ii_i64(INDEX_op_brcond_i64, arg1, arg2, cond,
+op = tcg_gen_op4ii_i64(INDEX_op_brcond, arg1, arg2, cond,
label_arg(l));
 }
 add_as_label_use(l, op);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index a16ee78090..61bc76365a 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1048,8 +1048,7 @@ static const TCGOutOp * const all_outop[NB_OPS] = {
 OUTOP(INDEX_op_add, TCGOutOpBinary, outop_add),
 OUTOP(INDEX_op_and, TCGOutOpBinary, outop_and),
 OUTOP(INDEX_op_andc, TCGOutOpBinary, outop_andc),
-OUTOP(INDEX_op_brcond_i32, TCGOutOpBrcond, outop_brcond),
-OUTOP(INDEX_op_brcond_i64, TCGOutOpBrcond, outop_brcond),
+OUTOP(INDEX_op_brcond, TCGOutOpBrcond, outop_brcond),
 OUTOP(INDEX_op_clz, TCGOutOpBinary, outop_clz),
 OUTOP(INDEX_op_ctpop, TCGOutOpUnary, outop_ctpop),
 OUTOP(INDEX_op_ctz, TCGOutOpBinary, outop_ctz),
@@ -2282,6 +2281,7 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, 
unsigned flags)
 
 case INDEX_op_add:
 case INDEX_op_and:
+case INDEX_op_brcond:
 case INDEX_op_mov:
 case INDEX_op_negsetcond:
 case INDEX_op_or:
@@ -2289,7 +2289,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, 
unsigned flags)
 case INDEX_op_xor:
 return has_type;
 
-case INDEX_op_brcond_i32:
 case INDEX_op_movcond_i32:
 case INDEX_op_ld8u_i32:
 case INDEX_op_ld8s_i32:
@@ -2319,7 +2318,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, 
unsigned flags)
 case INDEX_op_setcond2_i32:
 return TCG_TARGET_REG_BITS == 32;
 
-case INDEX_op_brcond_i64:
 case INDEX_op_movcond_i64:
 case INDEX_op_ld8u_i64:
 case INDEX_op_ld8s_i64:
@@ -2869,13 +2867,12 @@ void tcg_dump_ops(TCGContext *s, FILE *f,