[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 10/23] tcg/optimize: Adjust TempOptInfo allocation
From: |
Richard Henderson |
Subject: |
[PATCH v6 10/23] tcg/optimize: Adjust TempOptInfo allocation |
Date: |
Mon, 11 Jan 2021 07:19:33 -1000 |
Do not allocate a large block for indexing. Instead, allocate
for each temporary as they are seen.
In general, this will use less memory, if we consider that most
TBs do not touch every target register. This also allows us to
allocate TempOptInfo for new temps created during optimization.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/optimize.c | 60 ++++++++++++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index e42f9c89a8..49bf1386c7 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -89,35 +89,41 @@ static void reset_temp(TCGArg arg)
}
/* Initialize and activate a temporary. */
-static void init_ts_info(TempOptInfo *infos,
- TCGTempSet *temps_used, TCGTemp *ts)
+static void init_ts_info(TCGTempSet *temps_used, TCGTemp *ts)
{
size_t idx = temp_idx(ts);
- if (!test_bit(idx, temps_used->l)) {
- TempOptInfo *ti = &infos[idx];
+ TempOptInfo *ti;
+ if (test_bit(idx, temps_used->l)) {
+ return;
+ }
+ set_bit(idx, temps_used->l);
+
+ ti = ts->state_ptr;
+ if (ti == NULL) {
+ ti = tcg_malloc(sizeof(TempOptInfo));
ts->state_ptr = ti;
- ti->next_copy = ts;
- ti->prev_copy = ts;
- if (ts->kind == TEMP_CONST) {
- ti->is_const = true;
- ti->val = ti->mask = ts->val;
- if (TCG_TARGET_REG_BITS > 32 && ts->type == TCG_TYPE_I32) {
- /* High bits of a 32-bit quantity are garbage. */
- ti->mask |= ~0xffffffffull;
- }
- } else {
- ti->is_const = false;
- ti->mask = -1;
+ }
+
+ ti->next_copy = ts;
+ ti->prev_copy = ts;
+ if (ts->kind == TEMP_CONST) {
+ ti->is_const = true;
+ ti->val = ts->val;
+ ti->mask = ts->val;
+ if (TCG_TARGET_REG_BITS > 32 && ts->type == TCG_TYPE_I32) {
+ /* High bits of a 32-bit quantity are garbage. */
+ ti->mask |= ~0xffffffffull;
}
- set_bit(idx, temps_used->l);
+ } else {
+ ti->is_const = false;
+ ti->mask = -1;
}
}
-static void init_arg_info(TempOptInfo *infos,
- TCGTempSet *temps_used, TCGArg arg)
+static void init_arg_info(TCGTempSet *temps_used, TCGArg arg)
{
- init_ts_info(infos, temps_used, arg_temp(arg));
+ init_ts_info(temps_used, arg_temp(arg));
}
static TCGTemp *find_better_copy(TCGContext *s, TCGTemp *ts)
@@ -604,9 +610,8 @@ static bool swap_commutative2(TCGArg *p1, TCGArg *p2)
/* Propagate constants and copies, fold constant expressions. */
void tcg_optimize(TCGContext *s)
{
- int nb_temps, nb_globals;
+ int nb_temps, nb_globals, i;
TCGOp *op, *op_next, *prev_mb = NULL;
- TempOptInfo *infos;
TCGTempSet temps_used;
/* Array VALS has an element for each temp.
@@ -616,12 +621,15 @@ void tcg_optimize(TCGContext *s)
nb_temps = s->nb_temps;
nb_globals = s->nb_globals;
+
bitmap_zero(temps_used.l, nb_temps);
- infos = tcg_malloc(sizeof(TempOptInfo) * nb_temps);
+ for (i = 0; i < nb_temps; ++i) {
+ s->temps[i].state_ptr = NULL;
+ }
QTAILQ_FOREACH_SAFE(op, &s->ops, link, op_next) {
uint64_t mask, partmask, affected, tmp;
- int nb_oargs, nb_iargs, i;
+ int nb_oargs, nb_iargs;
TCGOpcode opc = op->opc;
const TCGOpDef *def = &tcg_op_defs[opc];
@@ -633,14 +641,14 @@ void tcg_optimize(TCGContext *s)
for (i = 0; i < nb_oargs + nb_iargs; i++) {
TCGTemp *ts = arg_temp(op->args[i]);
if (ts) {
- init_ts_info(infos, &temps_used, ts);
+ init_ts_info(&temps_used, ts);
}
}
} else {
nb_oargs = def->nb_oargs;
nb_iargs = def->nb_iargs;
for (i = 0; i < nb_oargs + nb_iargs; i++) {
- init_arg_info(infos, &temps_used, op->args[i]);
+ init_arg_info(&temps_used, op->args[i]);
}
}
--
2.25.1
- [PATCH v6 09/23] tcg/optimize: Improve find_better_copy, (continued)
- [PATCH v6 09/23] tcg/optimize: Improve find_better_copy, Richard Henderson, 2021/01/11
- [PATCH v6 12/23] tcg: Convert tcg_gen_dupi_vec to TCG_CONST, Richard Henderson, 2021/01/11
- [PATCH v6 15/23] tcg: Use tcg_constant_{i32,i64} with tcg plugins, Richard Henderson, 2021/01/11
- [PATCH v6 16/23] tcg: Use tcg_constant_{i32, i64, vec} with gvec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 19/23] tcg: Add tcg_reg_alloc_dup2, Richard Henderson, 2021/01/11
- [PATCH v6 21/23] tcg: Remove tcg_gen_dup{8,16,32,64}i_vec, Richard Henderson, 2021/01/11
- [PATCH v6 17/23] tcg/tci: Add special tci_movi_{i32,i64} opcodes, Richard Henderson, 2021/01/11
- [PATCH v6 23/23] tcg/aarch64: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 20/23] tcg/i386: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 22/23] tcg/ppc: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2021/01/11
- [PATCH v6 10/23] tcg/optimize: Adjust TempOptInfo allocation,
Richard Henderson <=
- [PATCH v6 07/23] tcg: Expand TempOptInfo to 64-bits, Richard Henderson, 2021/01/11
- [PATCH v6 11/23] tcg/optimize: Use tcg_constant_internal with constant folding, Richard Henderson, 2021/01/11
- [PATCH v6 14/23] tcg: Use tcg_constant_{i32, i64} with tcg int expanders, Richard Henderson, 2021/01/11
- [PATCH v6 18/23] tcg: Remove movi and dupi opcodes, Richard Henderson, 2021/01/11
- [PATCH v6 13/23] tcg: Use tcg_constant_i32 with icount expander, Richard Henderson, 2021/01/11