From 010ded3088f0c8461e676070d7d613382edc2a6b Mon Sep 17 00:00:00 2001 From: Richard Henderson <richard.henderson@linaro.org> Date: Mon, 5 Mar 2018 07:21:07 -0500 Subject: [PATCH] tcg: Add temp_global bit to TCGTemp This avoids needing to test the index of a temp against nb_globals. Backports commit fa477d25470187030614288d35bc734edffa41ee from qemu --- qemu/tcg/optimize.c | 15 ++++++++------- qemu/tcg/tcg.c | 11 ++++++++--- qemu/tcg/tcg.h | 12 ++++++++---- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/qemu/tcg/optimize.c b/qemu/tcg/optimize.c index a0669784..0bdf6cc9 100644 --- a/qemu/tcg/optimize.c +++ b/qemu/tcg/optimize.c @@ -115,26 +115,27 @@ static TCGOpcode op_to_movi(TCGContext *s, TCGOpcode op) } } -static TCGArg find_better_copy(TCGContext *s, TCGArg temp) +static TCGArg find_better_copy(TCGContext *s, TCGArg arg) { struct tcg_temp_info *temps = s->temps2; + TCGTemp *ts = arg_temp(s, arg); TCGArg i; /* If this is already a global, we can't do better. */ - if (temp < (unsigned int)s->nb_globals) { - return temp; + if (ts->temp_global) { + return arg; } /* Search for a global first. */ - for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy) { + for (i = temps[arg].next_copy ; i != arg; i = temps[i].next_copy) { if (i < (unsigned int)s->nb_globals) { return i; } } /* If it is a temp, search for a temp local. */ - if (!arg_temp(s, temp)->temp_local) { - for (i = temps[temp].next_copy ; i != temp ; i = temps[i].next_copy) { + if (!ts->temp_local) { + for (i = temps[arg].next_copy ; i != arg; i = temps[i].next_copy) { if (s->temps[i].temp_local) { return i; } @@ -142,7 +143,7 @@ static TCGArg find_better_copy(TCGContext *s, TCGArg temp) } /* Failure to find a better representation, return the same temp. */ - return temp; + return arg; } static bool temps_are_copies(TCGContext *s, TCGArg arg1, TCGArg arg2) diff --git a/qemu/tcg/tcg.c b/qemu/tcg/tcg.c index b9aa7536..6473004d 100644 --- a/qemu/tcg/tcg.c +++ b/qemu/tcg/tcg.c @@ -485,9 +485,14 @@ static inline TCGTemp *tcg_temp_alloc(TCGContext *s) static inline TCGTemp *tcg_global_alloc(TCGContext *s) { + TCGTemp *ts; + tcg_debug_assert(s->nb_globals == s->nb_temps); s->nb_globals++; - return tcg_temp_alloc(s); + ts = tcg_temp_alloc(s); + ts->temp_global = 1; + + return ts; } static int tcg_global_reg_new_internal(TCGContext *s, TCGType type, @@ -1180,7 +1185,7 @@ static char *tcg_get_arg_str_ptr(TCGContext *s, char *buf, int buf_size, { int idx = temp_idx(s, ts); - if (idx < s->nb_globals) { + if (ts->temp_global) { pstrcpy(buf, buf_size, ts->name); } else if (ts->temp_local) { snprintf(buf, buf_size, "loc%d", idx - s->nb_globals); @@ -2207,7 +2212,7 @@ static void temp_free_or_dead(TCGContext *s, TCGTemp *ts, int free_or_dead) } ts->val_type = (free_or_dead < 0 || ts->temp_local - || temp_idx(s, ts) < s->nb_globals + || ts->temp_global ? TEMP_VAL_MEM : TEMP_VAL_DEAD); } diff --git a/qemu/tcg/tcg.h b/qemu/tcg/tcg.h index 6dad6ba6..bcc8ea22 100644 --- a/qemu/tcg/tcg.h +++ b/qemu/tcg/tcg.h @@ -582,10 +582,14 @@ typedef struct TCGTemp { unsigned int indirect_base:1; unsigned int mem_coherent:1; unsigned int mem_allocated:1; - unsigned int temp_local:1; /* If true, the temp is saved across - basic blocks. Otherwise, it is not - preserved across basic blocks. */ - unsigned int temp_allocated:1; /* never used for code gen */ + /* If true, the temp is saved across both basic blocks and + translation blocks. */ + unsigned int temp_global:1; + /* If true, the temp is saved across basic blocks but dead + at the end of translation blocks. If false, the temp is + dead at the end of basic blocks. */ + unsigned int temp_local:1; + unsigned int temp_allocated:1; tcg_target_long val; intptr_t mem_offset;