mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 23:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

tcg/optimize: fold temp copies test in tcg_opt_gen_mov

Browse source 
Each call to tcg_opt_gen_mov is preceeded by a test to check if the
source and destination temps are copies. Fold that into the
tcg_opt_gen_mov function.

Backports commit 5365718a9afeeabde3784d82a542f8ad909b18cf from qemu
This commit is contained in:
Aurelien Jarno 2018-02-10 21:26:43 -05:00 committed by Lioncash
parent d21f474c39
commit 517fac57c3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
qemu/tcg/optimize.c
View file

@ -187,6 +187,11 @@ static bool temps_are_copies(TCGContext *s, TCGArg arg1, TCGArg arg2)
static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args, static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args,
TCGArg dst, TCGArg src) TCGArg dst, TCGArg src)
{ {
if (temps_are_copies(dst, src)) {
tcg_op_remove(s, op);
return;
}
struct tcg_temp_info *temps = s->temps2; struct tcg_temp_info *temps = s->temps2;
TCGOpcode new_op = op_to_mov(s, op->opc); TCGOpcode new_op = op_to_mov(s, op->opc);
tcg_target_ulong mask; tcg_target_ulong mask;
@ -790,11 +795,7 @@ static void tcg_constant_folding(TCGContext *s)
} }
break; break;
do_mov3: do_mov3:
if (temps_are_copies(s, args[0], args[1])) {
tcg_op_remove(s, op);
} else {
tcg_opt_gen_mov(s, op, args, args[0], args[1]); tcg_opt_gen_mov(s, op, args, args[0], args[1]);
}
continue; continue;
default: default:
break; break;
@ -949,9 +950,7 @@ static void tcg_constant_folding(TCGContext *s)
} }
if (affected == 0) { if (affected == 0) {
assert(nb_oargs == 1); assert(nb_oargs == 1);
if (temps_are_copies(s, args[0], args[1])) { if (temps[args[1]].state != TCG_TEMP_CONST) {
tcg_op_remove(s, op);
} else if (temps[args[1]].state != TCG_TEMP_CONST) {
tcg_opt_gen_mov(s, op, args, args[0], args[1]); tcg_opt_gen_mov(s, op, args, args[0], args[1]);
} else { } else {
tcg_opt_gen_movi(s, op, args, tcg_opt_gen_movi(s, op, args,
@ -981,9 +980,7 @@ static void tcg_constant_folding(TCGContext *s)
CASE_OP_32_64(or): CASE_OP_32_64(or):
CASE_OP_32_64(and): CASE_OP_32_64(and):
if (temps_are_copies(s, args[1], args[2])) { if (temps_are_copies(s, args[1], args[2])) {
if (temps_are_copies(s, args[0], args[1])) { if (temps[args[1]].state != TCG_TEMP_CONST) {
tcg_op_remove(s, op);
} else if (temps[args[1]].state != TCG_TEMP_CONST) {
tcg_opt_gen_mov(s, op, args, args[0], args[1]); tcg_opt_gen_mov(s, op, args, args[0], args[1]);
} else { } else {
tcg_opt_gen_movi(s, op, args, tcg_opt_gen_movi(s, op, args,
@ -1015,10 +1012,6 @@ static void tcg_constant_folding(TCGContext *s)
allocator where needed and possible. Also detect copies. */ allocator where needed and possible. Also detect copies. */
switch (opc) { switch (opc) {
CASE_OP_32_64(mov): CASE_OP_32_64(mov):
if (temps_are_copies(s, args[0], args[1])) {
tcg_op_remove(s, op);
break;
}
if (temps[args[1]].state != TCG_TEMP_CONST) { if (temps[args[1]].state != TCG_TEMP_CONST) {
tcg_opt_gen_mov(s, op, args, args[0], args[1]); tcg_opt_gen_mov(s, op, args, args[0], args[1]);
break; break;
@ -1120,9 +1113,7 @@ static void tcg_constant_folding(TCGContext *s)
CASE_OP_32_64(movcond): CASE_OP_32_64(movcond):
tmp = do_constant_folding_cond(s, opc, args[1], args[2], args[5]); tmp = do_constant_folding_cond(s, opc, args[1], args[2], args[5]);
if (tmp != 2) { if (tmp != 2) {
if (temps_are_copies(s, args[0], args[4-tmp])) { if (temps[args[4-tmp]].state == TCG_TEMP_CONST) {
tcg_op_remove(s, op);
} else if (temps[args[4-tmp]].state == TCG_TEMP_CONST) {
tcg_opt_gen_movi(s, op, args, tcg_opt_gen_movi(s, op, args,
args[0], temps[args[4-tmp]].val); args[0], temps[args[4-tmp]].val);
} else { } else {