yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 15:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg/optimize: track const/copy status separately

Browse source 
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.

Backports commit b41059dd9deec367a4ccd296659f0bc5de2dc705 from qemu
This commit is contained in:
Aurelien Jarno 2018-02-10 22:11:15 -05:00 committed by Lioncash
parent 134a7dfe82
commit 59909fe549
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
qemu/tcg/optimize.c
View file

@ -39,31 +39,26 @@ static inline bool temp_is_const(TCGContext *s, TCGArg arg)
{
struct tcg_temp_info *temps = s->temps2;
return temps[arg].state == TCG_TEMP_CONST;
return temps[arg].is_const;
}
static inline bool temp_is_copy(TCGContext *s, TCGArg arg)
{
struct tcg_temp_info *temps = s->temps2;
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
the copy flag from the left temp. */
/* Reset TEMP's state, possibly removing the temp for the list of copies. */
static void reset_temp(TCGContext *s, TCGArg temp)
{
struct tcg_temp_info *temps = s->temps2;
if (temp_is_copy(s, temp)) {
if (temps[temp].prev_copy == temps[temp].next_copy) {
temps[temps[temp].next_copy].state = TCG_TEMP_UNDEF;
} else {
temps[temps[temp].next_copy].prev_copy = temps[temp].prev_copy;
temps[temps[temp].prev_copy].next_copy = temps[temp].next_copy;
}
}
temps[temp].state = TCG_TEMP_UNDEF;
temps[temps[temp].next_copy].prev_copy = temps[temp].prev_copy;
temps[temps[temp].prev_copy].next_copy = temps[temp].next_copy;
temps[temp].next_copy = temp;
temps[temp].prev_copy = temp;
temps[temp].is_const = false;
temps[temp].mask = -1;
}
@ -81,7 +76,9 @@ static void init_temp_info(TCGContext *s, TCGArg temp)
TCGTempSet *temps_used = &s->temps2_used;
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;
set_bit(temp, temps_used->l);
}
@ -216,7 +213,7 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg *args,
reset_temp(s, dst);
temps[dst].state = TCG_TEMP_CONST;
temps[dst].is_const = true;
temps[dst].val = val;
mask = val;
if (TCG_TARGET_REG_BITS > 32 && new_op == INDEX_op_movi_i32) {
@ -260,16 +257,11 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args,
assert(!temp_is_const(s, src));
if (s->temps[src].type == s->temps[dst].type) {
if (!temp_is_copy(s, 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].prev_copy = src;
temps[temps[dst].next_copy].prev_copy = dst;
temps[src].next_copy = dst;
temps[dst].is_const = false;
}
args[0] = dst;
@ -560,7 +552,6 @@ static TCGArg do_constant_folding_cond2(TCGContext *s, TCGArg *p1, TCGArg *p2, T
static bool swap_commutative(TCGContext *s, TCGArg dest, TCGArg *p1, TCGArg *p2)
{
struct tcg_temp_info *temps = s->temps2;
TCGArg a1 = *p1, a2 = *p2;
int sum = 0;
@ -579,7 +570,6 @@ static bool swap_commutative(TCGContext *s, TCGArg dest, TCGArg *p1, TCGArg *p2)
static bool swap_commutative2(TCGContext *s, TCGArg *p1, TCGArg *p2)
{
struct tcg_temp_info *temps = s->temps2;
int sum = 0;
sum += temp_is_const(s, p1[0]);
@ -723,7 +713,7 @@ void tcg_optimize(TCGContext *s)
TCGOpcode neg_op;
bool have_neg;
if (temps[args[2]].state == TCG_TEMP_CONST) {
if (temp_is_const(s, args[2])) {
/* Proceed with possible constant folding. */
break;
}
@ -737,7 +727,7 @@ void tcg_optimize(TCGContext *s)
if (!have_neg) {
break;
}
if (temp_is_const(s, args[2]) && temps[args[1]].val == 0) {
if (temp_is_const(s, args[1]) && temps[args[1]].val == 0) {
op->opc = neg_op;
reset_temp(s, args[0]);
args[1] = args[2];

8
qemu/tcg/tcg.h
View file

@ -604,14 +604,8 @@ typedef struct TCGOpDef {
#endif
} TCGOpDef;
typedef enum {
TCG_TEMP_UNDEF = 0,
TCG_TEMP_CONST,
TCG_TEMP_COPY,
} tcg_temp_state;
struct tcg_temp_info {
tcg_temp_state state;
bool is_const;
uint16_t prev_copy;
uint16_t next_copy;
tcg_target_ulong val;