gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing FOLD rules for U32 conversions.

Browse Source
This commit is contained in:
Mike Pall 2013-01-21 16:49:03 +01:00
parent 89e4650bae
commit 1651684417
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/lj_opt_fold.c
View File

@ -938,25 +938,18 @@ LJFOLDF(shortcut_conv_num_int)
} }
LJFOLD(CONV CONV IRCONV_INT_NUM) /* _INT */ LJFOLD(CONV CONV IRCONV_INT_NUM) /* _INT */
LJFOLD(CONV CONV IRCONV_U32_NUM) /* _U32*/
LJFOLDF(simplify_conv_int_num) LJFOLDF(simplify_conv_int_num)
{ {
/* Fold even across PHI to avoid expensive num->int conversions in loop. */ /* Fold even across PHI to avoid expensive num->int conversions in loop. */
if ((fleft->op2 & IRCONV_SRCMASK) == IRT_INT) if ((fleft->op2 & IRCONV_SRCMASK) ==
((fins->op2 & IRCONV_DSTMASK) >> IRCONV_DSH))
return fleft->op1; return fleft->op1;
return NEXTFOLD; return NEXTFOLD;
} }
LJFOLD(CONV CONV IRCONV_U32_NUM) /* _U32*/ LJFOLD(CONV CONV IRCONV_I64_NUM) /* _INT or _U32 */
LJFOLDF(simplify_conv_u32_num) LJFOLD(CONV CONV IRCONV_U64_NUM) /* _INT or _U32 */
{
/* Fold even across PHI to avoid expensive num->int conversions in loop. */
if ((fleft->op2 & IRCONV_SRCMASK) == IRT_U32)
return fleft->op1;
return NEXTFOLD;
}
LJFOLD(CONV CONV IRCONV_I64_NUM) /* _INT or _U32*/
LJFOLD(CONV CONV IRCONV_U64_NUM) /* _INT or _U32*/
LJFOLDF(simplify_conv_i64_num) LJFOLDF(simplify_conv_i64_num)
{ {
PHIBARRIER(fleft); PHIBARRIER(fleft);
@ -978,13 +971,24 @@ LJFOLDF(simplify_conv_i64_num)
return NEXTFOLD; return NEXTFOLD;
} }
LJFOLD(CONV CONV IRCONV_INT_I64) /* _INT */ LJFOLD(CONV CONV IRCONV_INT_I64) /* _INT or _U32 */
LJFOLD(CONV CONV IRCONV_INT_U64) /* _INT */ LJFOLD(CONV CONV IRCONV_INT_U64) /* _INT or _U32 */
LJFOLD(CONV CONV IRCONV_U32_I64) /* _INT or _U32 */
LJFOLD(CONV CONV IRCONV_U32_U64) /* _INT or _U32 */
LJFOLDF(simplify_conv_int_i64) LJFOLDF(simplify_conv_int_i64)
{ {
int src;
PHIBARRIER(fleft); PHIBARRIER(fleft);
if ((fleft->op2 & IRCONV_SRCMASK) == IRT_INT) src = (fleft->op2 & IRCONV_SRCMASK);
if (src == IRT_INT || src == IRT_U32) {
if (src == ((fins->op2 & IRCONV_DSTMASK) >> IRCONV_DSH)) {
return fleft->op1; return fleft->op1;
} else {
fins->op2 = ((fins->op2 & IRCONV_DSTMASK) | src);
fins->op1 = fleft->op1;
return RETRYFOLD;
}
}
return NEXTFOLD; return NEXTFOLD;
} }
@ -1064,14 +1068,21 @@ LJFOLD(CONV MUL IRCONV_INT_I64)
LJFOLD(CONV ADD IRCONV_INT_U64) LJFOLD(CONV ADD IRCONV_INT_U64)
LJFOLD(CONV SUB IRCONV_INT_U64) LJFOLD(CONV SUB IRCONV_INT_U64)
LJFOLD(CONV MUL IRCONV_INT_U64) LJFOLD(CONV MUL IRCONV_INT_U64)
LJFOLD(CONV ADD IRCONV_U32_I64)
LJFOLD(CONV SUB IRCONV_U32_I64)
LJFOLD(CONV MUL IRCONV_U32_I64)
LJFOLD(CONV ADD IRCONV_U32_U64)
LJFOLD(CONV SUB IRCONV_U32_U64)
LJFOLD(CONV MUL IRCONV_U32_U64)
LJFOLDF(simplify_conv_narrow) LJFOLDF(simplify_conv_narrow)
{ {
IROp op = (IROp)fleft->o; IROp op = (IROp)fleft->o;
IRType t = irt_type(fins->t);
IRRef op1 = fleft->op1, op2 = fleft->op2, mode = fins->op2; IRRef op1 = fleft->op1, op2 = fleft->op2, mode = fins->op2;
PHIBARRIER(fleft); PHIBARRIER(fleft);
op1 = emitir(IRTI(IR_CONV), op1, mode); op1 = emitir(IRTI(IR_CONV), op1, mode);
op2 = emitir(IRTI(IR_CONV), op2, mode); op2 = emitir(IRTI(IR_CONV), op2, mode);
fins->ot = IRTI(op); fins->ot = IRT(op, t);
fins->op1 = op1; fins->op1 = op1;
fins->op2 = op2; fins->op2 = op2;
return RETRYFOLD; return RETRYFOLD;