From 68a1987919d18380abd38b0b60f46a5102f0fb2b Mon Sep 17 00:00:00 2001 From: eunhhu Date: Mon, 5 Oct 2026 10:41:18 +0100 Subject: Keep arrays' number columns as narrow as their values (u8, u32, f64; a DENSE list's keys as its slots), open a packed list's slice in code with an integer index, keep a nest of loops' values in registers of their own: BFS core 27.5 to 19.6 ms (022) --- core/module-jit.c | 635 ++++++++++++++++++++++++++++++++++++++++------------- core/module-list.c | 207 ++++++++++++++--- core/module-list.h | 1 + core/module-run.h | 12 +- core/test-module.c | 84 +++++-- 5 files changed, 735 insertions(+), 204 deletions(-) diff --git a/core/module-jit.c b/core/module-jit.c index bf31df0..93d7b9b 100644 --- a/core/module-jit.c +++ b/core/module-jit.c @@ -111,11 +111,11 @@ static bool resolve(Emit *e) { } /* x0, x1, x9, x10, x16, x17 and d0-d7 are scratch within an instruction's - * code; x11-x15 and d16-d31 hold the stack's values; x2-x8, x25 and x26 a - * loop's kept values; x19 the frame, x20 its stack, x21 the values, x22 the + * code; x11-x13 and d16-d31 hold the stack's values; x2-x8, x14, x15, x25 + * and x26 the loops' kept values; x19 the frame, x20 its stack, x21 the values, x22 the * event, x23 the app, x24 its lists, x27 the frame's loops, x28 the event's * locals; d8 infinity. */ -enum { X0 = 0, X1 = 1, X2 = 2, X9 = 9, X10 = 10, X11 = 11, X16 = 16, X17 = 17, X19 = 19, X20 = 20, X21 = 21, X22 = 22, +enum { X0 = 0, X1 = 1, X2 = 2, X9 = 9, X10 = 10, X11 = 11, X12 = 12, X13 = 13, X16 = 16, X17 = 17, X19 = 19, X20 = 20, X21 = 21, X22 = 22, X23 = 23, X24 = 24, X25 = 25, X26 = 26, X27 = 27, X28 = 28, X29 = 29, X30 = 30, SP = 31, XZR = 31 }; enum { D0 = 0, D1 = 1, D2 = 2, D3 = 3, D4 = 4, D8 = 8, D9 = 9 }; enum { EQ = 0, NE = 1, HS = 2, LO = 3, MI = 4, PL = 5, VS = 6, VC = 7, HI = 8, LS = 9, GE = 10, LT = 11, GT = 12, LE = 13 }; @@ -193,6 +193,8 @@ static const uint32_t UCVTF_W = 0x1E630000; static const uint32_t FCVTZU_X = 0x9E790000; static const uint32_t FMOV_DX = 0x9E670000; /* FMOV Dd, Xn */ static const uint32_t FMOV_XD = 0x9E660000; /* FMOV Xd, Dn */ +static const uint32_t FCVTZS_X = 0x9E780000; +static const uint32_t SCVTF_X = 0x9E620000; static void fcmp(Emit *e, unsigned n, unsigned m) { put(e, 0x1E602000 | m << 16 | n << 5); } static void fcmp_zero(Emit *e, unsigned n) { put(e, 0x1E602008 | n << 5); } /* STP/LDP of two 64-bit registers at sp + offset (pre-indexed down, or plain). */ @@ -222,6 +224,12 @@ static void cbnz_x(Emit *e, unsigned t, int label) { branch_to(e, 0xB5000000 | t static void tbz(Emit *e, unsigned t, unsigned bit, int label) { branch_to(e, 0x36000000 | (bit >> 5) << 31 | (bit & 31) << 19 | t, label, 2); } static void tbnz(Emit *e, unsigned t, unsigned bit, int label) { branch_to(e, 0x37000000 | (bit >> 5) << 31 | (bit & 31) << 19 | t, label, 2); } static void cmp_w_imm(Emit *e, unsigned n, uint32_t imm) { put(e, 0x7100001F | imm << 10 | n << 5); } +static void mul_reg(Emit *e, unsigned d, unsigned n, unsigned m) { put(e, 0x9B007C00 | m << 16 | n << 5 | d); } +static void load32_index(Emit *e, unsigned t, unsigned base, unsigned index) { put(e, 0xB8607800 | index << 16 | base << 5 | t); } /* [base, index, LSL #2] */ +static void store32_index(Emit *e, unsigned t, unsigned base, unsigned index) { put(e, 0xB8207800 | index << 16 | base << 5 | t); } +static void load8_index(Emit *e, unsigned t, unsigned base, unsigned index) { put(e, 0x38606800 | index << 16 | base << 5 | t); } /* [base, index] */ +static void store8_index(Emit *e, unsigned t, unsigned base, unsigned index) { put(e, 0x38206800 | index << 16 | base << 5 | t); } +static void orr_lsl(Emit *e, unsigned d, unsigned n, unsigned m, unsigned shift) { put(e, 0xAA000000 | m << 16 | shift << 10 | n << 5 | d); } /* ---- What the compiler knows */ @@ -242,16 +250,22 @@ typedef struct { bool borrowed, negate; int16_t owner; uint64_t bits; + int16_t walk; /* a fast walk's place (its kept register), or -1 */ } Value; +#define MEMORY ((Value){V_MEM, 0, 0, false, false, -1, 0, -1}) -/* What a loop keeps in a register: of a list, a FLAT column's cells (NULL +/* What a loop keeps in a register: of a list, a FLAT column's cells (0 * when it is not FLAT), a DENSE one's, its key set's bits (NULL when it keeps * no bits), the keys they reach (64 a word), its count; of a walk, where it - * is and where it stops; of a count, its round and how many. */ + * is and where it stops; of a count, its round and how many. A column's + * address carries its cells' width in its top byte (bit 56 one byte, 58 + * four, 59 eight): loads on AArch64 Linux leave the top byte out + * (Documentation/arch/arm64/tagged-pointers.rst), so the code reads through + * it as it is. */ enum { C_COLUMN, C_DENSE, C_BITS, C_LIMIT, C_COUNT, C_AT, C_END, C_K, C_N }; typedef struct { uint8_t kind, field; uint16_t list; uint8_t reg; int loop; } Kept; enum { KEPT_MOST = 64, NO_REG = 0xFF }; -static const uint8_t kept_registers[] = {2, 3, 4, 5, 6, 7, 8, 25, 26}; +static const uint8_t kept_registers[] = {2, 3, 4, 5, 6, 7, 8, 14, 15, 25, 26}; typedef struct { uint32_t start, end; /* its block */ @@ -265,8 +279,9 @@ typedef struct { uint32_t writes; /* the lists its block may change (every bit: any) */ bool fast; /* a walk whose list its block does not change: its place kept, its end once */ bool arena; /* its block may leave bytes in the arena: given back each round */ - uint64_t kept; /* what it keeps */ - int at_kept, end_kept, k_kept, n_kept; + int at_kept, end_kept, k_kept, n_kept; /* its state's kept values */ + int nest; /* the outermost loop around it (itself when none is) */ + uint64_t region; /* what its nest keeps: each in a register of its own, all read at each label in it */ } LoopAt; typedef struct { int label; PureFault kind; uint32_t pc; } FaultAt; @@ -285,8 +300,13 @@ typedef struct { uint8_t result_kind, result_reg; uint64_t fresh; /* what is kept at its end */ int loop; /* the innermost loop around it */ + int tree_list; /* ITEM_GET whose kept column was none: the run a tree's code keeps tried first (else -1) */ + unsigned tree_field; } Slow; +/* A cell of eight bytes or one, read out of the line a four-byte one is read in. */ +typedef struct { int label, back; uint8_t result, column, at; } Wide; + typedef struct { const PureModule *m; PureBlock block; @@ -303,6 +323,8 @@ typedef struct { size_t fault_count, fault_room; Slow *slows; size_t slow_count, slow_room; + Wide *wides; + size_t wide_count, wide_room; Kept kept[KEPT_MOST]; unsigned kept_count; uint64_t fresh; /* what is kept and holds its value now */ @@ -343,11 +365,13 @@ static size_t loop_offset(const LoopAt *l) { return (l->depth - 1) * sizeof(Loop /* ---- Kept values */ +/* What the nest of loop keeps of kind for list and field (a loop's state: list is the loop), or -1. */ static int kept_find(const Block *k, int loop, unsigned kind, unsigned list, unsigned field) { if (loop < 0) return -1; + int nest = k->loops[loop].nest; for (unsigned i = 0; i < k->kept_count; ++i) { const Kept *c = &k->kept[i]; - if (c->loop == loop && c->kind == kind && c->list == list && c->field == field && c->reg != NO_REG) return (int)i; + if (c->loop == nest && c->kind == kind && c->list == list && c->field == field) return (int)i; } return -1; } @@ -363,6 +387,8 @@ static void kept_load(Block *k, unsigned c) { load64(e, X16, X24, list_at); load8(e, X17, X16, pure_list_layout[LIST_FORM_AT]); load64(e, r, X16, pure_list_layout[LIST_COLUMNS_AT] + v->field * sizeof(void *)); + load8(e, X9, X16, pure_list_layout[LIST_WIDTH_AT] + v->field); + orr_lsl(e, r, r, X9, 56); cmp_w_imm(e, X17, v->kind == C_COLUMN ? FLAT_FORM : DENSE_FORM); csel(e, r, r, XZR, EQ); break; @@ -411,19 +437,25 @@ static unsigned kept_reg(Block *k, int c) { return k->kept[c].reg; } -/* What the code at pc may count on being kept: its innermost loop's. */ -static uint64_t kept_at(const Block *k, int loop) { return loop >= 0 ? k->loops[loop].kept : 0; } +/* What the code in loop may count on being kept: its nest's. */ +static uint64_t kept_at(const Block *k, int loop) { return loop >= 0 ? k->loops[loop].region : 0; } -/* Before a call: a walk's place, kept in a register, back where the steps read it. */ -static void write_back(Block *k) { +/* Before a call from code in loop: the places of the walks open around it, + * kept in registers, back where the steps read them (the event's row the + * innermost walk's). */ +static void write_back(Block *k, int loop) { Emit *e = k->e; - for (unsigned c = 0; c < k->kept_count; ++c) { - const Kept *v = &k->kept[c]; - if (!(k->fresh >> c & 1) || v->kind != C_AT) continue; - const LoopAt *l = &k->loops[v->list]; - if (v->loop != (int)v->list) continue; /* another loop's copy: never moved */ - store64(e, v->reg, X27, loop_offset(l) + offsetof(Loop, walk) + offsetof(Walk, at)); - store64(e, v->reg, X22, offsetof(Event, row)); + bool row = false; + for (int l = loop; l >= 0; l = k->loops[l].parent) { + const LoopAt *w = &k->loops[l]; + if (!w->walk || !w->fast || w->at_kept < 0 || !(k->fresh >> w->at_kept & 1)) { + row = row || w->walk; + continue; + } + unsigned r = k->kept[w->at_kept].reg; + store64(e, r, X27, loop_offset(w) + offsetof(Loop, walk) + offsetof(Walk, at)); + if (!row) store64(e, r, X22, offsetof(Event, row)); + row = true; } } @@ -461,7 +493,7 @@ static unsigned alloc_d(Block *k, unsigned below) { } static unsigned alloc_x(Block *k, unsigned below) { - for (unsigned r = X11; r < X16; ++r) + for (unsigned r = X11; r < X11 + 3; ++r) if (!held(k, below, false, r)) return r; for (unsigned h = 0; h < below; ++h) if ((k->vs[h].kind == V_X || k->vs[h].kind == V_BIT) && !k->vs[h].borrowed) { @@ -490,7 +522,7 @@ static void spill(Block *k, unsigned h) { case V_FLAG: cset(e, X9, v->cond); fp2(e, UCVTF_W, D0, X9); store_d(e, D0, X20, AT(h)); break; } if (v->owner >= 0) owner_is(e, h, v->owner); - *v = (Value){V_MEM, 0, 0, false, false, -1, 0}; + *v = MEMORY; } static void spill_all(Block *k, unsigned height) { @@ -504,7 +536,7 @@ static void unflag(Block *k, unsigned h, unsigned live) { if (v->kind != V_FLAG) return; unsigned r = alloc_x(k, live); cset(k->e, r, v->cond); - *v = (Value){V_BIT, (uint8_t)r, 0, false, false, v->owner, 0}; + *v = (Value){V_BIT, (uint8_t)r, 0, false, false, v->owner, 0, -1}; } /* Every comparison below height out of the flags (the code next sets them). */ @@ -614,6 +646,7 @@ static int landing(const Block *k, uint32_t from, uint32_t target, int *loop) { static void join(Block *k, unsigned height, int loop) { spill_all(k, height); refresh(k, kept_at(k, loop)); + k->fresh = kept_at(k, loop); /* as every way here has it */ } /* ---- Out of the way: steps */ @@ -629,6 +662,7 @@ static Slow *slow_at(Block *k, uint32_t pc, uintptr_t function, unsigned height, s->pc = pc, s->function = function, s->height = height, s->base = base, s->result = result; for (unsigned h = base; h < height; ++h) s->operands[h - base] = k->vs[h]; s->loop = k->loop_of[pc - k->block.start]; + s->tree_list = -1; return s; } @@ -640,48 +674,113 @@ static void slow_back(Block *k, size_t s, unsigned kind, unsigned reg) { bind(k->e, slow->back); } +/* A step called for s: its operands in their slots, the walks' places + * written back; its result where the fast way leaves it, what is kept read + * again; then back. */ +static void stub_call(Block *k, const Slow *s, uintptr_t function) { + Emit *e = k->e; + for (unsigned h = s->base; h < s->height; ++h) k->vs[h] = s->operands[h - s->base]; + for (unsigned h = s->base; h < s->height; ++h) spill(k, h); + k->fresh = s->fresh; + write_back(k, s->loop); + set_sp(k, s->height); + mov_reg(e, X0, X19); + mov_w(e, X1, s->pc); + call(e, function); + cbnz_w(e, X0, k->exit); + if (s->result >= 0) { + if (s->result_kind == V_D) load_d(e, s->result_reg, X20, AT(s->result)); + else { /* a bool or a whole number: its number back to an integer */ + load_d(e, D0, X20, AT(s->result)); + fp2(e, FCVTZU_X, s->result_reg, D0); + } + } + k->fresh = 0; + refresh(k, s->fresh); + b(e, s->back); +} + static void slow_stubs(Block *k) { Emit *e = k->e; for (size_t i = 0; i < k->slow_count; ++i) { Slow s = k->slows[i]; - bind(e, s.label); Value saved[PURE_MODULE_STACK + 1]; memcpy(saved, k->vs, sizeof(saved)); - for (unsigned h = s.base; h < s.height; ++h) k->vs[h] = s.operands[h - s.base]; - for (unsigned h = s.base; h < s.height; ++h) spill(k, h); - k->fresh = s.fresh; - write_back(k); - set_sp(k, s.height); - mov_reg(e, X0, X19); - mov_w(e, X1, s.pc); - call(e, s.function); - cbnz_w(e, X0, k->exit); - if (s.result >= 0) { - if (s.result_kind == V_D) load_d(e, s.result_reg, X20, AT(s.result)); - else { /* a bool or a whole number: its number back to an integer */ - load_d(e, D0, X20, AT(s.result)); - fp2(e, FCVTZU_X, s.result_reg, D0); - } + bind(e, s.label); + if (s.tree_list >= 0) { /* a tree's item: the run kept, else its run kept by the step (pure_run_item); DENSE: the step */ + int item = new_label(e), step = new_label(e); + for (unsigned h = s.base; h < s.height; ++h) k->vs[h] = s.operands[h - s.base]; + load64(e, X16, X24, (size_t)s.tree_list * sizeof(PureList *)); + load8(e, X17, X16, pure_list_layout[LIST_FORM_AT]); + cbnz_w(e, X17, step); + unsigned at = value_index(k, s.base, X9); + load64(e, X10, X19, offsetof(Frame, run.list)); + cmp_reg(e, X10, X16); + b_cond(e, NE, item); + load64(e, X10, X19, offsetof(Frame, run.version)); + load64(e, X17, X16, pure_list_layout[LIST_VERSION_AT]); + cmp_reg(e, X10, X17); + b_cond(e, NE, item); + load64(e, X10, X19, offsetof(Frame, run.start)); + sub_reg(e, X0, at, X10); + load64(e, X10, X19, offsetof(Frame, run.count)); + cmp_reg(e, X0, X10); + b_cond(e, HS, item); + load64(e, X17, X19, offsetof(Frame, run.columns) + s.tree_field * sizeof(void *)); + load_d_index(e, s.result_reg, X17, X0); + b(e, s.back); + bind(e, item); + stub_call(k, &s, (uintptr_t)pure_run_item); + bind(e, step); } - k->fresh = 0; - refresh(k, s.fresh); - b(e, s.back); + stub_call(k, &s, s.function); memcpy(k->vs, saved, sizeof(saved)); } } +/* A cell at at of a column (its address tagged with its width) as a number in r. */ +static void load_cell(Block *k, unsigned r, unsigned column, unsigned at) { + Emit *e = k->e; + if (!grow_array((void **)&k->wides, &k->wide_room, k->wide_count + 1, sizeof(*k->wides))) { + e->failed = true; + return; + } + Wide *w = &k->wides[k->wide_count++]; + *w = (Wide){new_label(e), new_label(e), (uint8_t)r, (uint8_t)column, (uint8_t)at}; + tbz(e, column, 58, w->label); + load32_index(e, X10, column, at); + fp2(e, UCVTF_W, r, X10); + bind(e, w->back); +} + +static void wide_stubs(Block *k) { + Emit *e = k->e; + for (size_t i = 0; i < k->wide_count; ++i) { + const Wide *w = &k->wides[i]; + int one = new_label(e); + bind(e, w->label); + tbz(e, w->column, 59, one); + load_d_index(e, w->result, w->column, w->at); + b(e, w->back); + bind(e, one); + load8_index(e, X10, w->column, w->at); + fp2(e, UCVTF_W, w->result, X10); + b(e, w->back); + } +} + /* An instruction the step runs, in line: the stack in its slots, what was kept read again when needed. */ static void call_step(Block *k, uintptr_t function, uint32_t pc, unsigned height) { Emit *e = k->e; spill_all(k, height); - write_back(k); + write_back(k, k->loop_of[pc - k->block.start]); set_sp(k, height); mov_reg(e, X0, X19); mov_w(e, X1, pc); call(e, function); cbnz_w(e, X0, k->exit); k->fresh = 0; - for (unsigned h = 0; h <= PURE_MODULE_STACK; ++h) k->vs[h] = (Value){V_MEM, 0, 0, false, false, -1, 0}; /* what it left is in the slots */ + for (unsigned h = 0; h <= PURE_MODULE_STACK; ++h) k->vs[h] = MEMORY; /* what it left is in the slots */ } /* ---- Instructions */ @@ -705,7 +804,7 @@ static void binary(Block *k, const PureOp *op, uint32_t pc, unsigned height) { cond = op->op == PURE_OP_LT ? MI : op->op == PURE_OP_LE ? LS : op->op == PURE_OP_GT ? GT : op->op == PURE_OP_GE ? GE : op->op == PURE_OP_EQ ? EQ : NE; } - k->vs[h] = (Value){V_FLAG, 0, (uint8_t)cond, false, false, -1, 0}; + k->vs[h] = (Value){V_FLAG, 0, (uint8_t)cond, false, false, -1, 0, -1}; return; case PURE_OP_AND: case PURE_OP_OR: { unsigned r = alloc_x(k, h); @@ -717,7 +816,7 @@ static void binary(Block *k, const PureOp *op, uint32_t pc, unsigned height) { cset(e, X9, NE); if (op->op == PURE_OP_AND) and_w(e, r, X10, X9); else orr_w(e, r, X10, X9); - k->vs[h] = (Value){V_BIT, (uint8_t)r, 0, false, false, -1, 0}; + k->vs[h] = (Value){V_BIT, (uint8_t)r, 0, false, false, -1, 0, -1}; return; } default: break; @@ -738,7 +837,7 @@ static void binary(Block *k, const PureOp *op, uint32_t pc, unsigned height) { fp2(e, FABS, D2, r); /* finite: below infinity (a NaN is unordered: HS too) */ fcmp(e, D2, D8); b_cond(e, HS, fault_at(k, PURE_FAULT_NON_FINITE, pc)); - k->vs[h] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0}; + k->vs[h] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0, -1}; } /* A key's bit in a list's bits (in bits, reaching limit keys): r's bit 0, @@ -765,8 +864,62 @@ static bool numbers_only(const PureModule *m, uint32_t list) { return true; } +/* The value at h into a column (in col, its cells width bytes, in wbytes) + * at row at, or to slow when it does not fit (narrow: a whole number from + * 0, not -0, below 2^8 or 2^32); a DENSE list's key (0) stays out. x0, x1, + * d0 and d1 are spent. */ +static void store_cell(Block *k, unsigned h, unsigned col, unsigned wbytes, unsigned at, int slow) { + Emit *e = k->e; + Value *v = &k->vs[h]; + int eight = new_label(e), four = new_label(e), done = new_label(e); + cmp_w_imm(e, wbytes, 8); + b_cond(e, EQ, eight); + cbz_w(e, wbytes, done); + unsigned x = X0; + if (v->kind == V_X) x = v->reg; + else if (v->kind == V_BIT) { + and_w_one(e, X0, v->reg); + if (v->negate) eor_w_one(e, X0, X0); + } else if (v->kind == V_CONST) { + double n = num_of(v->bits); + if (n >= 0 && n == floor(n) && !(n == 0 && signbit(n)) && n < 0x1p63) mov_imm(e, X0, (uint64_t)n); + else b(e, slow); + } else { + unsigned d = value_d(k, h, D0); + fp2(e, FMOV_XD, X0, d); + tbnz(e, X0, 63, slow); /* below 0, or -0 */ + fp2(e, FCVTZU_X, X0, d); + fp2(e, UCVTF_X, D1, X0); + fcmp(e, d, D1); + b_cond(e, NE, slow); + } + cmp_w_imm(e, wbytes, 4); + b_cond(e, EQ, four); + cmp_imm(e, x, 256); + b_cond(e, HS, slow); + store8_index(e, x, col, at); + b(e, done); + bind(e, four); + mov_imm(e, X1, UINT64_C(1) << 32); + cmp_reg(e, x, X1); + b_cond(e, HS, slow); + store32_index(e, x, col, at); + b(e, done); + bind(e, eight); + if (v->kind == V_BIT) { + and_w_one(e, X0, v->reg); + if (v->negate) eor_w_one(e, X0, X0); + fp2(e, UCVTF_W, D0, X0); + fp2(e, FMOV_XD, X0, D0); + store64_index(e, X0, col, at); + } else + store64_index(e, value_bits(k, h, X0), col, at); + bind(e, done); +} + /* LIST_APPEND to an event's list of numbers whose places no index follows: - * at the end of a FLAT one, or at its key in a DENSE one, with room. */ + * at the end of a FLAT one, or at its key in a DENSE one, with room, each + * cell fitting its column. */ static void append(Block *k, const PureOp *op, uint32_t pc, unsigned height) { Emit *e = k->e; const PureModule *m = k->m; @@ -787,13 +940,6 @@ static void append(Block *k, const PureOp *op, uint32_t pc, unsigned height) { load64(e, X10, X16, pure_list_layout[LIST_ROOM_AT]); cmp_reg(e, X9, X10); b_cond(e, HS, slow); - for (unsigned f = 0; f < fields; ++f) { - load64(e, X10, X16, pure_list_layout[LIST_COLUMNS_AT] + f * sizeof(void *)); - unsigned bits = value_bits(k, base + f, X0); - store64_index(e, bits, X10, X9); - } - add_imm(e, X9, X9, 1); - store64(e, X9, X16, pure_list_layout[LIST_COUNT_AT]); } else { unsigned key = value_key(k, base + m->state_key[list] - 1u, X9, slow); if (key != X9) mov_reg(e, X9, key); @@ -812,15 +958,23 @@ static void append(Block *k, const PureOp *op, uint32_t pc, unsigned height) { load64_index(e, X1, X0, X10); /* its word: the key there already is EXISTS */ lsr_reg(e, X17, X1, X9); tbnz(e, X17, 0, fault_at(k, PURE_FAULT_EXISTS, pc)); + } + for (unsigned f = 0; f < fields; ++f) { /* the cells, past the end or in the key's empty slot: not the list's until counted */ + load64(e, X10, X16, pure_list_layout[LIST_COLUMNS_AT] + f * sizeof(void *)); + load8(e, X17, X16, pure_list_layout[LIST_WIDTH_AT] + f); + store_cell(k, base + f, X10, X17, X9, slow); + } + if (!keyed) { + add_imm(e, X9, X9, 1); + store64(e, X9, X16, pure_list_layout[LIST_COUNT_AT]); + } else { + load64(e, X0, X16, pure_list_layout[LIST_MEMBERS_AT]); + lsr_imm(e, X10, X9, 6); + load64_index(e, X1, X0, X10); mov_imm(e, X17, 1); lsl_reg(e, X17, X17, X9); orr_reg(e, X1, X1, X17); store64_index(e, X1, X0, X10); - for (unsigned f = 0; f < fields; ++f) { - load64(e, X10, X16, pure_list_layout[LIST_COLUMNS_AT] + f * sizeof(void *)); - unsigned bits = value_bits(k, base + f, X0); - store64_index(e, bits, X10, X9); - } load64(e, X10, X16, pure_list_layout[LIST_MEMBER_COUNT_AT]); add_imm(e, X10, X10, 1); store64(e, X10, X16, pure_list_layout[LIST_MEMBER_COUNT_AT]); @@ -867,12 +1021,12 @@ static void compile_op(Block *k, uint32_t pc) { Value *vs = k->vs; switch (op->op) { case PURE_OP_CONST: - vs[height] = (Value){V_CONST, 0, 0, false, false, -1, (uint64_t)op->integer}; /* the bits: a number's, a bool's or an i64's */ + vs[height] = (Value){V_CONST, 0, 0, false, false, -1, (uint64_t)op->integer, -1}; /* the bits: a number's, a bool's or an i64's */ return; case PURE_OP_LOAD: { unsigned r = alloc_d(k, height); load_d(e, r, X21, arg * sizeof(PureValue)); - vs[height] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0}; + vs[height] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0, -1}; return; } case PURE_OP_STORE: case PURE_OP_CUR_STORE: @@ -882,7 +1036,7 @@ static void compile_op(Block *k, uint32_t pc) { case PURE_OP_LOCAL_LOAD: { unsigned r = alloc_d(k, height); load_d(e, r, X28, (arg & 0xFF) * sizeof(PureValue)); - vs[height] = (Value){V_D, (uint8_t)r, 0, false, false, (int16_t)(arg >> 16), 0}; + vs[height] = (Value){V_D, (uint8_t)r, 0, false, false, (int16_t)(arg >> 16), 0, -1}; return; } case PURE_OP_LOCAL_STORE: @@ -895,27 +1049,27 @@ static void compile_op(Block *k, uint32_t pc) { if (k->loops[l].walk) walk = l; int c = walk >= 0 && k->loops[walk].fast ? kept_find(k, loop, C_AT, (unsigned)walk, 0) : -1; if (c >= 0) { - vs[height] = (Value){V_X, (uint8_t)kept_reg(k, c), 0, true, false, (int16_t)arg, 0}; + vs[height] = (Value){V_X, (uint8_t)kept_reg(k, c), 0, true, false, (int16_t)arg, 0, (int16_t)walk}; return; } unsigned r = alloc_x(k, height); load64(e, r, X22, op->op == PURE_OP_ROW ? offsetof(Event, row) : offsetof(Event, outer)); - vs[height] = (Value){V_X, (uint8_t)r, 0, false, false, (int16_t)arg, 0}; + vs[height] = (Value){V_X, (uint8_t)r, 0, false, false, (int16_t)arg, 0, -1}; return; } case PURE_OP_INDEX_FIRST: - vs[height] = (Value){V_CONST, 0, 0, false, false, (int16_t)arg, 0}; + vs[height] = (Value){V_CONST, 0, 0, false, false, (int16_t)arg, 0, -1}; return; case PURE_OP_LIST_COUNT: { int c = kept_find(k, loop, C_COUNT, arg, 0); if (c >= 0) { - vs[height] = (Value){V_X, (uint8_t)kept_reg(k, c), 0, true, false, -1, 0}; + vs[height] = (Value){V_X, (uint8_t)kept_reg(k, c), 0, true, false, -1, 0, -1}; return; } unsigned r = alloc_x(k, height); load64(e, X16, X24, arg * sizeof(PureList *)); load64(e, r, X16, pure_list_layout[LIST_COUNT_AT]); - vs[height] = (Value){V_X, (uint8_t)r, 0, false, false, -1, 0}; + vs[height] = (Value){V_X, (uint8_t)r, 0, false, false, -1, 0, -1}; return; } case PURE_OP_NOT: { @@ -928,10 +1082,10 @@ static void compile_op(Block *k, uint32_t pc) { memcpy(&v->bits, x == 0 ? &one : &zero, sizeof(v->bits)); } else if (v->kind == V_X) { cmp_imm(e, v->reg, 0); - *v = (Value){V_FLAG, 0, EQ, false, false, -1, 0}; + *v = (Value){V_FLAG, 0, EQ, false, false, -1, 0, -1}; } else { fcmp_zero(e, value_d(k, height - 1, D0)); - *v = (Value){V_FLAG, 0, EQ, false, false, -1, 0}; + *v = (Value){V_FLAG, 0, EQ, false, false, -1, 0, -1}; } v->owner = -1; return; @@ -939,7 +1093,7 @@ static void compile_op(Block *k, uint32_t pc) { case PURE_OP_NEG: case PURE_OP_FLOOR: { unsigned r = alloc_d(k, height - 1), x = value_d(k, height - 1, D0); fp2(e, op->op == PURE_OP_NEG ? FNEG : FRINTM, r, x); - vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0}; + vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0, -1}; return; } case PURE_OP_ADD: case PURE_OP_SUB: case PURE_OP_MUL: case PURE_OP_DIV: case PURE_OP_MIN: case PURE_OP_MAX: @@ -969,7 +1123,7 @@ static void compile_op(Block *k, uint32_t pc) { fp3(e, FMIN, r, r, D3); fp2(e, FMOV_DX, D4, XZR); fp3(e, FMAX, r, D4, r); - vs[height - 2] = (Value){V_D, (uint8_t)r, 0, false, false, (int16_t)(known ? owner : -1), 0}; + vs[height - 2] = (Value){V_D, (uint8_t)r, 0, false, false, (int16_t)(known ? owner : -1), 0, -1}; if (!known) spill(k, height - 2); /* the owner only its slot knows: kept there */ return; } @@ -998,7 +1152,7 @@ static void compile_op(Block *k, uint32_t pc) { bind(e, absent); mov_w(e, r, 0); bind(e, done); - vs[height - 1] = (Value){V_BIT, (uint8_t)r, 0, false, false, -1, 0}; + vs[height - 1] = (Value){V_BIT, (uint8_t)r, 0, false, false, -1, 0, -1}; slow_back(k, s, V_BIT, r); return; } @@ -1021,6 +1175,8 @@ static void compile_op(Block *k, uint32_t pc) { cmp_w_imm(e, X17, DENSE_FORM); b_cond(e, NE, slow); load64(e, X17, X16, pure_list_layout[LIST_COLUMNS_AT] + field * sizeof(void *)); + load8(e, X10, X16, pure_list_layout[LIST_WIDTH_AT] + field); + orr_lsl(e, X17, X17, X10, 56); load64(e, X0, X16, pure_list_layout[LIST_MEMBERS_AT]); load64(e, X1, X16, pure_list_layout[LIST_MEMBER_CAPACITY_AT]); lsl_imm(e, X1, X1, 6); @@ -1035,8 +1191,8 @@ static void compile_op(Block *k, uint32_t pc) { load64_index(e, X10, bits, X10); lsr_reg(e, X10, X10, key); tbz(e, X10, 0, fault_at(k, PURE_FAULT_NOT_FOUND, pc)); - load_d_index(e, r, column, key); - vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0}; + load_cell(k, r, column, key); + vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0, -1}; slow_back(k, s, V_D, r); return; } @@ -1052,17 +1208,21 @@ static void compile_op(Block *k, uint32_t pc) { unsigned r = alloc_d(k, height); if (col_c >= 0) { unsigned column = kept_reg(k, col_c); + k->slows[s].tree_list = (int)list, k->slows[s].tree_field = field; cbz_x(e, column, slow); unsigned at = value_index(k, height - 1, X9), count; - if (count_c >= 0) count = kept_reg(k, count_c); - else { - load64(e, X16, X24, list * sizeof(PureList *)); - load64(e, X17, X16, pure_list_layout[LIST_COUNT_AT]); - count = X17; + int walk = vs[height - 1].walk; + if (walk < 0 || k->loops[walk].list != list) { /* else its place is below its end, which is at most the count */ + if (count_c >= 0) count = kept_reg(k, count_c); + else { + load64(e, X16, X24, list * sizeof(PureList *)); + load64(e, X17, X16, pure_list_layout[LIST_COUNT_AT]); + count = X17; + } + cmp_reg(e, at, count); + b_cond(e, HS, fault_at(k, PURE_FAULT_NOT_FOUND, pc)); } - cmp_reg(e, at, count); - b_cond(e, HS, fault_at(k, PURE_FAULT_NOT_FOUND, pc)); - load_d_index(e, r, column, at); + load_cell(k, r, column, at); } else { /* FLAT: its column; a tree: the run kept, or the step keeps the item's run (pure_run_item) */ int flat = new_label(e), done = new_label(e); size_t fill = (size_t)(slow_at(k, pc, (uintptr_t)pure_run_item, height, height - 1, (int)height - 1) - k->slows); @@ -1094,15 +1254,17 @@ static void compile_op(Block *k, uint32_t pc) { cmp_reg(e, at, X10); b_cond(e, HS, fault_at(k, PURE_FAULT_NOT_FOUND, pc)); load64(e, X17, X16, pure_list_layout[LIST_COLUMNS_AT] + field * sizeof(void *)); - load_d_index(e, r, X17, at); + load8(e, X10, X16, pure_list_layout[LIST_WIDTH_AT] + field); + orr_lsl(e, X17, X17, X10, 56); + load_cell(k, r, X17, at); bind(e, done); - vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0}; + vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0, -1}; slow_back(k, fill, V_D, r); k->slows[s].back = k->slows[fill].back; /* both steps come back here */ k->slows[s].result_kind = V_D, k->slows[s].result_reg = (uint8_t)r, k->slows[s].fresh = k->fresh; return; } - vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0}; + vs[height - 1] = (Value){V_D, (uint8_t)r, 0, false, false, -1, 0, -1}; slow_back(k, s, V_D, r); return; } @@ -1129,7 +1291,7 @@ static void compile_op(Block *k, uint32_t pc) { break; default: fcmp_zero(e, value_d(k, height - 1, D0)); b_cond(e, EQ, target); break; } - vs[height - 1] = (Value){V_MEM, 0, 0, false, false, -1, 0}; + vs[height - 1] = MEMORY; return; } case PURE_OP_JMP: { @@ -1144,7 +1306,7 @@ static void compile_op(Block *k, uint32_t pc) { case PURE_OP_BREAK: { int l = loop; spill_all(k, height); - write_back(k); + write_back(k, loop); mov_reg(e, X0, X19); call(e, (uintptr_t)pure_run_break); k->fresh = 0; @@ -1159,20 +1321,174 @@ static void compile_op(Block *k, uint32_t pc) { /* ---- Loops */ +/* In reg, a whole key: the first position of the packed list (in x16, its + * pack in x17, its keys column key) whose key is not below it, as + * pack_seek finds it in integers (module-list.c). x9-x13 and d1, d2 are + * spent; the stack holds nothing in registers here. */ +static void bound(Block *k, unsigned reg, unsigned key) { + Emit *e = k->e; + int zero = new_label(e), all = new_label(e), done = new_label(e), found = new_label(e), scan = new_label(e); + load64(e, X9, X17, pure_pack_layout[PACK_LOW_AT]); + cmp_reg(e, reg, X9); + b_cond(e, LE, zero); + load64(e, X9, X17, pure_pack_layout[PACK_HIGH_AT]); + cmp_reg(e, reg, X9); + b_cond(e, GT, all); + load64(e, X9, X17, pure_pack_layout[PACK_ORIGIN_AT]); + sub_reg(e, X10, reg, X9); /* from the first bucket's start */ + load32(e, X9, X17, pure_pack_layout[PACK_SHIFT_AT]); + lsr_reg(e, X11, X10, X9); /* its bucket */ + lsl_reg(e, X12, X11, X9); + cmp_reg(e, X12, X10); /* at the bucket's start? */ + load64(e, X9, X17, pure_pack_layout[PACK_FIRST_AT]); + load32_index(e, X13, X9, X11); /* the bucket's first position */ + b_cond(e, EQ, found); + add_imm(e, X11, X11, 1); + load32_index(e, X12, X9, X11); /* where the bucket ends */ + load64(e, X9, X16, pure_list_layout[LIST_COLUMNS_AT] + key * sizeof(void *)); + fp2(e, SCVTF_X, D1, reg); + bind(e, scan); /* on while the keys are below it */ + cmp_reg(e, X13, X12); + b_cond(e, HS, found); + load_d_index(e, D2, X9, X13); + fcmp(e, D2, D1); + b_cond(e, PL, found); + add_imm(e, X13, X13, 1); + b(e, scan); + bind(e, found); + mov_reg(e, reg, X13); + b(e, done); + bind(e, zero); + mov_w(e, reg, 0); + b(e, done); + bind(e, all); + load64(e, reg, X16, pure_list_layout[LIST_COUNT_AT]); + bind(e, done); +} + +/* EACH over a slice of a stored list at pc, opened in code as enter_each + * opens it (module.c) when the list is packed with whole keys and the + * slice's bounds are whole numbers, its place and end kept from there; + * else to slow (the step). */ +static void open_slice(Block *k, uint32_t pc, unsigned height, LoopAt *l, int slow) { + Emit *e = k->e; + const PureModule *m = k->m; + const PureOp *op = &m->code[pc]; + unsigned li = (unsigned)(l - k->loops), length = op->arg >> 16, key = m->state_key[l->list] - 1u; + int skip = new_label(e), body = l->start < l->end ? k->op_label[l->start - k->block.start] : l->again; + uint64_t fresh = k->fresh; + load64(e, X16, X24, l->list * sizeof(PureList *)); + load64(e, X17, X16, pure_list_layout[LIST_PACK_AT]); + cbz_x(e, X17, slow); + load8(e, X9, X17, pure_pack_layout[PACK_WHOLE_AT]); + cbz_w(e, X9, slow); + for (unsigned side = 0; side < 2; ++side) { /* the bounds as whole numbers, in x0 and x1 */ + unsigned h = height - 2 + side, reg = side ? X1 : X0; + if (k->vs[h].kind == V_X) mov_reg(e, reg, k->vs[h].reg); + else { + unsigned d = value_d(k, h, side ? D2 : D0); + fp2(e, FCVTZS_X, reg, d); + fp2(e, SCVTF_X, D3, reg); + fcmp(e, d, D3); + b_cond(e, NE, slow); + } + } + bound(k, X0, key); + bound(k, X1, key); + cmp_reg(e, X1, X0); /* an end below the start: none */ + csel(e, X1, X1, X0, HS); + /* its work: its block's length times the items it starts with, past the budget a fault at the EACH */ + load64(e, X9, X16, pure_list_layout[LIST_COUNT_AT]); + cmp_reg(e, X1, X9); + csel(e, X10, X1, X9, LO); + sub_reg(e, X10, X10, X0); + mov_imm(e, X9, length); + mul_reg(e, X10, X10, X9); + int budgeted = new_label(e); + load64(e, X9, X23, offsetof(PureApp, work_budget)); + cbnz_x(e, X9, budgeted); + mov_imm(e, X9, PURE_WORK_DEFAULT); + bind(e, budgeted); + load64(e, X17, X23, offsetof(PureApp, work)); + sub_reg(e, X9, X9, X17); + cmp_reg(e, X10, X9); + b_cond(e, HI, fault_at(k, PURE_FAULT_WORK, pc)); + add_reg(e, X17, X17, X10); + store64(e, X17, X23, offsetof(PureApp, work)); + cmp_reg(e, X0, X1); /* none: past its block */ + b_cond(e, HS, skip); + load64(e, X9, X16, pure_list_layout[LIST_COUNT_AT]); + cmp_reg(e, X0, X9); + b_cond(e, HS, skip); + size_t at = loop_offset(l); + add_imm(e, X9, X27, (uint32_t)at); + mov_w(e, X10, 1); + store8(e, X10, X9, offsetof(Loop, walking)); + mov_w(e, X10, l->list); + store_w(e, X10, X9, offsetof(Loop, walk) + offsetof(Walk, list)); + store64(e, X0, X9, offsetof(Loop, walk) + offsetof(Walk, at)); + store64(e, X1, X9, offsetof(Loop, walk) + offsetof(Walk, end)); + store8(e, XZR, X9, offsetof(Loop, walk) + offsetof(Walk, removed)); + mov_w(e, X10, l->start); + store_w(e, X10, X9, offsetof(Loop, start)); + mov_w(e, X10, l->end); + store_w(e, X10, X9, offsetof(Loop, end)); + load64(e, X10, X19, offsetof(Frame, arena)); + load64(e, X10, X10, offsetof(PureArena, used)); + store64(e, X10, X9, offsetof(Loop, mark)); + load64(e, X10, X22, offsetof(Event, walk)); + store64(e, X10, X9, offsetof(Loop, around)); + load64(e, X10, X22, offsetof(Event, row)); + store64(e, X10, X9, offsetof(Loop, row)); + add_imm(e, X10, X9, offsetof(Loop, walk)); + store64(e, X10, X22, offsetof(Event, walk)); + store64(e, X0, X22, offsetof(Event, row)); + load32(e, X10, X19, offsetof(Frame, end)); + store_w(e, X10, X9, offsetof(Loop, outer)); + mov_w(e, X10, l->end); + store_w(e, X10, X19, offsetof(Frame, end)); + load32(e, X10, X19, offsetof(Frame, depth)); + add_imm(e, X10, X10, 1); + store_w(e, X10, X19, offsetof(Frame, depth)); + if (l->fast) { /* where it is and where it stops, kept */ + mov_reg(e, k->kept[l->at_kept].reg, X0); + load64(e, X10, X16, pure_list_layout[LIST_COUNT_AT]); + cmp_reg(e, X1, X10); + csel(e, k->kept[l->end_kept].reg, X1, X10, LO); + k->fresh |= UINT64_C(1) << l->at_kept | UINT64_C(1) << l->end_kept; + } + refresh(k, kept_at(k, (int)li)); + b(e, body); + bind(e, skip); + k->fresh = fresh; + refresh(k, kept_at(k, l->parent)); + b(e, l->after); + k->fresh = fresh; +} + /* EACH or LOOP at pc: opened by its step (its block next, or none: past it), - * what its block keeps read. */ + * what its block keeps read; a packed list's slice in code (open_slice). */ static void loop_open(Block *k, uint32_t pc, unsigned height) { Emit *e = k->e; const PureOp *op = &k->m->code[pc]; LoopAt *l = &k->loops[k->opens[pc - k->block.start]]; + unflag_below(k, height); + if (op->op == PURE_OP_EACH && op->arg & PURE_EACH_SLICED && !event_list(k->m, l->list)) { + int slow = new_label(e); + spill_all(k, height - 2); + Value saved[2] = {k->vs[height - 2], k->vs[height - 1]}; + open_slice(k, pc, height, l, slow); + bind(e, slow); + k->vs[height - 2] = saved[0], k->vs[height - 1] = saved[1]; + } spill_all(k, height); - write_back(k); + write_back(k, k->loop_of[pc - k->block.start]); set_sp(k, height); mov_reg(e, X0, X19); mov_w(e, X1, pc); call(e, op->op == PURE_OP_EACH ? (uintptr_t)pure_run_each : (uintptr_t)pure_run_loop); k->fresh = 0; - for (unsigned h = 0; h <= PURE_MODULE_STACK; ++h) k->vs[h] = (Value){V_MEM, 0, 0, false, false, -1, 0}; + for (unsigned h = 0; h <= PURE_MODULE_STACK; ++h) k->vs[h] = MEMORY; int open = new_label(e); cbz_w(e, X0, open); cmp_w_imm(e, X0, STEP_SKIP); @@ -1181,6 +1497,10 @@ static void loop_open(Block *k, uint32_t pc, unsigned height) { b(e, l->after); k->fresh = 0; bind(e, open); + if (l->start < l->end) { /* what its block keeps, read: then its block, as the code above goes there too */ + refresh(k, kept_at(k, k->opens[pc - k->block.start])); + b(e, k->op_label[l->start - k->block.start]); + } } /* A loop's block ran once (iterate, module.c, as code): again (its block's @@ -1289,7 +1609,6 @@ static void loop_ends(Block *k, uint32_t pc) { join(k, l->base, pick); bind(e, l->again); iteration(k, l, (unsigned)pick); - k->fresh &= ~kept_at(k, pick); /* its registers another loop's from here */ join(k, l->base, l->parent); bind(e, l->after); } @@ -1332,71 +1651,79 @@ static bool arena_kept(const PureOp *op) { } } -/* What each loop keeps: its state, then what its own instructions read of the lists, while registers last. */ +/* What each nest of loops keeps, each in a register of its own: every + * loop's state first, then what the instructions read of the lists, the + * innermost loops' first, while registers last. A value is the nest's: + * every loop in it finds it. */ static void plan_kept(Block *k) { const PureModule *m = k->m; - for (unsigned li = 0; li < k->loop_count; ++li) { - LoopAt *l = &k->loops[li]; - l->kept = 0, l->at_kept = l->end_kept = l->k_kept = l->n_kept = -1; - unsigned used = 0; -#define KEEP(kind_, list_, field_) \ + unsigned *used = calloc(k->loop_count + 1, sizeof(*used)); + if (!used) { + k->e->failed = true; + return; + } +#define KEEP(nest_, kind_, list_, field_) \ do { \ - if (kept_find(k, (int)li, kind_, list_, field_) >= 0 || k->kept_count == KEPT_MOST || \ - used == sizeof(kept_registers)) break; \ - k->kept[k->kept_count] = (Kept){kind_, (uint8_t)(field_), (uint16_t)(list_), kept_registers[used++], (int)li}; \ - l->kept |= UINT64_C(1) << k->kept_count++; \ + if (kept_find(k, nest_, kind_, list_, field_) >= 0 || k->kept_count == KEPT_MOST || \ + used[nest_] == sizeof(kept_registers)) break; \ + k->kept[k->kept_count++] = (Kept){kind_, (uint8_t)(field_), (uint16_t)(list_), kept_registers[used[nest_]++], nest_}; \ } while (0) - if (l->walk && l->fast) { - KEEP(C_AT, li, 0); - l->at_kept = kept_find(k, (int)li, C_AT, li, 0); - KEEP(C_END, li, 0); - l->end_kept = kept_find(k, (int)li, C_END, li, 0); - } else if (!l->walk) { - KEEP(C_K, li, 0); - l->k_kept = kept_find(k, (int)li, C_K, li, 0); - KEEP(C_N, li, 0); - l->n_kept = kept_find(k, (int)li, C_N, li, 0); - } - if (!l->walk && (l->k_kept < 0 || l->n_kept < 0)) { /* a count's round needs its registers: no code then */ - k->e->failed = true; - return; - } - if (l->walk && l->fast && (l->at_kept < 0 || l->end_kept < 0)) l->fast = false; /* no room: as the executor runs it */ - for (uint32_t pc = l->start; pc < l->end; ++pc) { - if (k->loop_of[pc - k->block.start] != (int)li) continue; - const PureOp *op = &m->code[pc]; - switch (op->op) { - case PURE_OP_ROW: { /* the walk around it, kept here when another loop is between */ - int walk = -1; - for (int w = (int)li; w >= 0 && walk < 0; w = k->loops[w].parent) - if (k->loops[w].walk) walk = w; - if (walk >= 0 && walk != (int)li && k->loops[walk].fast) KEEP(C_AT, (unsigned)walk, 0); - break; - } - case PURE_OP_ITEM_GET: - if (op->plan & PLAN_TEXT) break; - KEEP(C_COLUMN, list_of(op->arg), item_field(op->arg)); - if (!(l->writes >> (list_of(op->arg) & 31) & 1)) KEEP(C_COUNT, list_of(op->arg), 0); - break; - case PURE_OP_LIST_COUNT: - if (!(l->writes >> (op->arg & 31) & 1)) KEEP(C_COUNT, op->arg, 0); - break; - case PURE_OP_LIST_HAS: - if (op->plan & PLAN_TEXT) break; - KEEP(C_BITS, op->arg, 0); - KEEP(C_LIMIT, op->arg, 0); - break; - case PURE_OP_LIST_FIND: - if (!(op->plan & PLAN_JOINED) || op->plan & PLAN_TEXT || m->code[pc + 1].plan & PLAN_TEXT) break; - KEEP(C_DENSE, op->arg, item_field(m->code[pc + 1].arg)); - KEEP(C_BITS, op->arg, 0); - KEEP(C_LIMIT, op->arg, 0); - break; - default: break; + for (unsigned pass = 0; pass < 2; ++pass) + for (unsigned depth = PURE_MODULE_NESTING; depth > 0; --depth) + for (unsigned li = 0; li < k->loop_count; ++li) { + LoopAt *l = &k->loops[li]; + if (l->depth != depth) continue; + int nest = l->nest; + if (!pass) { + if (l->walk && l->fast) { + KEEP(nest, C_AT, li, 0); + KEEP(nest, C_END, li, 0); + l->at_kept = kept_find(k, nest, C_AT, li, 0), l->end_kept = kept_find(k, nest, C_END, li, 0); + if (l->at_kept < 0 || l->end_kept < 0) l->fast = false; /* no room: as the executor runs it */ + } else if (!l->walk) { + KEEP(nest, C_K, li, 0); + KEEP(nest, C_N, li, 0); + l->k_kept = kept_find(k, nest, C_K, li, 0), l->n_kept = kept_find(k, nest, C_N, li, 0); + if (l->k_kept < 0 || l->n_kept < 0) k->e->failed = true; /* a count's round needs its registers: no code then */ + } + continue; + } + for (uint32_t pc = l->start; pc < l->end; ++pc) { + if (k->loop_of[pc - k->block.start] != (int)li) continue; + const PureOp *op = &m->code[pc]; + switch (op->op) { + case PURE_OP_ITEM_GET: { + if (op->plan & PLAN_TEXT) break; + uint32_t list = list_of(op->arg); + KEEP(nest, C_COLUMN, list, item_field(op->arg)); + bool walked = false; /* a fast walk's list read at its place needs no count */ + for (int w = (int)li; w >= 0; w = k->loops[w].parent) + walked = walked || (k->loops[w].walk && k->loops[w].fast && k->loops[w].list == list); + if (!walked && !(k->loops[nest].writes >> (list & 31) & 1)) KEEP(nest, C_COUNT, list, 0); + break; + } + case PURE_OP_LIST_COUNT: + if (!(k->loops[nest].writes >> (op->arg & 31) & 1)) KEEP(nest, C_COUNT, op->arg, 0); + break; + case PURE_OP_LIST_HAS: + if (op->plan & PLAN_TEXT) break; + KEEP(nest, C_BITS, op->arg, 0); + KEEP(nest, C_LIMIT, op->arg, 0); + break; + case PURE_OP_LIST_FIND: + if (!(op->plan & PLAN_JOINED) || op->plan & PLAN_TEXT || m->code[pc + 1].plan & PLAN_TEXT) break; + KEEP(nest, C_DENSE, op->arg, item_field(m->code[pc + 1].arg)); + KEEP(nest, C_BITS, op->arg, 0); + KEEP(nest, C_LIMIT, op->arg, 0); + break; + default: break; + } + } } - } #undef KEEP - } + for (unsigned c = 0; c < k->kept_count; ++c) k->loops[k->kept[c].loop].region |= UINT64_C(1) << c; + for (unsigned li = 0; li < k->loop_count; ++li) k->loops[li].region = k->loops[k->loops[li].nest].region; + free(used); } /* The block's heights (absolute: a loop's block is verified from its own start), its loops, and each instruction's. */ @@ -1430,6 +1757,8 @@ static bool shape_block(Block *k) { l->start = pc + 1, l->end = pc + 1 + (op->arg >> 16), l->parent = depth ? open[depth - 1] : -1; l->again = new_label(k->e), l->after = new_label(k->e), l->depth = depth + 1, l->at = pc; l->walk = op->op == PURE_OP_EACH, l->list = op->arg >> 8 & 0xFF, l->base = at - pops; + l->nest = depth ? k->loops[open[0]].nest : (int)k->loop_count; + l->at_kept = l->end_kept = l->k_kept = l->n_kept = -1; if (l->start < l->end) k->target[l->start - k->block.start] = true; /* its block begins: what it keeps read */ k->opens[pc - k->block.start] = (int)k->loop_count; open[depth] = (int)k->loop_count++; @@ -1461,7 +1790,7 @@ static bool compile_block(const PureModule *m, PureBlock block, unsigned end_hei Block *k = calloc(1, sizeof(*k)); if (!k) return false; k->m = m, k->block = block, k->e = e; - for (unsigned h = 0; h <= PURE_MODULE_STACK; ++h) k->vs[h] = (Value){V_MEM, 0, 0, false, false, -1, 0}; + for (unsigned h = 0; h <= PURE_MODULE_STACK; ++h) k->vs[h] = MEMORY; bool ok = shape_block(k); if (ok) { *entry = e->count; @@ -1509,6 +1838,7 @@ static bool compile_block(const PureModule *m, PureBlock block, unsigned end_hei put(e, 0xD65F03C0); /* RET */ fault_stubs(k); slow_stubs(k); + wide_stubs(k); } ok = ok && !e->failed; free(k->height); @@ -1519,6 +1849,7 @@ static bool compile_block(const PureModule *m, PureBlock block, unsigned end_hei free(k->target); free(k->faults); free(k->slows); + free(k->wides); free(k); return ok; } diff --git a/core/module-list.c b/core/module-list.c index 180132b..7a1e08b 100644 --- a/core/module-list.c +++ b/core/module-list.c @@ -93,6 +93,7 @@ struct PureList { bool arrays; /* it may be FLAT or DENSE: an event's list */ uint8_t flattened; /* DENSE made FLAT since it was cleared: twice, and it stays FLAT or a tree */ void *columns[16]; /* each field's cells */ + uint8_t width[16]; /* the bytes of a cell in each: array_width */ size_t room; /* the rows the columns hold: FLAT items, DENSE keys */ size_t moved; /* FLAT: items moved by changes inside it since it was cleared */ /* A stored list keyed by a number and searched by key often at one @@ -779,10 +780,16 @@ enum { ARRAYS_KEPT = 1 << 22, ARRAYS_LARGE = 1 << 26, DENSE_SLACK = 1 << 21, FLA typedef struct Pack { unsigned refs; /* the list and its copies */ void *columns[16]; + uint8_t bytes[16]; /* their cells' (each as a list's width) */ double low, high; /* the first key and the last */ double origin, width, scale; /* the first bucket's start, a bucket's width, 1 / width */ size_t buckets; /* 0: none (searched by halves) */ uint32_t *first; /* by bucket, and the end past the last */ + /* Keys all whole numbers below 2^53 in size and buckets 2^shift wide + * (shift 0 or more): the same in integers, for compiled code too. */ + bool whole; + uint32_t shift; + int64_t origin_whole, low_whole, high_whole; } Pack; /* Searched by key at least an eighth of its items' times at one version, a @@ -831,6 +838,11 @@ static bool pack_index(Pack *pack, const double *keys, size_t n, unsigned aligne if (buckets <= (double)n) break; } pack->origin = origin, pack->width = width, pack->scale = 1 / width, pack->buckets = (size_t)buckets; + pack->whole = exponent >= 0 && fabs(low) < 0x1p53 && fabs(high) < 0x1p53; + for (size_t i = 0; pack->whole && i < n; ++i) pack->whole = keys[i] == floor(keys[i]); + if (pack->whole) + pack->shift = (uint32_t)exponent, pack->origin_whole = (int64_t)origin, pack->low_whole = (int64_t)low, + pack->high_whole = (int64_t)high; if (!(pack->first = malloc((pack->buckets + 1) * sizeof(*pack->first)))) return false; size_t filled = 0; for (size_t i = 0; i < n; ++i) { @@ -847,6 +859,16 @@ static size_t pack_seek(const PureList *list, double key) { const Pack *pack = list->pack; const double *keys = list->columns[list->layout.key]; if (!pack->buckets) return lower(keys, (unsigned)list->count, key); + if (pack->whole && fabs(key) < 0x1p53 && key == floor(key)) { /* in integers: the bucket a shift */ + int64_t whole = (int64_t)key; + if (whole <= pack->low_whole) return 0; + if (whole > pack->high_whole) return list->count; + uint64_t from = (uint64_t)(whole - pack->origin_whole), b = from >> pack->shift; + size_t at = pack->first[b]; + if (b << pack->shift == from) return at; + for (size_t end = pack->first[b + 1]; at < end && keys[at] < key;) ++at; + return at; + } if (!(key > pack->low)) return 0; if (key > pack->high) return list->count; double start; @@ -870,45 +892,77 @@ static void searched_by(const PureList *list, double key) { static size_t width(const Layout *l, unsigned f) { return pure_cell_text(l->kinds[f]) ? sizeof(PureSpan) : 8; } -static size_t row_width(const Layout *l) { - size_t row = 0; - for (unsigned f = 0; f < l->fields; ++f) row += width(l, f); - return row ? row : 1; +/* In arrays a field's cells are as narrow as their values let them be + * (docs/design/022): a number's or a bool's 1 byte while every one is a + * whole number from 0 below 2^8, 4 below 2^32 (never -0), else 8; a text's + * span; an i64's 8; a FLAT list's key 8 (searched as numbers); a DENSE + * list's key none (a cell's key is its slot). A value that does not fit + * makes its column wider first, once for each width. Widths change with + * the values, never what a cell reads. */ +static bool narrows(uint8_t kind) { return kind == PURE_CELL_NUMBER || kind == PURE_CELL_BOOL; } + +static uint8_t width_of(double v) { + if (!(v >= 0 && v == floor(v)) || (v == 0 && signbit(v))) return 8; + return v < 256 ? 1 : v < 4294967296.0 ? 4 : 8; } -static PureCell array_cell(const PureList *list, size_t i, unsigned f) { +static PureCell cell_in(const void *column, uint8_t bytes, size_t i) { PureCell cell = {0}; - if (!pure_cell_text(list->layout.kinds[f])) memcpy(&cell.i64, (const char *)list->columns[f] + 8 * i, 8); - else { - PureSpan text = ((const PureSpan *)list->columns[f])[i]; + switch (bytes) { + case 0: cell.num = (double)i; break; + case 1: cell.num = ((const uint8_t *)column)[i]; break; + case 4: cell.num = ((const uint32_t *)column)[i]; break; + case 8: memcpy(&cell.i64, (const char *)column + 8 * i, 8); break; + default: { + PureSpan text = ((const PureSpan *)column)[i]; cell.text = (unsigned char *)text.data, cell.size = text.size; } + } return cell; } -static void array_put(PureList *list, size_t i, unsigned f, PureCell cell) { - if (pure_cell_text(list->layout.kinds[f])) ((PureSpan *)list->columns[f])[i] = (PureSpan){cell.text, cell.size}; - else memcpy((char *)list->columns[f] + 8 * i, &cell.i64, 8); +/* A cell into a column of cells of bytes each (one it fits). */ +static void cell_out(void *column, uint8_t bytes, size_t i, PureCell cell) { + switch (bytes) { + case 0: break; + case 1: ((uint8_t *)column)[i] = (uint8_t)cell.num; break; + case 4: ((uint32_t *)column)[i] = (uint32_t)cell.num; break; + case 8: memcpy((char *)column + 8 * i, &cell.i64, 8); break; + default: ((PureSpan *)column)[i] = (PureSpan){cell.text, cell.size}; + } } -/* Row from's cells to row to, of the same columns or of others. */ -static void array_copy(const Layout *l, void *const *to_columns, size_t to, void *const *from_columns, size_t from) { +/* The widths a list's arrays start with: narrow fields at 1. */ +static void widths_start(PureList *list) { + const Layout *l = &list->layout; for (unsigned f = 0; f < l->fields; ++f) - memcpy((char *)to_columns[f] + to * width(l, f), (const char *)from_columns[f] + from * width(l, f), width(l, f)); + list->width[f] = (uint8_t)((int)f == l->key || !narrows(l->kinds[f]) ? width(l, f) : 1); +} + +static size_t row_width(const Layout *l) { + size_t row = 0; + for (unsigned f = 0; f < l->fields; ++f) row += width(l, f); + return row ? row : 1; } +static PureCell array_cell(const PureList *list, size_t i, unsigned f) { return cell_in(list->columns[f], list->width[f], i); } + +static void array_put(PureList *list, size_t i, unsigned f, PureCell cell) { cell_out(list->columns[f], list->width[f], i, cell); } + static void array_move(PureList *list, size_t to, size_t from, size_t count) { const Layout *l = &list->layout; for (unsigned f = 0; f < l->fields; ++f) - memmove((char *)list->columns[f] + to * width(l, f), (const char *)list->columns[f] + from * width(l, f), - count * width(l, f)); + if (list->width[f]) + memmove((char *)list->columns[f] + to * list->width[f], (const char *)list->columns[f] + from * list->width[f], + count * list->width[f]); } /* Columns of room rows each; false without memory (each as it was or grown). */ static bool arrays_room(PureList *list, size_t room) { const Layout *l = &list->layout; for (unsigned f = 0; f < l->fields; ++f) { - void *grown = realloc(list->columns[f], room * width(l, f)); + if (!list->width[f]) continue; + void *grown = realloc(list->columns[f], (room ? room : 1) * list->width[f]); if (!grown) return false; list->columns[f] = grown; } @@ -916,6 +970,29 @@ static bool arrays_room(PureList *list, size_t room) { return true; } +/* Field f's column bytes wide (wider): false without memory (as it was). */ +static bool widen(PureList *list, unsigned f, uint8_t bytes) { + size_t rows = list->form == DENSE ? list->room : list->count; + void *made = malloc((list->room ? list->room : 1) * bytes); + if (!made) return false; + for (size_t i = 0; i < rows; ++i) cell_out(made, bytes, i, array_cell(list, i, f)); + free(list->columns[f]); + list->columns[f] = made; + list->width[f] = bytes; + return true; +} + +/* Every column wide enough for an item's cells; false without memory. */ +static bool arrays_fit(PureList *list, const PureCell *cells) { + for (unsigned f = 0; f < list->layout.fields; ++f) { + uint8_t now = list->width[f]; + if ((now != 1 && now != 4) || !narrows(list->layout.kinds[f])) continue; + uint8_t need = width_of(cells[f].num); + if (need > now && !widen(list, f, need)) return false; + } + return true; +} + static void arrays_free(PureList *list) { if (list->pack) { /* a packed list's are its pack's */ pack_release(list->pack); @@ -963,7 +1040,9 @@ static bool flat_large(const PureList *list) { return list->count == list->room && 2 * list->room * row_width(&list->layout) > ARRAYS_LARGE; } -static bool dense_holds(const PureList *list, double key) { return small_key(key) && (size_t)key < dense_limit(list); } +static bool dense_holds(const PureList *list, double key) { + return small_key(key) && !(key == 0 && signbit(key)) && (size_t)key < dense_limit(list); /* -0 keeps its column */ +} /* A FLAT list keyed by small whole numbers (its keys as bits) as DENSE, * room for key too; false when it cannot be (it stays FLAT). */ @@ -980,15 +1059,22 @@ static bool make_dense(PureList *list, double key) { size_t room = top + 1 + (top + 1) / 2, limit = dense_limit(list); if (room > limit) room = limit; if (room <= top) return false; + for (size_t i = 0; i < list->count; ++i) + if (keys[i] == 0 && signbit(keys[i])) return false; /* -0 keeps its column */ void *columns[16] = {0}; + uint8_t widths[16]; + memcpy(widths, list->width, sizeof(widths)); + widths[l->key] = 0; /* a DENSE list's keys are its slots */ for (unsigned f = 0; f < l->fields; ++f) - if (!(columns[f] = malloc(room * width(l, f)))) { + if (widths[f] && !(columns[f] = malloc(room * widths[f]))) { for (unsigned g = 0; g < f; ++g) free(columns[g]); return false; } - for (size_t i = 0; i < list->count; ++i) array_copy(l, columns, (size_t)keys[i], list->columns, i); + for (size_t i = 0; i < list->count; ++i) + for (unsigned f = 0; f < l->fields; ++f) cell_out(columns[f], widths[f], (size_t)keys[i], array_cell(list, i, f)); arrays_free(list); memcpy(list->columns, columns, sizeof(columns)); + memcpy(list->width, widths, sizeof(widths)); list->room = room; list->form = DENSE; return true; @@ -999,16 +1085,21 @@ static bool make_flat(PureList *list) { const Layout *l = &list->layout; size_t room = list->count > 16 ? list->count : 16, row = 0; void *columns[16] = {0}; + uint8_t widths[16]; + memcpy(widths, list->width, sizeof(widths)); + widths[l->key] = 8; /* its keys a column again, searched as numbers */ for (unsigned f = 0; f < l->fields; ++f) - if (!(columns[f] = malloc(room * width(l, f)))) { + if (!(columns[f] = malloc(room * widths[f]))) { for (unsigned g = 0; g < f; ++g) free(columns[g]); return false; } for (size_t w = 0; w < list->member_capacity; ++w) - for (uint64_t word = list->members[w]; word; word &= word - 1) - array_copy(l, columns, row++, list->columns, w * 64 + (size_t)__builtin_ctzll(word)); + for (uint64_t word = list->members[w]; word; word &= word - 1, ++row) + for (unsigned f = 0; f < l->fields; ++f) + cell_out(columns[f], widths[f], row, array_cell(list, w * 64 + (size_t)__builtin_ctzll(word), f)); arrays_free(list); memcpy(list->columns, columns, sizeof(columns)); + memcpy(list->width, widths, sizeof(widths)); list->room = room; list->form = FLAT; list->moved = 0; @@ -1042,7 +1133,10 @@ static bool build_tree(PureList *list, Node **root) { } unsigned items = (unsigned)(n - i * FANOUT < FANOUT ? n - i * FANOUT : FANOUT); for (unsigned f = 0; f < l->fields; ++f) - memcpy((char *)leaf + l->column[f], (const char *)list->columns[f] + i * FANOUT * width(l, f), items * width(l, f)); + if (list->width[f] == width(l, f)) + memcpy((char *)leaf + l->column[f], (const char *)list->columns[f] + i * FANOUT * width(l, f), items * width(l, f)); + else + for (unsigned j = 0; j < items; ++j) numbers(l, leaf, f)[j] = array_cell(list, i * FANOUT + j, f).num; leaf->count = items; sum(list, leaf); level[i] = leaf; @@ -1087,13 +1181,31 @@ static bool make_tree(PureList *list) { static bool visit_leaves(const Node *node, bool (*visit)(void *, const Node *), void *context); -typedef struct { const Layout *layout; void *const *columns; size_t at; } Packing; +typedef struct { const Layout *layout; Pack *pack; size_t at; } Packing; -static bool pack_leaf(void *context, const Node *leaf) { +/* The widths a pack's columns need: each narrow field's widest value. */ +static bool pack_widths(void *context, const Node *leaf) { Packing *p = context; const Layout *l = p->layout; for (unsigned f = 0; f < l->fields; ++f) - memcpy((char *)p->columns[f] + p->at * width(l, f), (const char *)leaf + l->column[f], leaf->count * width(l, f)); + if ((int)f != l->key && narrows(l->kinds[f])) + for (unsigned i = 0; i < leaf->count && p->pack->bytes[f] < 8; ++i) { + uint8_t need = width_of(numbers(l, leaf, f)[i]); + if (need > p->pack->bytes[f]) p->pack->bytes[f] = need; + } + return true; +} + +static bool pack_leaf(void *context, const Node *leaf) { + Packing *p = context; + const Layout *l = p->layout; + for (unsigned f = 0; f < l->fields; ++f) { + uint8_t bytes = p->pack->bytes[f]; + if (bytes == width(l, f)) + memcpy((char *)p->pack->columns[f] + p->at * bytes, (const char *)leaf + l->column[f], leaf->count * bytes); + else + for (unsigned i = 0; i < leaf->count; ++i) cell_out(p->pack->columns[f], bytes, p->at + i, cell_at(l, leaf, i, f)); + } p->at += leaf->count; return true; } @@ -1107,9 +1219,14 @@ static bool pack(PureList *list) { size_t n = list->count; Pack *made = calloc(1, sizeof(*made)); bool ok = made != NULL; - for (unsigned f = 0; ok && f < l->fields; ++f) ok = (made->columns[f] = malloc(n * width(l, f))) != NULL; if (ok) { - Packing packing = {l, made->columns, 0}; + for (unsigned f = 0; f < l->fields; ++f) made->bytes[f] = (uint8_t)((int)f == l->key || !narrows(l->kinds[f]) ? width(l, f) : 1); + Packing widths = {l, made, 0}; + visit_leaves(list->root, pack_widths, &widths); + } + for (unsigned f = 0; ok && f < l->fields; ++f) ok = (made->columns[f] = malloc(n * made->bytes[f])) != NULL; + if (ok) { + Packing packing = {l, made, 0}; visit_leaves(list->root, pack_leaf, &packing); ok = l->key < 0 || pack_index(made, made->columns[l->key], n, list->aligned); } @@ -1123,6 +1240,7 @@ static bool pack(PureList *list) { list->root = NULL; list->pack = made; memcpy(list->columns, made->columns, sizeof(list->columns)); + memcpy(list->width, made->bytes, sizeof(list->width)); list->room = n; list->form = FLAT; list->moved = 0; @@ -1227,7 +1345,9 @@ PureResult pure_list_keyed(PureList *list, int field) { int key = field >= 0 && (unsigned)field < l->fields && l->kinds[field] == PURE_CELL_NUMBER ? field : -1; if (key == l->key) return PURE_OK; if (list->count && !make_tree(list)) return PURE_ALLOCATION; + if (list->arrays) arrays_free(list); /* its columns as wide as the new key wants */ l->key = key; + if (list->arrays) widths_start(list); if (list->root && !rekey(list, &list->root)) { l->key = -1; /* searched without leads, which some nodes lack */ return PURE_ALLOCATION; @@ -1293,11 +1413,14 @@ void pure_list_clear(PureList *list) { list->count = list->bytes = 0; ++list->version; } - if (list->arrays) { /* FLAT again, its arrays kept for the next event unless large */ + if (list->arrays) { /* FLAT again, its arrays kept for the next event unless large or not FLAT's (a DENSE list's has no key column) */ + if (list->form != FLAT || list->room * row_width(&list->layout) > ARRAYS_KEPT) { + arrays_free(list); + widths_start(list); + } list->form = FLAT; list->flattened = 0; list->moved = 0; - if (list->room * row_width(&list->layout) > ARRAYS_KEPT) arrays_free(list); } if (!had) return; if (!list->members) return; @@ -1343,6 +1466,7 @@ bool pure_list_arrays(PureList *list) { if (list->form != TREE || list->copy || list->journaled || list->count) return false; list->arrays = true; list->form = FLAT; + widths_start(list); return true; } @@ -1362,7 +1486,13 @@ const size_t pure_list_layout[] = { [LIST_MEMBER_CAPACITY_AT] = offsetof(PureList, member_capacity), [LIST_BITMAP_AT] = offsetof(PureList, bitmap), [LIST_FORM_AT] = offsetof(PureList, form), [LIST_COLUMNS_AT] = offsetof(PureList, columns), [LIST_VERSION_AT] = offsetof(PureList, version), [LIST_ROOM_AT] = offsetof(PureList, room), - [LIST_MEMBER_COUNT_AT] = offsetof(PureList, member_count), [LIST_BYTES_AT] = offsetof(PureList, bytes)}; + [LIST_MEMBER_COUNT_AT] = offsetof(PureList, member_count), [LIST_BYTES_AT] = offsetof(PureList, bytes), + [LIST_PACK_AT] = offsetof(PureList, pack), [LIST_WIDTH_AT] = offsetof(PureList, width)}; + +const size_t pure_pack_layout[] = { + [PACK_FIRST_AT] = offsetof(Pack, first), [PACK_WHOLE_AT] = offsetof(Pack, whole), [PACK_SHIFT_AT] = offsetof(Pack, shift), + [PACK_ORIGIN_AT] = offsetof(Pack, origin_whole), [PACK_LOW_AT] = offsetof(Pack, low_whole), + [PACK_HIGH_AT] = offsetof(Pack, high_whole)}; bool pure_list_lookup(const PureList *list, unsigned key_field, PureCell key, unsigned field, PureCell *cell) { bool found; @@ -1389,6 +1519,7 @@ PureList *pure_list_share(PureList *list, PureRetired *retired, uint64_t epoch) __atomic_add_fetch(&list->pack->refs, 1, __ATOMIC_RELAXED); copy->pack = list->pack, copy->form = FLAT, copy->room = list->count; memcpy(copy->columns, list->columns, sizeof(copy->columns)); + memcpy(copy->width, list->width, sizeof(copy->width)); } list->retired = retired; list->shares = epoch > list->shares ? epoch : list->shares + 1; @@ -1760,7 +1891,7 @@ PureResult pure_list_insert(PureList *list, size_t at, const PureCell *cells, Pu for (; owned < l->fields; ++owned) if (!own_cell(list, owned, cells[owned], &item[owned])) break; if (list->form == FLAT) { - if (owned < l->fields || !flat_insert(list, at, item)) { + if (owned < l->fields || !arrays_fit(list, cells) || !flat_insert(list, at, item)) { for (unsigned f = 0; f < owned; ++f) free_text(item[f].text); return PURE_ALLOCATION; } @@ -1805,7 +1936,7 @@ PureResult pure_list_add(PureList *list, const PureCell *cells, PureUndo *undo, unsigned owned = 0; for (; owned < l->fields; ++owned) if (!own_cell(list, owned, cells[owned], &item[owned])) break; - if (owned < l->fields || !dense_add(list, item, key)) { + if (owned < l->fields || !arrays_fit(list, cells) || !dense_add(list, item, key)) { for (unsigned f = 0; f < owned; ++f) free_text(item[f].text); return PURE_ALLOCATION; } @@ -1931,6 +2062,8 @@ PureResult pure_list_set(PureList *list, size_t at, unsigned field, PureCell val if (!logged(list, undo) || !positioned(list)) return PURE_ALLOCATION; if (list->form == FLAT) { PureCell copy, old = array_cell(list, at, field); + uint8_t need = narrows(l->kinds[field]) && (list->width[field] == 1 || list->width[field] == 4) ? width_of(value.num) : 0; + if (need > list->width[field] && !widen(list, field, need)) return PURE_ALLOCATION; if (!own_cell(list, field, value, ©)) return PURE_ALLOCATION; list->bytes += cell_bytes(l, field, copy) - cell_bytes(l, field, old); array_put(list, at, field, copy); @@ -2011,7 +2144,11 @@ static void open_array_run(const PureList *list, size_t at, PureRun *run) { for (unsigned f = 0; f < l->fields; ++f) if (pure_cell_text(l->kinds[f])) run->column[f].texts = (const PureSpan *)list->columns[f] + row; else if (l->kinds[f] == PURE_CELL_INTEGER) run->column[f].integers = (const int64_t *)list->columns[f] + row; - else run->column[f].numbers = (const double *)list->columns[f] + row; + else if (list->width[f] == 8) run->column[f].numbers = (const double *)list->columns[f] + row; + else { /* narrow cells as numbers */ + for (unsigned i = 0; i < run->count; ++i) run->cells[f][i] = array_cell(list, row + i, f).num; + run->column[f].numbers = run->cells[f]; + } } bool pure_list_run(const PureList *list, size_t at, PureRun *run) { diff --git a/core/module-list.h b/core/module-list.h index 0d4d7dc..60bce95 100644 --- a/core/module-list.h +++ b/core/module-list.h @@ -44,6 +44,7 @@ typedef struct { uint8_t taken[16]; unsigned depth; bool pathless; + double cells[16][32]; /* an array's narrow cells as numbers (docs/design/022) */ } PureRun; /* A list holds up to PURE_LIST_ITEMS items, a run up to PURE_LIST_RUN. */ diff --git a/core/module-run.h b/core/module-run.h index 4931cfe..c0d6c41 100644 --- a/core/module-run.h +++ b/core/module-run.h @@ -97,12 +97,20 @@ int pure_run_item(Frame *, uint32_t pc); /* Where a list keeps what compiled code reads of it (module-list.c owns the * layout and says where): its item count, its key set (the words, how many, * whether they are bits), its form (pure_list_form), its arrays and the rows - * they hold, its version, how many keys its set holds and its stored bytes. */ + * they hold, its version, how many keys its set holds, its stored bytes, + * its pack (a packed list's, else NULL) and its columns' cell widths (u8 + * each: 0 a DENSE list's key, 1, 4 or 8 a number's, more a text's). */ enum { LIST_COUNT_AT, LIST_MEMBERS_AT, LIST_MEMBER_CAPACITY_AT, LIST_BITMAP_AT, LIST_FORM_AT, LIST_COLUMNS_AT, LIST_VERSION_AT, - LIST_ROOM_AT, LIST_MEMBER_COUNT_AT, LIST_BYTES_AT + LIST_ROOM_AT, LIST_MEMBER_COUNT_AT, LIST_BYTES_AT, LIST_PACK_AT, LIST_WIDTH_AT }; extern const size_t pure_list_layout[]; +/* A packed list's index (docs/design/022), where its keys are whole: the + * first position of each bucket (u32), whether the keys are whole, the + * buckets' width as a shift, the first bucket's start, the first key and + * the last (i64). */ +enum { PACK_FIRST_AT, PACK_WHOLE_AT, PACK_SHIFT_AT, PACK_ORIGIN_AT, PACK_LOW_AT, PACK_HIGH_AT }; +extern const size_t pure_pack_layout[]; /* A module's code compiled (AArch64 Linux; elsewhere, or with PURE_JIT=0 in * the environment, none): a block's code runs a frame as run does, giving how diff --git a/core/test-module.c b/core/test-module.c index 2ccdabb..f6283fe 100644 --- a/core/test-module.c +++ b/core/test-module.c @@ -1387,17 +1387,29 @@ static void same_list(const PureList *a, const PureList *t) { CHECK(pure_list_count(a) == pure_list_count(t) && pure_list_size(a) == pure_list_size(t)); size_t n = pure_list_count(t); for (size_t i = 0; i < n; i += 1 + i / 64) { - PureCell x = pure_list_get(a, i, 0), y = pure_list_get(t, i, 0), u = pure_list_get(a, i, 1), v = pure_list_get(t, i, 1); - CHECK(x.i64 == y.i64 && u.size == v.size && (!u.size || !memcmp(u.text, v.text, u.size))); + PureCell x = pure_list_get(a, i, 0), y = pure_list_get(t, i, 0), u = pure_list_get(a, i, 1), v = pure_list_get(t, i, 1), + w = pure_list_get(a, i, 2), z = pure_list_get(t, i, 2); + CHECK(x.i64 == y.i64 && u.size == v.size && (!u.size || !memcmp(u.text, v.text, u.size)) && w.i64 == z.i64); + } +} + +/* A third field's number: in some events small, in some large, in some + * anything (fractions, -0, below 0), so its column narrows and widens + * (docs/design/022). */ +static double some_number(unsigned event, uint32_t r) { + switch (event % 4) { + case 0: case 3: return (double)(r % 250); + case 1: return (double)(r % 4000000000u); + default: return r % 5 == 0 ? -0.0 : r % 5 == 1 ? -(double)(r % 77) : r % 5 == 2 ? (double)(r % 1000) / 8 : (double)(r % 300); } } static void arrays_equivalence(void) { - static const uint8_t fields[2] = {PURE_CELL_NUMBER, PURE_CELL_TEXT}; + static const uint8_t fields[3] = {PURE_CELL_NUMBER, PURE_CELL_TEXT, PURE_CELL_NUMBER}; uint32_t seed = 0x61727261u; size_t forms[3] = {0}, conversions = 0, steps = 0; for (unsigned keyed = 0; keyed < 2; ++keyed) { - PureList *a = pure_list_new(2, fields), *t = pure_list_new(2, fields); + PureList *a = pure_list_new(3, fields), *t = pure_list_new(3, fields); CHECK(a && t); if (keyed) { CHECK(pure_list_keyed(a, 0) == PURE_OK && pure_list_keyed(t, 0) == PURE_OK); @@ -1416,7 +1428,8 @@ static void arrays_equivalence(void) { : (double)(r % 80000) / 4; char text[16]; size_t size = (size_t)snprintf(text, sizeof(text), "t%u", r % 1000); - PureCell cells[2] = {{.num = key}, {.text = (unsigned char *)text, .size = r % 11 ? size : 0}}; + PureCell cells[3] = {{.num = key}, {.text = (unsigned char *)text, .size = r % 11 ? size : 0}, + {.num = some_number(event, r >> 7)}}; unsigned op = next_random(&seed) % 20; if (keyed && event % 3 == 1) op = op < 12 ? 1 + op % 8 : 13 + op % 2; /* by key alone, as a search does: DENSE stays */ if (keyed && op < 9) { /* add by key, where it went asked or not */ @@ -1434,6 +1447,9 @@ static void arrays_equivalence(void) { } else if (op < 12 && n) { /* a text changed; in a keyed list now and then its key, between its neighbours */ size_t at = next_random(&seed) % n; CHECK(pure_list_set(a, at, 1, cells[1], NULL) == PURE_OK && pure_list_set(t, at, 1, cells[1], NULL) == PURE_OK); + if (r % 2) /* the third field: wider now and then */ + CHECK(pure_list_set(a, at, 2, (PureCell){.num = some_number(event + r % 3, r >> 9)}, NULL) == PURE_OK && + pure_list_set(t, at, 2, (PureCell){.num = some_number(event + r % 3, r >> 9)}, NULL) == PURE_OK); if (keyed && at + 1 < n && r % 3 == 0) { double low = pure_list_get(t, at, 0).num, high = pure_list_get(t, at + 1, 0).num, to = low + (high - low) / 2; if (to > low && to < high) { @@ -1449,10 +1465,17 @@ static void arrays_equivalence(void) { fa = pure_list_lookup(a, 0, cells[0], 1, &ca); ft = pure_list_lookup(t, 0, cells[0], 1, &ct); CHECK(fa == ft && fa == ht && (!fa || (ca.size == ct.size && (!ca.size || !memcmp(ca.text, ct.text, ca.size))))); + fa = pure_list_lookup(a, 0, cells[0], 2, &ca); + ft = pure_list_lookup(t, 0, cells[0], 2, &ct); + CHECK(fa == ft && (!fa || ca.i64 == ct.i64)); + fa = pure_list_lookup(a, 0, cells[0], 0, &ca); /* the key itself: a DENSE list's slot */ + ft = pure_list_lookup(t, 0, cells[0], 0, &ct); + CHECK(fa == ft && (!fa || ca.i64 == ct.i64)); } else if (op < 17 && n) { /* by position */ size_t at = next_random(&seed) % n; - PureCell x = pure_list_get(a, at, 0), y = pure_list_get(t, at, 0); - CHECK(x.i64 == y.i64); + PureCell x = pure_list_get(a, at, 0), y = pure_list_get(t, at, 0), w = pure_list_get(a, at, 2), + z = pure_list_get(t, at, 2); + CHECK(x.i64 == y.i64 && w.i64 == z.i64); } else if (op < 18 && n) { /* run by run from somewhere */ size_t at = next_random(&seed) % n, seen = 0; PureRun ra, rt; @@ -1466,6 +1489,7 @@ static void arrays_equivalence(void) { break; } CHECK(ra.column[0].numbers[ia - ra.start] == rt.column[0].numbers[it - rt.start]); + CHECK(!memcmp(&ra.column[2].numbers[ia - ra.start], &rt.column[2].numbers[it - rt.start], sizeof(double))); PureSpan sa = ra.column[1].texts[ia - ra.start], st = rt.column[1].texts[it - rt.start]; CHECK(sa.size == st.size && (!sa.size || !memcmp(sa.data, st.data, sa.size))); ++ia, ++it; @@ -1486,16 +1510,16 @@ static void arrays_equivalence(void) { CHECK(forms[0] > 10000 && forms[1] > 10000 && forms[2] > 10000 && conversions > 100); /* A snapshot shares every list: an event's, empty between events, stays in arrays; one with items is a tree for its copy. */ { - PureList *list = pure_list_new(2, fields); + PureList *list = pure_list_new(3, fields); PureRetired retired = {0}; CHECK(list && pure_list_arrays(list)); PureList *copy = pure_list_share(list, &retired, 1); CHECK(copy && pure_list_count(copy) == 0 && pure_list_form(list) == 1); pure_list_free(copy); for (unsigned i = 0; i < 100; ++i) - CHECK(pure_list_insert(list, i, (PureCell[]){{.num = i}, {.size = 0}}, NULL) == PURE_OK); + CHECK(pure_list_insert(list, i, (PureCell[]){{.num = i}, {.size = 0}, {.num = i * 1000.5}}, NULL) == PURE_OK); CHECK((copy = pure_list_share(list, &retired, 2)) && pure_list_form(list) == 0 && pure_list_count(copy) == 100); - CHECK(pure_list_get(copy, 99, 0).num == 99); + CHECK(pure_list_get(copy, 99, 0).num == 99 && pure_list_get(copy, 99, 2).num == 99049.5); pure_list_free(copy); pure_list_clear(list); CHECK(pure_list_form(list) == 1); /* arrays again, the next event */ @@ -1517,6 +1541,18 @@ static size_t model_bound(const Model *m, double key) { return low; } +/* Two lists' stored forms, whole and a part at a time, the same. */ +static bool stored_numbers_same(const PureList *a, const PureList *b) { + size_t size = pure_list_size(a); + unsigned char *x = malloc(size + 1), *y = malloc(size + 1); + CHECK(x && y && size == pure_list_size(b)); + pure_list_encode(a, x); + pure_list_encode(b, y); + bool same = !memcmp(x, y, size); + free(x), free(y); + return same; +} + /* The stored form of a list a part at a time, against it whole. */ static bool encoded_in_parts(const PureList *list, size_t capacity) { size_t size = pure_list_size(list), at = 0, used = 0, needed; @@ -1703,11 +1739,12 @@ static void packed_lists(void) { free(before.items); for (unsigned i = 0; i < SHARES; ++i) free(shared[i].items); - /* The index's edges: each list packed, then searched as its tree (never packed) is. */ - static const uint8_t number[1] = {PURE_CELL_NUMBER}; + /* The index's edges: each list packed, then searched as its tree (never packed) is; its second field's + * cells packed as narrow as they let (docs/design/022) and read back as they were, by position and by runs. */ + static const uint8_t number[2] = {PURE_CELL_NUMBER, PURE_CELL_NUMBER}; size_t indexed = 0; for (unsigned kind = 0; kind < 5; ++kind) { - PureList *packed = pure_list_new(1, number), *tree = pure_list_new(1, number); + PureList *packed = pure_list_new(2, number), *tree = pure_list_new(2, number); CHECK(packed && tree && pure_list_keyed(packed, 0) == PURE_OK && pure_list_keyed(tree, 0) == PURE_OK); double keys[6000]; size_t n = 0; @@ -1719,8 +1756,9 @@ static void packed_lists(void) { : (double)(i / 7) * 65536 + (double)(i % 7) * 3; /* slices at multiples of 2^16 */ if (kind == 0 && i == 2800) key = -0.0; bool exists; - CHECK(pure_list_add(packed, (PureCell[]){{.num = key}}, NULL, NULL, &exists) == PURE_OK); - CHECK(pure_list_add(tree, (PureCell[]){{.num = key}}, NULL, NULL, &exists) == PURE_OK); + double second = some_number(kind, (uint32_t)(i * 2654435761u)), third = kind == 4 ? (double)(i % 200) : second; + CHECK(pure_list_add(packed, (PureCell[]){{.num = key}, {.num = third}}, NULL, NULL, &exists) == PURE_OK); + CHECK(pure_list_add(tree, (PureCell[]){{.num = key}, {.num = third}}, NULL, NULL, &exists) == PURE_OK); keys[n++] = key; } for (size_t i = 0; i < 1000; ++i) { /* searched enough, at the slices' starts for the last kind */ @@ -1729,6 +1767,22 @@ static void packed_lists(void) { (void)pure_list_seek(packed, 0, (PureCell){.num = key}, &found); } CHECK(pure_list_settle(packed) && pure_list_packed(packed)); + for (size_t i = 0; i < n; ++i) { + PureCell x = pure_list_get(packed, i, 1), y = pure_list_get(tree, i, 1); + CHECK(x.i64 == y.i64); + } + PureRun rp, rt; + size_t at = n / 3, read = 0; + CHECK(pure_list_run(packed, at, &rp) && pure_list_run(tree, at, &rt)); + for (size_t ip = at, it = at; read < 500; ++read, ++ip, ++it) { + bool mp = true, mt = true; + while (mp && ip >= rp.start + rp.count) mp = pure_list_next(packed, &rp); + while (mt && it >= rt.start + rt.count) mt = pure_list_next(tree, &rt); + CHECK(mp == mt); + if (!mp) break; + CHECK(!memcmp(&rp.column[1].numbers[ip - rp.start], &rt.column[1].numbers[it - rt.start], sizeof(double))); + } + CHECK(stored_numbers_same(packed, tree)); for (size_t i = 0; i < 20000; ++i) { uint32_t r = next_random(&seed); double a = keys[r % n], b = keys[(r / 7) % n]; -- cgit v1.2.3