qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH 08/16] tcg/optimize: Adjust TempOptInfo allocation
Date: Sat, 18 Apr 2020 09:19:06 -0700	[thread overview]
Message-ID: <20200418161914.4387-9-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200418161914.4387-1-richard.henderson@linaro.org>

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.

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 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



  parent reply	other threads:[~2020-04-18 16:23 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-18 16:18 [PATCH 00/16] tcg: Better handling of constants Richard Henderson
2020-04-18 16:18 ` [PATCH 01/16] tcg: Add temp_readonly Richard Henderson
2020-04-20  6:57   ` Philippe Mathieu-Daudé
2020-04-18 16:19 ` [PATCH 02/16] tcg: Introduce TYPE_CONST temporaries Richard Henderson
2020-04-18 16:19 ` [PATCH 03/16] tcg: Use tcg_constant_i32 with icount expander Richard Henderson
2020-04-18 16:19 ` [PATCH 04/16] tcg: Use tcg_constant_{i32,i64} with tcg int expanders Richard Henderson
2020-04-18 16:19 ` [PATCH 05/16] tcg: Use tcg_constant_{i32,vec} with tcg vec expanders Richard Henderson
2020-04-18 16:19 ` [PATCH 06/16] tcg: Use tcg_constant_{i32,i64} with tcg plugins Richard Henderson
2020-04-18 16:19 ` [PATCH 07/16] tcg: Rename struct tcg_temp_info to TempOptInfo Richard Henderson
2020-04-20  7:00   ` Philippe Mathieu-Daudé
2020-04-18 16:19 ` Richard Henderson [this message]
2020-04-18 16:19 ` [PATCH 09/16] tcg/optimize: Use tcg_constant_internal with constant folding Richard Henderson
2020-04-18 16:19 ` [PATCH 10/16] tcg/tci: Add special tci_movi_{i32,i64} opcodes Richard Henderson
2020-04-18 16:19 ` [PATCH 11/16] tcg: Remove movi and dupi opcodes Richard Henderson
2020-04-18 16:19 ` [PATCH 12/16] tcg: Use tcg_out_dupi_vec from temp_load Richard Henderson
2020-04-18 16:19 ` [PATCH 13/16] tcg: Increase tcg_out_dupi_vec immediate to int64_t Richard Henderson
2020-04-18 16:19 ` [PATCH 14/16] tcg: Add tcg_reg_alloc_dup2 Richard Henderson
2020-04-18 16:19 ` [PATCH 15/16] tcg/i386: Use tcg_constant_vec with tcg vec expanders Richard Henderson
2020-04-18 16:19 ` [PATCH 16/16] tcg: Remove tcg_gen_dup{8,16,32,64}i_vec Richard Henderson
2020-04-20 15:39 ` [PATCH 00/16] tcg: Better handling of constants Alex Bennée
2020-04-20 18:06   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200418161914.4387-9-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).