[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/19] tcg/optimize: Adjust TempOptInfo allocation
From: |
Richard Henderson |
Subject: |
[PATCH v4 11/19] tcg/optimize: Adjust TempOptInfo allocation |
Date: |
Fri, 8 May 2020 11:26:08 -0700 |
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 <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/optimize.c | 60 ++++++++++++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index b86bf3d707..d36d7e1d7f 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)
@@ -603,9 +609,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.
@@ -615,12 +620,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) {
tcg_target_ulong mask, partmask, affected;
- int nb_oargs, nb_iargs, i;
+ int nb_oargs, nb_iargs;
TCGArg tmp;
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.20.1
- Re: [PATCH v4 01/19] tcg: Consolidate 3 bits into enum TCGTempKind, (continued)
- [PATCH v4 03/19] tcg: Introduce TYPE_CONST temporaries, Richard Henderson, 2020/05/08
- [PATCH v4 04/19] tcg: Use tcg_constant_i32 with icount expander, Richard Henderson, 2020/05/08
- [PATCH v4 06/19] tcg: Use tcg_constant_{i32, vec} with tcg vec expanders, Richard Henderson, 2020/05/08
- [PATCH v4 05/19] tcg: Use tcg_constant_{i32, i64} with tcg int expanders, Richard Henderson, 2020/05/08
- [PATCH v4 07/19] tcg: Use tcg_constant_{i32, i64, vec} with tcg gvec expanders, Richard Henderson, 2020/05/08
- [PATCH v4 08/19] tcg: Use tcg_constant_{i32,i64} with tcg plugins, Richard Henderson, 2020/05/08
- [PATCH v4 09/19] tcg: Rename struct tcg_temp_info to TempOptInfo, Richard Henderson, 2020/05/08
- [PATCH v4 10/19] tcg/optimize: Improve find_better_copy, Richard Henderson, 2020/05/08
- [PATCH v4 11/19] tcg/optimize: Adjust TempOptInfo allocation,
Richard Henderson <=
- [PATCH v4 12/19] tcg/optimize: Use tcg_constant_internal with constant folding, Richard Henderson, 2020/05/08
- [PATCH v4 14/19] tcg: Remove movi and dupi opcodes, Richard Henderson, 2020/05/08
- [PATCH v4 13/19] tcg/tci: Add special tci_movi_{i32,i64} opcodes, Richard Henderson, 2020/05/08
- [PATCH v4 15/19] tcg: Use tcg_out_dupi_vec from temp_load, Richard Henderson, 2020/05/08
- [PATCH v4 16/19] tcg: Increase tcg_out_dupi_vec immediate to int64_t, Richard Henderson, 2020/05/08
- [PATCH v4 18/19] tcg/i386: Use tcg_constant_vec with tcg vec expanders, Richard Henderson, 2020/05/08
- [PATCH v4 17/19] tcg: Add tcg_reg_alloc_dup2, Richard Henderson, 2020/05/08
- [PATCH v4 19/19] tcg: Remove tcg_gen_dup{8,16,32,64}i_vec, Richard Henderson, 2020/05/08