[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/48] tcg/optimize: Move prev_mb into OptContext
From: |
Richard Henderson |
Subject: |
[PATCH v3 05/48] tcg/optimize: Move prev_mb into OptContext |
Date: |
Thu, 21 Oct 2021 14:04:56 -0700 |
This will expose the variable to subroutines that
will be broken out of tcg_optimize.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/optimize.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 627a5b39f6..b875d76354 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -46,6 +46,7 @@ typedef struct TempOptInfo {
typedef struct OptContext {
TCGContext *tcg;
+ TCGOp *prev_mb;
TCGTempSet temps_used;
} OptContext;
@@ -609,7 +610,7 @@ static bool swap_commutative2(TCGArg *p1, TCGArg *p2)
void tcg_optimize(TCGContext *s)
{
int nb_temps, nb_globals, i;
- TCGOp *op, *op_next, *prev_mb = NULL;
+ TCGOp *op, *op_next;
OptContext ctx = { .tcg = s };
/* Array VALS has an element for each temp.
@@ -1566,7 +1567,7 @@ void tcg_optimize(TCGContext *s)
}
/* Eliminate duplicate and redundant fence instructions. */
- if (prev_mb) {
+ if (ctx.prev_mb) {
switch (opc) {
case INDEX_op_mb:
/* Merge two barriers of the same type into one,
@@ -1580,7 +1581,7 @@ void tcg_optimize(TCGContext *s)
* barrier. This is stricter than specified but for
* the purposes of TCG is better than not optimizing.
*/
- prev_mb->args[0] |= op->args[0];
+ ctx.prev_mb->args[0] |= op->args[0];
tcg_op_remove(s, op);
break;
@@ -1597,11 +1598,11 @@ void tcg_optimize(TCGContext *s)
case INDEX_op_qemu_st_i64:
case INDEX_op_call:
/* Opcodes that touch guest memory stop the optimization. */
- prev_mb = NULL;
+ ctx.prev_mb = NULL;
break;
}
} else if (opc == INDEX_op_mb) {
- prev_mb = op;
+ ctx.prev_mb = op;
}
}
}
--
2.25.1
- [PATCH v3 00/48] tcg: optimize redundant sign extensions, Richard Henderson, 2021/10/21
- [PATCH v3 01/48] tcg/optimize: Rename "mask" to "z_mask", Richard Henderson, 2021/10/21
- [PATCH v3 03/48] tcg/optimize: Remove do_default label, Richard Henderson, 2021/10/21
- [PATCH v3 08/48] tcg/optimize: Split out fold_call, Richard Henderson, 2021/10/21
- [PATCH v3 09/48] tcg/optimize: Drop nb_oargs, nb_iargs locals, Richard Henderson, 2021/10/21
- [PATCH v3 11/48] tcg/optimize: Return true from tcg_opt_gen_{mov, movi}, Richard Henderson, 2021/10/21
- [PATCH v3 12/48] tcg/optimize: Split out finish_folding, Richard Henderson, 2021/10/21
- [PATCH v3 06/48] tcg/optimize: Split out init_arguments, Richard Henderson, 2021/10/21
- [PATCH v3 05/48] tcg/optimize: Move prev_mb into OptContext,
Richard Henderson <=
- [PATCH v3 02/48] tcg/optimize: Split out OptContext, Richard Henderson, 2021/10/21
- [PATCH v3 14/48] tcg/optimize: Split out fold_mb, fold_qemu_{ld,st}, Richard Henderson, 2021/10/21
- [PATCH v3 18/48] tcg/optimize: Split out fold_brcond, Richard Henderson, 2021/10/21
- [PATCH v3 04/48] tcg/optimize: Change tcg_opt_gen_{mov, movi} interface, Richard Henderson, 2021/10/21
- [PATCH v3 07/48] tcg/optimize: Split out copy_propagate, Richard Henderson, 2021/10/21
- [PATCH v3 15/48] tcg/optimize: Split out fold_const{1,2}, Richard Henderson, 2021/10/21