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

Reorganize scalar evolution analysis.

Browse Source
This commit is contained in:
Mike Pall 2010-03-15 16:23:02 +01:00
parent a25a717089
commit 24402ede04
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lj_jit.h
View File

@ -201,6 +201,16 @@ typedef struct BPropEntry {
/* Number of slots for the backpropagation cache. Must be a power of 2. */ /* Number of slots for the backpropagation cache. Must be a power of 2. */
#define BPROP_SLOTS 16 #define BPROP_SLOTS 16
/* Scalar evolution analysis cache. */
typedef struct ScEvEntry {
IRRef1 idx; /* Index reference. */
IRRef1 start; /* Constant start reference. */
IRRef1 stop; /* Constant stop reference. */
IRRef1 step; /* Constant step reference. */
IRType1 t; /* Scalar type. */
uint8_t dir; /* Direction. 0: +, 1: -. */
} ScEvEntry;
/* 128 bit SIMD constants. */ /* 128 bit SIMD constants. */
enum { enum {
LJ_KSIMD_ABS, LJ_KSIMD_ABS,
@ -283,6 +293,8 @@ typedef struct jit_State {
BPropEntry bpropcache[BPROP_SLOTS]; /* Backpropagation cache slots. */ BPropEntry bpropcache[BPROP_SLOTS]; /* Backpropagation cache slots. */
uint32_t bpropslot; /* Round-robin index into bpropcache slots. */ uint32_t bpropslot; /* Round-robin index into bpropcache slots. */
ScEvEntry scev; /* Scalar evolution analysis cache slots. */
const BCIns *startpc; /* Bytecode PC of starting instruction. */ const BCIns *startpc; /* Bytecode PC of starting instruction. */
TraceNo parent; /* Parent of current side trace (0 for root traces). */ TraceNo parent; /* Parent of current side trace (0 for root traces). */
ExitNo exitno; /* Exit number in parent of current side trace. */ ExitNo exitno; /* Exit number in parent of current side trace. */

27
src/lj_record.c
View File

@ -295,9 +295,9 @@ static TRef find_kinit(jit_State *J, const BCIns *endpc, BCReg slot, IRType t)
/* Peek before FORI to find a const initializer. Otherwise load from slot. */ /* Peek before FORI to find a const initializer. Otherwise load from slot. */
static TRef fori_arg(jit_State *J, const BCIns *fori, BCReg slot, IRType t) static TRef fori_arg(jit_State *J, const BCIns *fori, BCReg slot, IRType t)
{ {
TRef tr = find_kinit(J, fori, slot, t); TRef tr = J->base[slot];
if (!tr) { if (!tr) {
tr = J->base[slot]; tr = find_kinit(J, fori, slot, t);
if (!tr) { if (!tr) {
if (t == IRT_INT) if (t == IRT_INT)
t |= IRT_GUARD; t |= IRT_GUARD;
@ -347,10 +347,16 @@ static LoopEvent rec_for(jit_State *J, const BCIns *fori, int isforl)
if (isforl) { /* Handle FORL/JFORL opcodes. */ if (isforl) { /* Handle FORL/JFORL opcodes. */
TRef step; TRef step;
idx = tr[FORL_IDX]; idx = tr[FORL_IDX];
if (!idx) idx = sloadt(J, (int32_t)(ra+FORL_IDX), IRT_NUM, 0); if (tref_ref(idx) == J->scev.idx) {
t = tref_type(idx); t = J->scev.t.irt;
stop = fori_arg(J, fori, ra+FORL_STOP, t); stop = J->scev.stop;
step = fori_arg(J, fori, ra+FORL_STEP, t); step = J->scev.step;
} else {
if (!idx) idx = sloadt(J, (int32_t)(ra+FORL_IDX), IRT_NUM, 0);
t = tref_type(idx);
stop = fori_arg(J, fori, ra+FORL_STOP, t);
step = fori_arg(J, fori, ra+FORL_STEP, t);
}
tr[FORL_IDX] = idx = emitir(IRT(IR_ADD, t), idx, step); tr[FORL_IDX] = idx = emitir(IRT(IR_ADD, t), idx, step);
} else { /* Handle FORI/JFORI opcodes. */ } else { /* Handle FORI/JFORI opcodes. */
BCReg i; BCReg i;
@ -2258,6 +2264,10 @@ static void rec_setup_forl(jit_State *J, const BCIns *fori)
TRef step = fori_arg(J, fori, ra+FORL_STEP, t); TRef step = fori_arg(J, fori, ra+FORL_STEP, t);
int dir = (0 <= numV(&forbase[FORL_STEP])); int dir = (0 <= numV(&forbase[FORL_STEP]));
lua_assert(bc_op(*fori) == BC_FORI || bc_op(*fori) == BC_JFORI); lua_assert(bc_op(*fori) == BC_FORI || bc_op(*fori) == BC_JFORI);
J->scev.t.irt = t;
J->scev.dir = dir;
J->scev.stop = tref_ref(stop);
J->scev.step = tref_ref(step);
if (!tref_isk(step)) { if (!tref_isk(step)) {
/* Non-constant step: need a guard for the direction. */ /* Non-constant step: need a guard for the direction. */
TRef zero = (t == IRT_INT) ? lj_ir_kint(J, 0) : lj_ir_knum_zero(J); TRef zero = (t == IRT_INT) ? lj_ir_kint(J, 0) : lj_ir_knum_zero(J);
@ -2285,9 +2295,11 @@ static void rec_setup_forl(jit_State *J, const BCIns *fori)
k = (int32_t)(dir ? 0x7fffffff : 0x80000000) - k; k = (int32_t)(dir ? 0x7fffffff : 0x80000000) - k;
emitir(IRTGI(dir ? IR_LE : IR_GE), stop, lj_ir_kint(J, k)); emitir(IRTGI(dir ? IR_LE : IR_GE), stop, lj_ir_kint(J, k));
} }
if (t == IRT_INT && !find_kinit(J, fori, ra+FORL_IDX, IRT_INT)) J->scev.start = tref_ref(find_kinit(J, fori, ra+FORL_IDX, IRT_INT));
if (t == IRT_INT && !J->scev.start)
t |= IRT_GUARD; t |= IRT_GUARD;
J->base[ra+FORL_EXT] = sloadt(J, (int32_t)(ra+FORL_IDX), t, IRSLOAD_INHERIT); J->base[ra+FORL_EXT] = sloadt(J, (int32_t)(ra+FORL_IDX), t, IRSLOAD_INHERIT);
J->scev.idx = tref_ref(J->base[ra+FORL_EXT]);
J->maxslot = ra+FORL_EXT+1; J->maxslot = ra+FORL_EXT+1;
} }
@ -2403,6 +2415,7 @@ void lj_record_setup(jit_State *J)
memset(J->slot, 0, sizeof(J->slot)); memset(J->slot, 0, sizeof(J->slot));
memset(J->chain, 0, sizeof(J->chain)); memset(J->chain, 0, sizeof(J->chain));
memset(J->bpropcache, 0, sizeof(J->bpropcache)); memset(J->bpropcache, 0, sizeof(J->bpropcache));
J->scev.idx = REF_NIL;
J->baseslot = 1; /* Invoking function is at base[-1]. */ J->baseslot = 1; /* Invoking function is at base[-1]. */
J->base = J->slot + J->baseslot; J->base = J->slot + J->baseslot;