tcg: Complete handling of ALWAYS and NEVER
A message that is not in the archive (sent off-list or not yet received): CABoDooPPEOWJQ6MeehCKvu=+rCwxj9tH5ZPOX1uHFgVkYiOpnw@mail.gmail.com
PATCH 1/1 tcg: Complete handling of ALWAYS and NEVER
Missing from movcond, and brcondi_i32 (but not brcondi_i64).
--- tcg/tcg-op.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
---
On 02/20/2015 05:05 AM, Laurent Desnogues wrote:> Hi Richard,
Quoted 5 lines
this patch results in movcond with always as a condition to be generated for csel al. The issue is that
optimize.cdid not get patched to accept that which results in sometcg_abortto fire (indo_constant_folding_cond_64in this case).
Consider this patch to precede 08/11.
r~
---
tcg/tcg-op.c +17 -5
@@ -286,9 +286,13 @@ void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, TCGv_i32 arg2, TCGLabel *l)void tcg_gen_brcondi_i32 (TCGCond cond,TCGv_i32 arg1,int32_t arg2,TCGLabel *l) { -TCGv_i32 t0 =tcg_const_i32 (arg2); -tcg_gen_brcond_i32 (cond, arg1, t0, l); -tcg_temp_free_i32 (t0); +if (cond ==TCG_COND_ALWAYS ) { +tcg_gen_br (l); + }else if (cond !=TCG_COND_NEVER ) { +TCGv_i32 t0 =tcg_const_i32 (arg2); +tcg_gen_brcond_i32 (cond, arg1, t0, l); +tcg_temp_free_i32 (t0); + } } void tcg_gen_setcond_i32(TCGCond cond, TCGv_i32 ret,
@@ -546,7 +550,11 @@ void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2,void tcg_gen_movcond_i32 (TCGCond cond,TCGv_i32 ret,TCGv_i32 c1,TCGv_i32 c2,TCGv_i32 v1,TCGv_i32 v2) { -if (TCG_TARGET_HAS_movcond_i32) { +if (cond ==TCG_COND_ALWAYS ) { +tcg_gen_mov_i32 (ret, v1); + }else if (cond ==TCG_COND_NEVER ) { +tcg_gen_mov_i32 (ret, v2); + }else if (TCG_TARGET_HAS_movcond_i32) {tcg_gen_op6i_i32 (INDEX_op_movcond_i32, ret, c1, c2, v1, v2, cond); }else {TCGv_i32 t0 =tcg_temp_new_i32 ();
@@ -1590,7 +1598,11 @@ void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2,void tcg_gen_movcond_i64 (TCGCond cond,TCGv_i64 ret,TCGv_i64 c1,TCGv_i64 c2,TCGv_i64 v1,TCGv_i64 v2) { -if (TCG_TARGET_REG_BITS ==32 ) { +if (cond ==TCG_COND_ALWAYS ) { +tcg_gen_mov_i64 (ret, v1); + }else if (cond ==TCG_COND_NEVER ) { +tcg_gen_mov_i64 (ret, v2); + }else if (TCG_TARGET_REG_BITS ==32 ) {TCGv_i32 t0 =tcg_temp_new_i32 ();TCGv_i32 t1 =tcg_temp_new_i32 (); tcg_gen_op6i_i32(INDEX_op_setcond2_i32, t0,
Signature · 1 line
2.1.0
Hi Richard,
Quoted 3 lines · Richard Henderson
Missing from movcond, and
brcondi_i32(but notbrcondi_i64).Signed-off-by Richard Henderson <[email protected]>
Quoted 5 lines
--- tcg/tcg-op.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)---
Quoted 8 lines
On 02/20/2015 05:05 AM, Laurent Desnogues wrote:> Hi Richard,
Quoted 5 lines
this patch results in movcond with always as a condition to be generated for csel al. The issue is that
optimize.cdid not get patched to accept that which results in sometcg_abortto fire (indo_constant_folding_cond_64in this case).Consider this patch to precede 08/11.
Works fine.
Thanks,
Laurent
Quoted 54 lines
r~
---tcg/tcg-op.c +17
-6@@ -286,9 +286,13 @@ void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, TCGv_i32 arg2, TCGLabel *l)void tcg_gen_brcondi_i32 (TCGCond cond,TCGv_i32 arg1,int32_t arg2,TCGLabel *l) { -TCGv_i32 t0 =tcg_const_i32 (arg2); -tcg_gen_brcond_i32 (cond, arg1, t0, l); -tcg_temp_free_i32 (t0); +if (cond ==TCG_COND_ALWAYS ) { +tcg_gen_br (l); + }else if (cond !=TCG_COND_NEVER ) { +TCGv_i32 t0 =tcg_const_i32 (arg2); +tcg_gen_brcond_i32 (cond, arg1, t0, l); +tcg_temp_free_i32 (t0); + } } void tcg_gen_setcond_i32(TCGCond cond, TCGv_i32 ret,@@ -546,7 +550,11 @@ void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2,void tcg_gen_movcond_i32 (TCGCond cond,TCGv_i32 ret,TCGv_i32 c1,TCGv_i32 c2,TCGv_i32 v1,TCGv_i32 v2) { -if (TCG_TARGET_HAS_movcond_i32) { +if (cond ==TCG_COND_ALWAYS ) { +tcg_gen_mov_i32 (ret, v1); + }else if (cond ==TCG_COND_NEVER ) { +tcg_gen_mov_i32 (ret, v2); + }else if (TCG_TARGET_HAS_movcond_i32) {tcg_gen_op6i_i32 (INDEX_op_movcond_i32, ret, c1, c2, v1, v2, cond); }else {TCGv_i32 t0 =tcg_temp_new_i32 ();@@ -1590,7 +1598,11 @@ void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2,void tcg_gen_movcond_i64 (TCGCond cond,TCGv_i64 ret,TCGv_i64 c1,TCGv_i64 c2,TCGv_i64 v1,TCGv_i64 v2) { -if (TCG_TARGET_REG_BITS ==32 ) { +if (cond ==TCG_COND_ALWAYS ) { +tcg_gen_mov_i64 (ret, v1); + }else if (cond ==TCG_COND_NEVER ) { +tcg_gen_mov_i64 (ret, v2); + }else if (TCG_TARGET_REG_BITS ==32 ) {TCGv_i32 t0 =tcg_temp_new_i32 ();TCGv_i32 t1 =tcg_temp_new_i32 (); tcg_gen_op6i_i32(INDEX_op_setcond2_i32, t0, --2.1.0