yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-31 17:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: Move sorted_args into TCGArgConstraint.sort_index

Browse source 
This uses an existing hole in the TCGArgConstraint structure
and will be convenient for keeping the data in one place.

Backports 66792f90f14fef18b25a168922877a367ecdca05
This commit is contained in:
Richard Henderson 2021-03-01 19:32:39 -05:00 committed by Lioncash
parent e3356f9bad
commit ae075d324d
3 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
qemu/tcg/tcg.c
View file

@ -353,7 +353,6 @@ void tcg_context_init(TCGContext *s)
int op, total_args, n, i; int op, total_args, n, i;
TCGOpDef *def; TCGOpDef *def;
TCGArgConstraint *args_ct; TCGArgConstraint *args_ct;
int *sorted_args;
GHashTable *helper_table; GHashTable *helper_table;
memset(s, 0, sizeof(*s)); memset(s, 0, sizeof(*s));
@ -373,14 +372,11 @@ void tcg_context_init(TCGContext *s)
} }
args_ct = g_malloc(sizeof(TCGArgConstraint) * total_args); args_ct = g_malloc(sizeof(TCGArgConstraint) * total_args);
sorted_args = g_malloc(sizeof(int) * total_args);
for(op = 0; op < NB_OPS; op++) { for(op = 0; op < NB_OPS; op++) {
def = &s->tcg_op_defs[op]; def = &s->tcg_op_defs[op];
def->args_ct = args_ct; def->args_ct = args_ct;
def->sorted_args = sorted_args;
n = def->nb_iargs + def->nb_oargs; n = def->nb_iargs + def->nb_oargs;
sorted_args += n;
args_ct += n; args_ct += n;
} }
@ -1613,20 +1609,23 @@ static int get_constraint_priority(const TCGOpDef *def, int k)
/* sort from highest priority to lowest */ /* sort from highest priority to lowest */
static void sort_constraints(TCGOpDef *def, int start, int n) static void sort_constraints(TCGOpDef *def, int start, int n)
{ {
int i, j, p1, p2, tmp; int i, j;
TCGArgConstraint *a = def->args_ct;
for(i = 0; i < n; i++) for (i = 0; i < n; i++) {
def->sorted_args[start + i] = start + i; a[start + i].sort_index = start + i;
if (n <= 1) }
if (n <= 1) {
return; return;
for(i = 0; i < n - 1; i++) { }
for(j = i + 1; j < n; j++) { for (i = 0; i < n - 1; i++) {
p1 = get_constraint_priority(def, def->sorted_args[start + i]); for (j = i + 1; j < n; j++) {
p2 = get_constraint_priority(def, def->sorted_args[start + j]); int p1 = get_constraint_priority(def, a[start + i].sort_index);
int p2 = get_constraint_priority(def, a[start + j].sort_index);
if (p1 < p2) { if (p1 < p2) {
tmp = def->sorted_args[start + i]; int tmp = a[start + i].sort_index;
def->sorted_args[start + i] = def->sorted_args[start + j]; a[start + i].sort_index = a[start + j].sort_index;
def->sorted_args[start + j] = tmp; a[start + j].sort_index = tmp;
} }
} }
} }
@ -3088,7 +3087,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op)
for (k = 0; k < nb_iargs; k++) { for (k = 0; k < nb_iargs; k++) {
TCGRegSet i_preferred_regs, o_preferred_regs; TCGRegSet i_preferred_regs, o_preferred_regs;
i = def->sorted_args[nb_oargs + k]; i = def->args_ct[nb_oargs + k].sort_index;
arg = op->args[i]; arg = op->args[i];
arg_ct = &def->args_ct[i]; arg_ct = &def->args_ct[i];
ts = arg_temp(arg); ts = arg_temp(arg);
@ -3124,7 +3123,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op)
int k2, i2; int k2, i2;
reg = ts->reg; reg = ts->reg;
for (k2 = 0 ; k2 < k ; k2++) { for (k2 = 0 ; k2 < k ; k2++) {
i2 = def->sorted_args[nb_oargs + k2]; i2 = def->args_ct[nb_oargs + k2].sort_index;
if ((def->args_ct[i2].ct & TCG_CT_IALIAS) && if ((def->args_ct[i2].ct & TCG_CT_IALIAS) &&
reg == new_args[i2]) { reg == new_args[i2]) {
goto allocate_in_reg; goto allocate_in_reg;
@ -3189,7 +3188,7 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op)
/* satisfy the output constraints */ /* satisfy the output constraints */
for(k = 0; k < nb_oargs; k++) { for(k = 0; k < nb_oargs; k++) {
i = def->sorted_args[k]; i = def->args_ct[k].sort_index;
arg = op->args[i]; arg = op->args[i];
arg_ct = &def->args_ct[i]; arg_ct = &def->args_ct[i];
ts = arg_temp(arg); ts = arg_temp(arg);

2
qemu/tcg/tcg.h
View file

@ -627,6 +627,7 @@ void tcg_dump_info(void);
typedef struct TCGArgConstraint { typedef struct TCGArgConstraint {
uint16_t ct; uint16_t ct;
uint8_t alias_index; uint8_t alias_index;
uint8_t sort_index;
TCGRegSet regs; TCGRegSet regs;
} TCGArgConstraint; } TCGArgConstraint;
@ -657,7 +658,6 @@ typedef struct TCGOpDef {
uint8_t nb_oargs, nb_iargs, nb_cargs, nb_args; uint8_t nb_oargs, nb_iargs, nb_cargs, nb_args;
uint8_t flags; uint8_t flags;
TCGArgConstraint *args_ct; TCGArgConstraint *args_ct;
int *sorted_args;
#if defined(CONFIG_DEBUG_TCG) #if defined(CONFIG_DEBUG_TCG)
int used; int used;
#endif #endif

1
qemu/unicorn_common.h
View file

@ -68,7 +68,6 @@ static void release_common(void *t)
// Clean TCG. // Clean TCG.
TCGOpDef* def = &s->tcg_op_defs[0]; TCGOpDef* def = &s->tcg_op_defs[0];
g_free(def->args_ct); g_free(def->args_ct);
g_free(def->sorted_args);
g_free(s->tcg_op_defs); g_free(s->tcg_op_defs);
for (po = s->pool_first; po; po = to) { for (po = s->pool_first; po; po = to) {