[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/56] tcg/optimize: Split out fold_movcond
From: |
Richard Henderson |
Subject: |
[PULL 27/56] tcg/optimize: Split out fold_movcond |
Date: |
Wed, 27 Oct 2021 19:41:02 -0700 |
Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/optimize.c | 56 ++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 9d1d045363..110b3d1cc2 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -922,6 +922,34 @@ static bool fold_mb(OptContext *ctx, TCGOp *op)
return true;
}
+static bool fold_movcond(OptContext *ctx, TCGOp *op)
+{
+ TCGOpcode opc = op->opc;
+ TCGCond cond = op->args[5];
+ int i = do_constant_folding_cond(opc, op->args[1], op->args[2], cond);
+
+ if (i >= 0) {
+ return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[4 - i]);
+ }
+
+ if (arg_is_const(op->args[3]) && arg_is_const(op->args[4])) {
+ uint64_t tv = arg_info(op->args[3])->val;
+ uint64_t fv = arg_info(op->args[4])->val;
+
+ opc = (opc == INDEX_op_movcond_i32
+ ? INDEX_op_setcond_i32 : INDEX_op_setcond_i64);
+
+ if (tv == 1 && fv == 0) {
+ op->opc = opc;
+ op->args[3] = cond;
+ } else if (fv == 1 && tv == 0) {
+ op->opc = opc;
+ op->args[3] = tcg_invert_cond(cond);
+ }
+ }
+ return false;
+}
+
static bool fold_mul(OptContext *ctx, TCGOp *op)
{
return fold_const2(ctx, op);
@@ -1715,31 +1743,6 @@ void tcg_optimize(TCGContext *s)
}
break;
- CASE_OP_32_64(movcond):
- i = do_constant_folding_cond(opc, op->args[1],
- op->args[2], op->args[5]);
- if (i >= 0) {
- tcg_opt_gen_mov(&ctx, op, op->args[0], op->args[4 - i]);
- continue;
- }
- if (arg_is_const(op->args[3]) && arg_is_const(op->args[4])) {
- uint64_t tv = arg_info(op->args[3])->val;
- uint64_t fv = arg_info(op->args[4])->val;
- TCGCond cond = op->args[5];
-
- if (fv == 1 && tv == 0) {
- cond = tcg_invert_cond(cond);
- } else if (!(tv == 1 && fv == 0)) {
- break;
- }
- op->args[3] = cond;
- op->opc = opc = (opc == INDEX_op_movcond_i32
- ? INDEX_op_setcond_i32
- : INDEX_op_setcond_i64);
- }
- break;
-
-
default:
break;
@@ -1791,6 +1794,9 @@ void tcg_optimize(TCGContext *s)
case INDEX_op_mb:
done = fold_mb(&ctx, op);
break;
+ CASE_OP_32_64(movcond):
+ done = fold_movcond(&ctx, op);
+ break;
CASE_OP_32_64(mul):
done = fold_mul(&ctx, op);
break;
--
2.25.1
- [PULL 04/56] host-utils: add 128-bit quotient support to divu128/divs128, (continued)
- [PULL 04/56] host-utils: add 128-bit quotient support to divu128/divs128, Richard Henderson, 2021/10/27
- [PULL 05/56] host-utils: add unit tests for divu128/divs128, Richard Henderson, 2021/10/27
- [PULL 09/56] tcg/optimize: Change tcg_opt_gen_{mov,movi} interface, Richard Henderson, 2021/10/27
- [PULL 06/56] tcg/optimize: Rename "mask" to "z_mask", Richard Henderson, 2021/10/27
- [PULL 07/56] tcg/optimize: Split out OptContext, Richard Henderson, 2021/10/27
- [PULL 10/56] tcg/optimize: Move prev_mb into OptContext, Richard Henderson, 2021/10/27
- [PULL 12/56] tcg/optimize: Split out copy_propagate, Richard Henderson, 2021/10/27
- [PULL 13/56] tcg/optimize: Split out fold_call, Richard Henderson, 2021/10/27
- [PULL 18/56] tcg/optimize: Use a boolean to avoid a mass of continues, Richard Henderson, 2021/10/27
- [PULL 15/56] tcg/optimize: Change fail return for do_constant_folding_cond*, Richard Henderson, 2021/10/27
- [PULL 27/56] tcg/optimize: Split out fold_movcond,
Richard Henderson <=
- [PULL 11/56] tcg/optimize: Split out init_arguments, Richard Henderson, 2021/10/27
- [PULL 14/56] tcg/optimize: Drop nb_oargs, nb_iargs locals, Richard Henderson, 2021/10/27
- [PULL 16/56] tcg/optimize: Return true from tcg_opt_gen_{mov,movi}, Richard Henderson, 2021/10/27
- [PULL 17/56] tcg/optimize: Split out finish_folding, Richard Henderson, 2021/10/27
- [PULL 25/56] tcg/optimize: Split out fold_mulu2_i32, Richard Henderson, 2021/10/27
- [PULL 19/56] tcg/optimize: Split out fold_mb, fold_qemu_{ld,st}, Richard Henderson, 2021/10/27
- [PULL 20/56] tcg/optimize: Split out fold_const{1,2}, Richard Henderson, 2021/10/27
- [PULL 21/56] tcg/optimize: Split out fold_setcond2, Richard Henderson, 2021/10/27
- [PULL 23/56] tcg/optimize: Split out fold_brcond, Richard Henderson, 2021/10/27
- [PULL 29/56] tcg/optimize: Split out fold_extract, fold_sextract, Richard Henderson, 2021/10/27