[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 22/51] tcg/optimize: Split out fold_movcond
From: |
Richard Henderson |
Subject: |
[PATCH v4 22/51] tcg/optimize: Split out fold_movcond |
Date: |
Tue, 26 Oct 2021 16:09:14 -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
- [PATCH v4 07/51] tcg/optimize: Split out copy_propagate, (continued)
- [PATCH v4 07/51] tcg/optimize: Split out copy_propagate, Richard Henderson, 2021/10/26
- [PATCH v4 08/51] tcg/optimize: Split out fold_call, Richard Henderson, 2021/10/26
- [PATCH v4 10/51] tcg/optimize: Change fail return for do_constant_folding_cond*, Richard Henderson, 2021/10/26
- [PATCH v4 11/51] tcg/optimize: Return true from tcg_opt_gen_{mov, movi}, Richard Henderson, 2021/10/26
- [PATCH v4 14/51] tcg/optimize: Split out fold_mb, fold_qemu_{ld,st}, Richard Henderson, 2021/10/26
- [PATCH v4 18/51] tcg/optimize: Split out fold_brcond, Richard Henderson, 2021/10/26
- [PATCH v4 19/51] tcg/optimize: Split out fold_setcond, Richard Henderson, 2021/10/26
- [PATCH v4 20/51] tcg/optimize: Split out fold_mulu2_i32, Richard Henderson, 2021/10/26
- [PATCH v4 17/51] tcg/optimize: Split out fold_brcond2, Richard Henderson, 2021/10/26
- [PATCH v4 21/51] tcg/optimize: Split out fold_addsub2_i32, Richard Henderson, 2021/10/26
- [PATCH v4 22/51] tcg/optimize: Split out fold_movcond,
Richard Henderson <=
- [PATCH v4 15/51] tcg/optimize: Split out fold_const{1,2}, Richard Henderson, 2021/10/26
- [PATCH v4 26/51] tcg/optimize: Split out fold_count_zeros, Richard Henderson, 2021/10/26
- [PATCH v4 23/51] tcg/optimize: Split out fold_extract2, Richard Henderson, 2021/10/26
- [PATCH v4 24/51] tcg/optimize: Split out fold_extract, fold_sextract, Richard Henderson, 2021/10/26
- [PATCH v4 16/51] tcg/optimize: Split out fold_setcond2, Richard Henderson, 2021/10/26
- [PATCH v4 27/51] tcg/optimize: Split out fold_bswap, Richard Henderson, 2021/10/26
- [PATCH v4 35/51] tcg/optimize: Split out fold_sub_to_neg, Richard Henderson, 2021/10/26
- [PATCH v4 28/51] tcg/optimize: Split out fold_dup, fold_dup2, Richard Henderson, 2021/10/26
- [PATCH v4 29/51] tcg/optimize: Split out fold_mov, Richard Henderson, 2021/10/26
- [PATCH v4 39/51] tcg/optimize: Expand fold_mulu2_i32 to all 4-arg multiplies, Richard Henderson, 2021/10/26