tcg/optimize: fixes and improvements
cover tcg/optimize: fixes and improvements
This patchset first fixes known-zero bits optimization so that it is actually used, and does some further optimizations for 32-bit ops and unsigned loads.
Aurelien Jarno (4):
tcg/optimize: fix know-zero bits optimization tcg/optimize: fix known-zero bits for right shift ops tcg/optimize: improve known-zero bits for 32-bit ops tcg/optimize: add known-zero bits compute for load ops
tcg/optimize.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/4 tcg/optimize: fix know-zero bits optimization
Known-zero bits optimization is a great idea that helps to generate more optimized code. However the current implementation is basically useless as the computed mask is not saved.
Fix this to make it really working.
--- tcg/optimize.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tcg/optimize.c +7 -1
@@ -695,7 +695,8 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,break ; } -/* Simplify using known-zero bits */ +/* Simplify using known-zero bits. Currently only ops with a single +output argument is supported. */ mask =-1 ; affected =-1 ;switch (op) {
@@ -1144,6 +1145,11 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, }else {for (i =0 ; i < def->nb_oargs; i++) {reset_temp (args[i]); +/* Save the corresponding known-zero bits mask for the +first output argument (only one supported so far). */ +if (i ==0 ) { + temps[args[i]].mask = mask; + } } }for (i =0 ; i < def->nb_args; i++) {
Signature · 1 line
1.7.10.4
Re: [Qemu-devel] [PATCH 1/4] tcg/optimize: fix know-zero bits optimization
FWIW $subject has a typo. While at it...
Am 03.09.2013 08:27, schrieb Aurelien Jarno:
Quoted 18 lines
Known-zero bits optimization is a great idea that helps to generate more optimized code. However the current implementation is basically useless as the computed mask is not saved.
Fix this to make it really working.
Cc Richard Henderson <[email protected]>Cc Paolo Bonzini <[email protected]>Signed-off-by Aurelien Jarno <[email protected]>--- tcg/optimize.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tcg/optimize.c +0
-0
tcg/optimize.c static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, · line 699
Quoted 6 lines
tcg/optimize.c +2
-1@@ -695,7 +695,8 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,break ; } -/* Simplify using known-zero bits */ +/* Simplify using known-zero bits. Currently only ops with a single +output argument is supported. */
"ops ... are"?
Cheers,
Andreas
Quoted 16 lines
tcg/optimize.c +5
-0mask =-1 ; affected =-1 ;switch (op) {@@ -1144,6 +1145,11 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, }else {for (i =0 ; i < def->nb_oargs; i++) {reset_temp (args[i]); +/* Save the corresponding known-zero bits mask for the +first output argument (only one supported so far). */ +if (i ==0 ) { + temps[args[i]].mask = mask; + } } }for (i =0 ; i < def->nb_args; i++) {
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
PATCH 2/4 tcg/optimize: fix known-zero bits for right shift ops
In reply to Aurelien Jarno32-bit versions of sar and shr ops should not propagate known-zero bits from the unused 32 high bits. For sar it could even lead to wrong code being generated.
--- tcg/optimize.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
tcg/optimize.c +17 -4
@@ -731,16 +731,29 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, mask = temps[args[1 ]].mask & mask;break ; - CASE_OP_32_64(sar): +case INDEX_op_sar_i32: +if (temps[args[2 ]].state ==TCG_TEMP_CONST ) { + mask = ((int32_t )temps[args[1 ]].mask + >> temps[args[2 ]].val); + } +break ; +case INDEX_op_sar_i64:if (temps[args[2 ]].state ==TCG_TEMP_CONST ) { - mask = ((tcg_target_long )temps[args[1 ]].mask + mask = ((int64_t )temps[args[1 ]].mask >> temps[args[2 ]].val); }break ; - CASE_OP_32_64(shr): +case INDEX_op_shr_i32:if (temps[args[2 ]].state ==TCG_TEMP_CONST ) { - mask = temps[args[1 ]].mask >> temps[args[2 ]].val; + mask = ((uint32_t )temps[args[1 ]].mask + >> temps[args[2 ]].val); + } +break ; +case INDEX_op_shr_i64: +if (temps[args[2 ]].state ==TCG_TEMP_CONST ) { + mask = ((uint64_t )temps[args[1 ]].mask + >> temps[args[2 ]].val); }break ;
Signature · 1 line
1.7.10.4
PATCH 3/4 tcg/optimize: improve known-zero bits for 32-bit ops
In reply to Aurelien JarnoThe shl_i32 op might set some bits of the unused 32 high bits of the mask. Fix that by clearing the unused 32 high bits for all 32-bit ops except load/store which operate on tl values.
--- tcg/optimize.c | 6 ++++++ 1 file changed, 6 insertions(+)
tcg/optimize.c +6 -0
@@ -791,6 +791,12 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,break ; } +/* 32-bit ops (non 64-bit ops and non load/store ops) generate 32-bit +results */ +if (!(tcg_op_defs[op].flags & (TCG_OPF_CALL_CLOBBER |TCG_OPF_64BIT ))) { + mask &=0xffffffffu ; + } +if (mask ==0 ) {assert (def->nb_oargs ==1 ); s->gen_opc_buf[op_index] =op_to_movi (op);
Signature · 1 line
1.7.10.4
PATCH 4/4 tcg/optimize: add known-zero bits compute for load ops
In reply to Aurelien Jarno--- tcg/optimize.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tcg/optimize.c +13 -0
@@ -787,6 +787,19 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, mask = temps[args[3 ]].mask | temps[args[4 ]].mask;break ; + CASE_OP_32_64(ld8u): +case INDEX_op_qemu_ld8u: + mask =0xff ; +break ; + CASE_OP_32_64(ld16u): +case INDEX_op_qemu_ld16u: + mask =0xffff ; +break ; +case INDEX_op_ld32u_i64: +case INDEX_op_qemu_ld32u: + mask =0xffffffffu ; +break ; +default :break ; }
Signature · 1 line
1.7.10.4
Il 03/09/2013 08:27, Aurelien Jarno ha scritto:
Quoted 4 lines
This patchset first fixes known-zero bits optimization so that it is actually used, and does some further optimizations for 32-bit ops and unsigned loads.
Quoted 9 lines
Aurelien Jarno (4):
tcg/optimize: fix know-zero bits optimization tcg/optimize: fix known-zero bits for right shift ops tcg/optimize: improve known-zero bits for 32-bit ops tcg/optimize: add known-zero bits compute for load opstcg/optimize.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-)
Commit message 1 is a bit misleading, because the optimization still works for quite a few cases involving constant and copy propagation. However, I had the same patch in my queue, so I can't deny that there is a problem. :)
Two questions:
1) should patch 2 be CCed to qemu-stable?
2) should patches 1 and 2 be inverted to avoid triggering bugs?
Paolo
Quoted 11 lines · Paolo Bonzini
Il 03/09/2013 08:27, Aurelien Jarno ha scritto:
Quoted 10 lines
This patchset first fixes known-zero bits optimization so that it is actually used, and does some further optimizations for 32-bit ops and unsigned loads.
Aurelien Jarno (4):
tcg/optimize: fix know-zero bits optimization tcg/optimize: fix known-zero bits for right shift ops tcg/optimize: improve known-zero bits for 32-bit ops tcg/optimize: add known-zero bits compute for load ops
Quoted 8 lines
Quoted 3 lines
tcg/optimize.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-)Commit message 1 is a bit misleading, because the optimization still works for quite a few cases involving constant and copy propagation. However, I had the same patch in my queue, so I can't deny that there is a problem. :)
I have just checked, and it does indeed work for a few cases involving constants. That said, it doesn't change the resulting TCG code, as these cases were already handled by some other optimizations.
That let me ask a question, about why the bit propagation has been added in the middle of other optimizations, and not for example immediately after swapping commutative ops or just before the constant folding.
Quoted 3 lines
Two questions:
1) should patch 2 be CCed to qemu-stable?
I considered it was not a problem given I thought the optimization was basically disabled. I'll fix that in the new version.
Quoted 1 line
2) should patches 1 and 2 be inverted to avoid triggering bugs?
Good idea.
Thanks for the review, I'll send an updated version.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net
Il 09/09/2013 19:04, Aurelien Jarno ha scritto:
Quoted 7 lines
I have just checked, and it does indeed work for a few cases involving constants. That said, it doesn't change the resulting TCG code, as these cases were already handled by some other optimizations.
That let me ask a question, about why the bit propagation has been added in the middle of other optimizations, and not for example immediately after swapping commutative ops or just before the constant folding.
I think it was just an artifact of /me rebasing the patch after other optimizations were introduced.
Paolo
Quoted 4 lines · Aurelien Jarno
This patchset first fixes known-zero bits optimization so that it is actually used, and does some further optimizations for 32-bit ops and unsigned loads.
Quoted 9 lines
Aurelien Jarno (4):
tcg/optimize: fix know-zero bits optimization tcg/optimize: fix known-zero bits for right shift ops tcg/optimize: improve known-zero bits for 32-bit ops tcg/optimize: add known-zero bits compute for load opstcg/optimize.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-)
Although I agree with Paulo about swapping patch 1 and 2.
r~