mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
tcg/optimize: track const/copy status separately
Instead of using an enum which could be either a copy or a const, track them separately. This will be used in the next patch. Constants are tracked through a bool. Copies are tracked by initializing temp's next_copy and prev_copy to itself, allowing to simplify the code a bit. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
d9c769c609
commit
b41059dd9d
|
@ -35,14 +35,8 @@
|
||||||
glue(glue(case INDEX_op_, x), _i32): \
|
glue(glue(case INDEX_op_, x), _i32): \
|
||||||
glue(glue(case INDEX_op_, x), _i64)
|
glue(glue(case INDEX_op_, x), _i64)
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
TCG_TEMP_UNDEF = 0,
|
|
||||||
TCG_TEMP_CONST,
|
|
||||||
TCG_TEMP_COPY,
|
|
||||||
} tcg_temp_state;
|
|
||||||
|
|
||||||
struct tcg_temp_info {
|
struct tcg_temp_info {
|
||||||
tcg_temp_state state;
|
bool is_const;
|
||||||
uint16_t prev_copy;
|
uint16_t prev_copy;
|
||||||
uint16_t next_copy;
|
uint16_t next_copy;
|
||||||
tcg_target_ulong val;
|
tcg_target_ulong val;
|
||||||
|
@ -54,27 +48,22 @@ static TCGTempSet temps_used;
|
||||||
|
|
||||||
static inline bool temp_is_const(TCGArg arg)
|
static inline bool temp_is_const(TCGArg arg)
|
||||||
{
|
{
|
||||||
return temps[arg].state == TCG_TEMP_CONST;
|
return temps[arg].is_const;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool temp_is_copy(TCGArg arg)
|
static inline bool temp_is_copy(TCGArg arg)
|
||||||
{
|
{
|
||||||
return temps[arg].state == TCG_TEMP_COPY;
|
return temps[arg].next_copy != arg;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Reset TEMP's state to TCG_TEMP_UNDEF. If TEMP only had one copy, remove
|
/* Reset TEMP's state, possibly removing the temp for the list of copies. */
|
||||||
the copy flag from the left temp. */
|
|
||||||
static void reset_temp(TCGArg temp)
|
static void reset_temp(TCGArg temp)
|
||||||
{
|
{
|
||||||
if (temp_is_copy(temp)) {
|
temps[temps[temp].next_copy].prev_copy = temps[temp].prev_copy;
|
||||||
if (temps[temp].prev_copy == temps[temp].next_copy) {
|
temps[temps[temp].prev_copy].next_copy = temps[temp].next_copy;
|
||||||
temps[temps[temp].next_copy].state = TCG_TEMP_UNDEF;
|
temps[temp].next_copy = temp;
|
||||||
} else {
|
temps[temp].prev_copy = temp;
|
||||||
temps[temps[temp].next_copy].prev_copy = temps[temp].prev_copy;
|
temps[temp].is_const = false;
|
||||||
temps[temps[temp].prev_copy].next_copy = temps[temp].next_copy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
temps[temp].state = TCG_TEMP_UNDEF;
|
|
||||||
temps[temp].mask = -1;
|
temps[temp].mask = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,7 +77,9 @@ static void reset_all_temps(int nb_temps)
|
||||||
static void init_temp_info(TCGArg temp)
|
static void init_temp_info(TCGArg temp)
|
||||||
{
|
{
|
||||||
if (!test_bit(temp, temps_used.l)) {
|
if (!test_bit(temp, temps_used.l)) {
|
||||||
temps[temp].state = TCG_TEMP_UNDEF;
|
temps[temp].next_copy = temp;
|
||||||
|
temps[temp].prev_copy = temp;
|
||||||
|
temps[temp].is_const = false;
|
||||||
temps[temp].mask = -1;
|
temps[temp].mask = -1;
|
||||||
set_bit(temp, temps_used.l);
|
set_bit(temp, temps_used.l);
|
||||||
}
|
}
|
||||||
|
@ -218,7 +209,7 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg *args,
|
||||||
op->opc = new_op;
|
op->opc = new_op;
|
||||||
|
|
||||||
reset_temp(dst);
|
reset_temp(dst);
|
||||||
temps[dst].state = TCG_TEMP_CONST;
|
temps[dst].is_const = true;
|
||||||
temps[dst].val = val;
|
temps[dst].val = val;
|
||||||
mask = val;
|
mask = val;
|
||||||
if (TCG_TARGET_REG_BITS > 32 && new_op == INDEX_op_movi_i32) {
|
if (TCG_TARGET_REG_BITS > 32 && new_op == INDEX_op_movi_i32) {
|
||||||
|
@ -260,16 +251,11 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args,
|
||||||
assert(!temp_is_const(src));
|
assert(!temp_is_const(src));
|
||||||
|
|
||||||
if (s->temps[src].type == s->temps[dst].type) {
|
if (s->temps[src].type == s->temps[dst].type) {
|
||||||
if (!temp_is_copy(src)) {
|
|
||||||
temps[src].state = TCG_TEMP_COPY;
|
|
||||||
temps[src].next_copy = src;
|
|
||||||
temps[src].prev_copy = src;
|
|
||||||
}
|
|
||||||
temps[dst].state = TCG_TEMP_COPY;
|
|
||||||
temps[dst].next_copy = temps[src].next_copy;
|
temps[dst].next_copy = temps[src].next_copy;
|
||||||
temps[dst].prev_copy = src;
|
temps[dst].prev_copy = src;
|
||||||
temps[temps[dst].next_copy].prev_copy = dst;
|
temps[temps[dst].next_copy].prev_copy = dst;
|
||||||
temps[src].next_copy = dst;
|
temps[src].next_copy = dst;
|
||||||
|
temps[dst].is_const = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
args[0] = dst;
|
args[0] = dst;
|
||||||
|
|
Loading…
Reference in a new issue