test: port the chained-index asm observers to ww
739/740/741 -> test/asm/chain_test.ww. Narrow load/store mnemonics, the u8 write anti-needle, the greedy MOVQ-$N/IMULQ scale-pair exact counts and per-row byte-id preserved; 741's never-armed anti-needle machinery dropped as machinery, not assertion.
This commit is contained in:
@@ -1,272 +0,0 @@
|
||||
/*
|
||||
* 739_chained_index — sentinel for #24. Pins wwstage's cgindex to
|
||||
* compute the element size of the outer N_INDEX in `arr[i][k]` from
|
||||
* the value-type of the inner N_INDEX, instead of defaulting to 8.
|
||||
*
|
||||
* Pre-fix wwstage cgindex (selfhost/cmd/wcc/cgenexpr.ww) only
|
||||
* walked `base.kind == N_IDENT` and `base.kind == N_DOT` for the
|
||||
* esz/signed_elem dispatch. When base was the inner N_INDEX of a
|
||||
* chained `names[i][k]` shape (names: **u8), esz stayed at the
|
||||
* default 8 and the load fell through to MOVQ — an 8-byte load over
|
||||
* a 1-byte u8 element, plus a stray `MOVQ $8, CX; IMULQ CX, AX` on
|
||||
* the outer index that cstage doesn't emit.
|
||||
*
|
||||
* Cstage walks `n->lhs->type` directly (cmd/w6c/cgen.c idx_eff +
|
||||
* N_INDEX, ~line 6011) — the typed AST already says the post-inner-
|
||||
* index value is *u8, so eff->sub->size = 1 lands naturally. Wwstage
|
||||
* needed the mirror via indexvaluetnode.
|
||||
*
|
||||
* Class A wwstage cgen UNDER. Surfaced first time the codebase
|
||||
* exercised the **T[i][k] shape — through the dir-enum work in
|
||||
* selfhost/cmd/ww/main.ww `expanddir` (task #22, predecessor commit
|
||||
* 9e0816e). Workaround there split `names[i][k]` into `let nm: *u8 =
|
||||
* names[i]; nm[k]` to route through the bare-pointer index path.
|
||||
*
|
||||
* Sentinel per row: in the `probe` body, assert the final element
|
||||
* load uses the expected narrow MOV mnemonic, the outer-index scale
|
||||
* is absent (esz=1) or matches `MOVQ $<esz>, CX`, and the cstage
|
||||
* vs wwstage asm is byte-identical.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h>
|
||||
#include "wwtestpkg.h"
|
||||
|
||||
static int
|
||||
runwait(const char *cmd)
|
||||
{
|
||||
int rc = system(cmd);
|
||||
if (rc == -1) return -1;
|
||||
if (WIFEXITED(rc)) return WEXITSTATUS(rc);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* `loadmov` = expected mnemonic for the trailing `<MOV> (AX), AX`
|
||||
* (or similar) load at the outer index. `outerscale` = expected esz
|
||||
* for the outer index (1 → no IMULQ; 4 → `MOVQ $4, CX; IMULQ`). */
|
||||
struct row {
|
||||
const char *label;
|
||||
const char *src;
|
||||
const char *loadmov;
|
||||
int outerscale;
|
||||
};
|
||||
|
||||
static const struct row rows[] = {
|
||||
/* The load-bearing case: **u8 chained-index that the dir-enum
|
||||
* workaround in selfhost/cmd/ww/main.ww `expanddir` had to dodge. */
|
||||
{ "chained_u8",
|
||||
"fn probe(names: **u8) u8 = {\n"
|
||||
" let i: i32 = 0;\n"
|
||||
" let k: u64 = 0u64;\n"
|
||||
" return names[i][k];\n"
|
||||
"};\n"
|
||||
"export fn main() i32 = { return 0; };\n",
|
||||
"MOVZBQ", 1 },
|
||||
/* **i32 — 4-byte signed-narrow load on the outer index, IMULQ $4
|
||||
* for the outer scaling, IMULQ $8 for the inner *i32 stride. */
|
||||
{ "chained_i32",
|
||||
"fn probe(mat: **i32) i32 = {\n"
|
||||
" let i: i32 = 0;\n"
|
||||
" let k: u64 = 0u64;\n"
|
||||
" return mat[i][k];\n"
|
||||
"};\n"
|
||||
"export fn main() i32 = { return 0; };\n",
|
||||
"MOVSXD", 4 },
|
||||
};
|
||||
|
||||
static int
|
||||
slurp(const char *path, char *buf, size_t cap)
|
||||
{
|
||||
FILE *f = fopen(path, "rb");
|
||||
if (!f) return -1;
|
||||
size_t n = fread(buf, 1, cap - 1, f);
|
||||
fclose(f);
|
||||
buf[n] = '\0';
|
||||
return (int)n;
|
||||
}
|
||||
|
||||
static int
|
||||
emit_s(const char *w6c, const struct row *r, int i, char *out_s, size_t cap)
|
||||
{
|
||||
char src[96], cmd[1024];
|
||||
snprintf(src, sizeof src, "/tmp/chidx_%d_%d.ww", getpid(), i);
|
||||
snprintf(out_s, cap, "/tmp/chidx_%d_%d_%s.s",
|
||||
getpid(), i, w6c[strlen(w6c) - 1] == 'w' ? "ww" : "c");
|
||||
|
||||
FILE *f = fopen(src, "wb");
|
||||
if (!f) return -1;
|
||||
wwtest_fputs(r->src, f);
|
||||
fclose(f);
|
||||
|
||||
snprintf(cmd, sizeof cmd, "%s -o %s %s 2>/dev/null", w6c, out_s, src);
|
||||
int rc = runwait(cmd);
|
||||
unlink(src);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* Inside `TEXT probe`, the final element load must use the
|
||||
* expected narrow MOV mnemonic on `(AX), AX`. Pre-fix wwstage
|
||||
* emitted plain `MOVQ (AX), AX`. */
|
||||
static int
|
||||
check_loadmov(const char *spath, const struct row *r, const char *stage)
|
||||
{
|
||||
char buf[1 << 14];
|
||||
if (slurp(spath, buf, sizeof buf) < 0) {
|
||||
fprintf(stderr, "row[%s][%s]: cannot read %s\n",
|
||||
r->label, stage, spath);
|
||||
return -1;
|
||||
}
|
||||
const char *fn = strstr(buf, "TEXT main.probe");
|
||||
if (!fn) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: no TEXT probe in %s\n",
|
||||
r->label, stage, spath);
|
||||
return -1;
|
||||
}
|
||||
const char *ret = strstr(fn, "\tRET\n");
|
||||
char needle[64];
|
||||
snprintf(needle, sizeof needle, "\t%s\t(AX), AX\n", r->loadmov);
|
||||
const char *m = strstr(fn, needle);
|
||||
if (!m || (ret && m > ret)) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: expected `%s (AX), AX` in probe body\n",
|
||||
r->label, stage, r->loadmov);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Negative: pre-fix wwstage emitted a stray `MOVQ $8, CX; IMULQ CX,
|
||||
* AX` for the OUTER index of a **u8 chain (because esz defaulted to
|
||||
* 8). For a u8 outer the correct emit is no scaling at all. Assert
|
||||
* the count of `MOVQ $8, CX` followed by `IMULQ CX, AX` pairs in the
|
||||
* probe body matches the expected inner-only count (= 1 for **T;
|
||||
* the inner index of *T elements always scales by 8). */
|
||||
static int
|
||||
check_inner_scale_only(const char *spath, const struct row *r,
|
||||
const char *stage)
|
||||
{
|
||||
char buf[1 << 14];
|
||||
if (slurp(spath, buf, sizeof buf) < 0) return -1;
|
||||
const char *fn = strstr(buf, "TEXT main.probe");
|
||||
if (!fn) return -1;
|
||||
const char *ret = strstr(fn, "\tRET\n");
|
||||
if (!ret) ret = fn + strlen(fn);
|
||||
|
||||
int n_inner = 0, n_outer = 0;
|
||||
const char *p = fn;
|
||||
while (p < ret) {
|
||||
const char *inner = strstr(p, "\tMOVQ\t$8, CX\n");
|
||||
if (!inner || inner >= ret) break;
|
||||
const char *next = strstr(inner, "\tIMULQ\tCX, AX\n");
|
||||
if (!next || next >= ret) { p = inner + 1; continue; }
|
||||
n_inner++;
|
||||
p = next + 1;
|
||||
}
|
||||
if (r->outerscale == 1) {
|
||||
/* Pre-fix wwstage had two `MOVQ $8, CX; IMULQ` pairs (one
|
||||
* for the outer index that shouldn't scale at all). Cstage
|
||||
* has one — for the inner *u8 stride only. */
|
||||
if (n_inner != 1) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: expected exactly 1 inner `MOVQ $8, "
|
||||
"CX; IMULQ CX, AX` pair (no outer scaling for u8), "
|
||||
"got %d\n", r->label, stage, n_inner);
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
/* For **i32: inner stride is 8 (sizeof *i32), outer scale is
|
||||
* 4 (sizeof i32). Assert one `MOVQ $8, CX` for inner and one
|
||||
* `MOVQ $4, CX` for outer. */
|
||||
p = fn;
|
||||
while (p < ret) {
|
||||
const char *outer = strstr(p, "\tMOVQ\t$4, CX\n");
|
||||
if (!outer || outer >= ret) break;
|
||||
const char *next = strstr(outer, "\tIMULQ\tCX, AX\n");
|
||||
if (!next || next >= ret) { p = outer + 1; continue; }
|
||||
n_outer++;
|
||||
p = next + 1;
|
||||
}
|
||||
if (n_inner != 1 || n_outer != 1) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: expected 1 inner `MOVQ $8` + 1 outer "
|
||||
"`MOVQ $4` IMULQ pair, got inner=%d outer=%d\n",
|
||||
r->label, stage, n_inner, n_outer);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
const char *bin = getenv("BIN");
|
||||
if (!bin) bin = "out/bin";
|
||||
char absbin[512];
|
||||
if (bin[0] != '/') {
|
||||
char cwd[256];
|
||||
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
|
||||
snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin);
|
||||
bin = absbin;
|
||||
}
|
||||
|
||||
char w6c[640], w6c_ww[640];
|
||||
snprintf(w6c, sizeof w6c, "%s/w6c", bin);
|
||||
snprintf(w6c_ww, sizeof w6c_ww, "%s/w6c_ww", bin);
|
||||
|
||||
int have_ww = (access(w6c_ww, X_OK) == 0);
|
||||
int n = (int)(sizeof rows / sizeof rows[0]);
|
||||
int total = 0, fail = 0;
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
char cs_path[128], ws_path[128];
|
||||
|
||||
if (emit_s(w6c, &rows[i], i, cs_path, sizeof cs_path) != 0) {
|
||||
fprintf(stderr,
|
||||
"chained_index[cstage][%s]: w6c failed\n",
|
||||
rows[i].label);
|
||||
fail++; total++; continue;
|
||||
}
|
||||
total += 2;
|
||||
if (check_loadmov(cs_path, &rows[i], "cstage") != 0) fail++;
|
||||
if (check_inner_scale_only(cs_path, &rows[i], "cstage") != 0)
|
||||
fail++;
|
||||
|
||||
if (!have_ww) { unlink(cs_path); continue; }
|
||||
|
||||
if (emit_s(w6c_ww, &rows[i], i, ws_path, sizeof ws_path) != 0) {
|
||||
fprintf(stderr,
|
||||
"chained_index[wwstage][%s]: w6c_ww failed\n",
|
||||
rows[i].label);
|
||||
fail++; total++;
|
||||
unlink(cs_path); continue;
|
||||
}
|
||||
total += 2;
|
||||
if (check_loadmov(ws_path, &rows[i], "wwstage") != 0) fail++;
|
||||
if (check_inner_scale_only(ws_path, &rows[i], "wwstage") != 0)
|
||||
fail++;
|
||||
|
||||
total++;
|
||||
char cmd[512];
|
||||
snprintf(cmd, sizeof cmd, "cmp -s %s %s", cs_path, ws_path);
|
||||
if (runwait(cmd) != 0) {
|
||||
fprintf(stderr,
|
||||
"chained_index[%s]: cstage vs wwstage asm differs\n",
|
||||
rows[i].label);
|
||||
fail++;
|
||||
}
|
||||
|
||||
unlink(cs_path); unlink(ws_path);
|
||||
}
|
||||
|
||||
if (fail) {
|
||||
fprintf(stderr,
|
||||
"chained_index: %d/%d fixtures failed\n", fail, total);
|
||||
return 1;
|
||||
}
|
||||
printf("chained_index: %d/%d ok\n", total, total);
|
||||
return 0;
|
||||
}
|
||||
@@ -1,287 +0,0 @@
|
||||
/*
|
||||
* 740_chained_write — sentinel for #27. Pins wwstage's cgassign to
|
||||
* compute the element size of the outer N_INDEX in `arr[i][k] = v`
|
||||
* from the value-type of the inner N_INDEX, instead of defaulting
|
||||
* to 8. Sister of 739_chained_index (#24, read path); same dispatch
|
||||
* gap on the write side.
|
||||
*
|
||||
* Pre-fix wwstage cgassign (selfhost/cmd/wcc/cgenexpr.ww) only
|
||||
* walked `base.kind == N_IDENT` and `base.kind == N_DOT` for the
|
||||
* esz/elemtn dispatch on the N_INDEX-lhs branch. When base was the
|
||||
* inner N_INDEX of a chained `names[i][k]` shape (names: **u8), esz
|
||||
* stayed at the default 8 and the store fell through to MOVQ — an
|
||||
* 8-byte write over a 1-byte u8 slot (corrupting adjacent memory),
|
||||
* plus a stray `MOVQ $8, CX; IMULQ CX, AX` on the outer index that
|
||||
* cstage doesn't emit.
|
||||
*
|
||||
* Cstage walks `n->lhs->type` directly (cmd/w6c/cgen.c N_ASSIGN +
|
||||
* N_INDEX lhs) — the typed AST already says the post-inner-index
|
||||
* value is *u8, so eff->sub->size = 1 lands naturally. Wwstage now
|
||||
* mirrors via indexvaluetnode (already graduated for cgindex in #24).
|
||||
*
|
||||
* Class A wwstage cgen UNDER. No in-tree consumer surfaced before
|
||||
* the fix (selfhost + lib grep is empty for chained-write); the
|
||||
* filed-latent sister of #24's surfaced bug. This sentinel is the
|
||||
* sole exerciser of the shape.
|
||||
*
|
||||
* Sentinel per row: in the `probe` body, assert the final element
|
||||
* store uses the expected narrow MOV mnemonic, the outer-index
|
||||
* scale is absent (esz=1) or matches `MOVQ $<esz>, CX`, and the
|
||||
* cstage vs wwstage asm is byte-identical.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h>
|
||||
#include "wwtestpkg.h"
|
||||
|
||||
static int
|
||||
runwait(const char *cmd)
|
||||
{
|
||||
int rc = system(cmd);
|
||||
if (rc == -1) return -1;
|
||||
if (WIFEXITED(rc)) return WEXITSTATUS(rc);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* `storemov` = expected mnemonic for the trailing `<MOV> AX, (BX)`
|
||||
* store at the outer index. `outerscale` = expected esz for the
|
||||
* outer index (1 → no IMULQ; 4 → `MOVQ $4, CX; IMULQ`). */
|
||||
struct row {
|
||||
const char *label;
|
||||
const char *src;
|
||||
const char *storemov;
|
||||
int outerscale;
|
||||
};
|
||||
|
||||
static const struct row rows[] = {
|
||||
/* The load-bearing case: **u8 chained-write. Sister of 739's
|
||||
* **u8 read. esz must drop to 1; MOVB store; no outer scale. */
|
||||
{ "chained_u8",
|
||||
"fn probe(names: **u8) void = {\n"
|
||||
" let i: i32 = 0;\n"
|
||||
" let k: u64 = 0u64;\n"
|
||||
" names[i][k] = 65u8;\n"
|
||||
"};\n"
|
||||
"export fn main() i32 = { return 0; };\n",
|
||||
"MOVB", 1 },
|
||||
/* **i32 — 4-byte store, IMULQ $4 outer scaling, IMULQ $8 inner
|
||||
* *i32 stride. */
|
||||
{ "chained_i32",
|
||||
"fn probe(mat: **i32) void = {\n"
|
||||
" let i: i32 = 0;\n"
|
||||
" let k: u64 = 0u64;\n"
|
||||
" mat[i][k] = 42i32;\n"
|
||||
"};\n"
|
||||
"export fn main() i32 = { return 0; };\n",
|
||||
"MOVL", 4 },
|
||||
};
|
||||
|
||||
static int
|
||||
slurp(const char *path, char *buf, size_t cap)
|
||||
{
|
||||
FILE *f = fopen(path, "rb");
|
||||
if (!f) return -1;
|
||||
size_t n = fread(buf, 1, cap - 1, f);
|
||||
fclose(f);
|
||||
buf[n] = '\0';
|
||||
return (int)n;
|
||||
}
|
||||
|
||||
static int
|
||||
emit_s(const char *w6c, const struct row *r, int i, char *out_s, size_t cap)
|
||||
{
|
||||
char src[96], cmd[1024];
|
||||
snprintf(src, sizeof src, "/tmp/chwr_%d_%d.ww", getpid(), i);
|
||||
snprintf(out_s, cap, "/tmp/chwr_%d_%d_%s.s",
|
||||
getpid(), i, w6c[strlen(w6c) - 1] == 'w' ? "ww" : "c");
|
||||
|
||||
FILE *f = fopen(src, "wb");
|
||||
if (!f) return -1;
|
||||
wwtest_fputs(r->src, f);
|
||||
fclose(f);
|
||||
|
||||
snprintf(cmd, sizeof cmd, "%s -o %s %s 2>/dev/null", w6c, out_s, src);
|
||||
int rc = runwait(cmd);
|
||||
unlink(src);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* Inside `TEXT probe`, the final element store must use the
|
||||
* expected narrow MOV mnemonic on `AX, (BX)`. Pre-fix wwstage
|
||||
* emitted plain `MOVQ AX, (BX)`. */
|
||||
static int
|
||||
check_storemov(const char *spath, const struct row *r, const char *stage)
|
||||
{
|
||||
char buf[1 << 14];
|
||||
if (slurp(spath, buf, sizeof buf) < 0) {
|
||||
fprintf(stderr, "row[%s][%s]: cannot read %s\n",
|
||||
r->label, stage, spath);
|
||||
return -1;
|
||||
}
|
||||
const char *fn = strstr(buf, "TEXT main.probe");
|
||||
if (!fn) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: no TEXT probe in %s\n",
|
||||
r->label, stage, spath);
|
||||
return -1;
|
||||
}
|
||||
const char *ret = strstr(fn, "\tRET\n");
|
||||
char needle[64];
|
||||
snprintf(needle, sizeof needle, "\t%s\tAX, (BX)\n", r->storemov);
|
||||
const char *m = strstr(fn, needle);
|
||||
if (!m || (ret && m > ret)) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: expected `%s AX, (BX)` in probe body\n",
|
||||
r->label, stage, r->storemov);
|
||||
return -1;
|
||||
}
|
||||
/* Pre-fix wwstage **u8 write emitted plain `MOVQ AX, (BX)`. For
|
||||
* the u8 row that's a wrong-width store — anti-check it is
|
||||
* absent. */
|
||||
if (r->outerscale == 1) {
|
||||
const char *bad = strstr(fn, "\tMOVQ\tAX, (BX)\n");
|
||||
if (bad && (!ret || bad < ret)) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: stray 8-byte `MOVQ AX, (BX)` in "
|
||||
"probe body — pre-#27 wrong-width-store regression\n",
|
||||
r->label, stage);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Negative: pre-fix wwstage emitted a stray `MOVQ $8, CX; IMULQ CX,
|
||||
* AX` for the OUTER index of a **u8 chain (because esz defaulted to
|
||||
* 8). For a u8 outer the correct emit is no scaling at all. Assert
|
||||
* the count of `MOVQ $8, CX` followed by `IMULQ CX, AX` pairs in the
|
||||
* probe body matches the expected inner-only count (= 1 for **T;
|
||||
* the inner index of *T elements always scales by 8). */
|
||||
static int
|
||||
check_inner_scale_only(const char *spath, const struct row *r,
|
||||
const char *stage)
|
||||
{
|
||||
char buf[1 << 14];
|
||||
if (slurp(spath, buf, sizeof buf) < 0) return -1;
|
||||
const char *fn = strstr(buf, "TEXT main.probe");
|
||||
if (!fn) return -1;
|
||||
const char *ret = strstr(fn, "\tRET\n");
|
||||
if (!ret) ret = fn + strlen(fn);
|
||||
|
||||
int n_inner = 0, n_outer = 0;
|
||||
const char *p = fn;
|
||||
while (p < ret) {
|
||||
const char *inner = strstr(p, "\tMOVQ\t$8, CX\n");
|
||||
if (!inner || inner >= ret) break;
|
||||
const char *next = strstr(inner, "\tIMULQ\tCX, AX\n");
|
||||
if (!next || next >= ret) { p = inner + 1; continue; }
|
||||
n_inner++;
|
||||
p = next + 1;
|
||||
}
|
||||
if (r->outerscale == 1) {
|
||||
/* Pre-fix wwstage had two `MOVQ $8, CX; IMULQ` pairs (one
|
||||
* for the outer index that shouldn't scale at all). Cstage
|
||||
* has one — for the inner *u8 stride only. */
|
||||
if (n_inner != 1) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: expected exactly 1 inner `MOVQ $8, "
|
||||
"CX; IMULQ CX, AX` pair (no outer scaling for u8), "
|
||||
"got %d\n", r->label, stage, n_inner);
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
/* For **i32: inner stride is 8 (sizeof *i32), outer scale is
|
||||
* 4 (sizeof i32). Assert one `MOVQ $8, CX` for inner and one
|
||||
* `MOVQ $4, CX` for outer. */
|
||||
p = fn;
|
||||
while (p < ret) {
|
||||
const char *outer = strstr(p, "\tMOVQ\t$4, CX\n");
|
||||
if (!outer || outer >= ret) break;
|
||||
const char *next = strstr(outer, "\tIMULQ\tCX, AX\n");
|
||||
if (!next || next >= ret) { p = outer + 1; continue; }
|
||||
n_outer++;
|
||||
p = next + 1;
|
||||
}
|
||||
if (n_inner != 1 || n_outer != 1) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: expected 1 inner `MOVQ $8` + 1 outer "
|
||||
"`MOVQ $4` IMULQ pair, got inner=%d outer=%d\n",
|
||||
r->label, stage, n_inner, n_outer);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
const char *bin = getenv("BIN");
|
||||
if (!bin) bin = "out/bin";
|
||||
char absbin[512];
|
||||
if (bin[0] != '/') {
|
||||
char cwd[256];
|
||||
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
|
||||
snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin);
|
||||
bin = absbin;
|
||||
}
|
||||
|
||||
char w6c[640], w6c_ww[640];
|
||||
snprintf(w6c, sizeof w6c, "%s/w6c", bin);
|
||||
snprintf(w6c_ww, sizeof w6c_ww, "%s/w6c_ww", bin);
|
||||
|
||||
int have_ww = (access(w6c_ww, X_OK) == 0);
|
||||
int n = (int)(sizeof rows / sizeof rows[0]);
|
||||
int total = 0, fail = 0;
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
char cs_path[128], ws_path[128];
|
||||
|
||||
if (emit_s(w6c, &rows[i], i, cs_path, sizeof cs_path) != 0) {
|
||||
fprintf(stderr,
|
||||
"chained_write[cstage][%s]: w6c failed\n",
|
||||
rows[i].label);
|
||||
fail++; total++; continue;
|
||||
}
|
||||
total += 2;
|
||||
if (check_storemov(cs_path, &rows[i], "cstage") != 0) fail++;
|
||||
if (check_inner_scale_only(cs_path, &rows[i], "cstage") != 0)
|
||||
fail++;
|
||||
|
||||
if (!have_ww) { unlink(cs_path); continue; }
|
||||
|
||||
if (emit_s(w6c_ww, &rows[i], i, ws_path, sizeof ws_path) != 0) {
|
||||
fprintf(stderr,
|
||||
"chained_write[wwstage][%s]: w6c_ww failed\n",
|
||||
rows[i].label);
|
||||
fail++; total++;
|
||||
unlink(cs_path); continue;
|
||||
}
|
||||
total += 2;
|
||||
if (check_storemov(ws_path, &rows[i], "wwstage") != 0) fail++;
|
||||
if (check_inner_scale_only(ws_path, &rows[i], "wwstage") != 0)
|
||||
fail++;
|
||||
|
||||
total++;
|
||||
char cmd[512];
|
||||
snprintf(cmd, sizeof cmd, "cmp -s %s %s", cs_path, ws_path);
|
||||
if (runwait(cmd) != 0) {
|
||||
fprintf(stderr,
|
||||
"chained_write[%s]: cstage vs wwstage asm differs\n",
|
||||
rows[i].label);
|
||||
fail++;
|
||||
}
|
||||
|
||||
unlink(cs_path); unlink(ws_path);
|
||||
}
|
||||
|
||||
if (fail) {
|
||||
fprintf(stderr,
|
||||
"chained_write: %d/%d fixtures failed\n", fail, total);
|
||||
return 1;
|
||||
}
|
||||
printf("chained_write: %d/%d ok\n", total, total);
|
||||
return 0;
|
||||
}
|
||||
@@ -1,243 +0,0 @@
|
||||
/*
|
||||
* 741_dotbase_chained — sentinel for #28 + #30. Pins wwstage's
|
||||
* `indexvaluetnode` to handle N_DOT base (graduates the helper #24
|
||||
* introduced for chained N_INDEX so the N_DOT base shape rides the
|
||||
* same path).
|
||||
*
|
||||
* Two sister latents, one helper graduation:
|
||||
*
|
||||
* Read (#28): `obj.mat[i][k]` where obj is a struct with field
|
||||
* `mat: **u8`. The outer N_INDEX's base is the inner N_INDEX,
|
||||
* whose base is N_DOT. cgindex routes through `indexvaluetnode`
|
||||
* for the inner base type; pre-fix `indexvaluetnode` only handled
|
||||
* N_IDENT + N_INDEX bases, so the recursion bottomed out at the
|
||||
* N_DOT base with bt=nil. esz fell through to 8 and signed_elem
|
||||
* to false — wwstage emitted a stray outer `MOVQ $8, CX; IMULQ
|
||||
* CX, AX` plus `MOVQ (AX), AX` (8-byte read over a 1-byte u8)
|
||||
* instead of cstage's bare `MOVZBQ (AX), AX`.
|
||||
*
|
||||
* Write (#30): `obj.arr[i] = v` where obj is a struct with field
|
||||
* `arr: [N]Tagged` (e.g. (i64|str)). cgassign's N_DOT-base arm
|
||||
* computed esz via `indexbaseesz` but never set `elemtn`, so the
|
||||
* tagged-element store gate (keyed on elemtn) missed and the
|
||||
* 24-byte tagged slot was overwritten by a single MOVQ scalar
|
||||
* store — wrong-width store + tag/payload junk in the upper
|
||||
* 16 bytes. The matching scanlocals pre-pass arm (cgendecl.ww)
|
||||
* was also missing N_DOT base, so post-elemtn-fix the @tagscr
|
||||
* slot allocated past the frame boundary and clobbered live
|
||||
* locals (s, i).
|
||||
*
|
||||
* Cstage walks `n->lhs->type` directly via the typed AST (cmd/w6c/
|
||||
* cgen.c idx_eff + the N_INDEX-lhs N_ASSIGN branch). Wwstage
|
||||
* mirrors via `indexvaluetnode`, which #24 introduced for the
|
||||
* N_INDEX-base case and #28/#30 now graduate for N_DOT base via
|
||||
* `dotfieldtnode` lookup.
|
||||
*
|
||||
* Class A wwstage cgen UNDER. No in-tree consumer; sister latents
|
||||
* filed during #24 + #27 reviews (commits aa8ca47, 3ba1922). This
|
||||
* sentinel is the sole exerciser of the shape.
|
||||
*
|
||||
* Per row: in the `probe` body, assert the dispatch-defining MOV
|
||||
* mnemonic + scaling is present, plus cstage vs wwstage asm is
|
||||
* byte-identical.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h>
|
||||
#include "wwtestpkg.h"
|
||||
|
||||
static int
|
||||
runwait(const char *cmd)
|
||||
{
|
||||
int rc = system(cmd);
|
||||
if (rc == -1) return -1;
|
||||
if (WIFEXITED(rc)) return WEXITSTATUS(rc);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* `needle` = a substring that must appear in the probe body and
|
||||
* uniquely identifies the post-fix dispatch (narrow MOV mnemonic
|
||||
* for read, 24B element scale for tagged write).
|
||||
* `antineedle` = a substring that MUST NOT appear — pre-fix wwstage
|
||||
* regression marker. Empty string skips the anti-check (write row
|
||||
* relies on cmp -s byte-id to catch divergence, since the tagged-
|
||||
* store byte-copy legitimately contains MOVQ-store fragments). */
|
||||
struct row {
|
||||
const char *label;
|
||||
const char *src;
|
||||
const char *needle;
|
||||
const char *antineedle;
|
||||
};
|
||||
|
||||
static const struct row rows[] = {
|
||||
/* Read: chained `obj.mat[i][k]` where mat: **u8. Post-fix wwstage
|
||||
* routes the inner N_INDEX's N_DOT base through indexvaluetnode →
|
||||
* dotfieldtnode, esz collapses to 1, outer load becomes MOVZBQ.
|
||||
* Pre-fix had stray `MOVQ (AX), AX` (8-byte read over u8). */
|
||||
{ "dotbase_chained_read",
|
||||
"type S = struct{ pad: i64, mat: **u8 };\n"
|
||||
"fn probe(s: *S) u8 = {\n"
|
||||
" let i: i32 = 0;\n"
|
||||
" let k: u64 = 0u64;\n"
|
||||
" return s.mat[i][k];\n"
|
||||
"};\n"
|
||||
"export fn main() i32 = { return 0; };\n",
|
||||
"\tMOVZBQ\t(AX), AX\n",
|
||||
"" },
|
||||
/* Write: `obj.arr[i] = v` where arr: [N](i64|str) — tagged element.
|
||||
* Post-fix wwstage: cgassign N_DOT arm sets elemtn → tagged-store
|
||||
* path → IMULQ (stride) + byte-copy from scratch. Scanlocals N_DOT
|
||||
* arm pre-reserves @tagscr in the frame. Pre-fix: scalar `MOVQ AX,
|
||||
* (BX)` over the slot.
|
||||
* #1/Phase 3: str IS []u8 (24B), so the (i64|str) slot is
|
||||
* 8(tag)+24(str payload)=32B — stride is $32, not the 16B-world
|
||||
* $24. Byte-identical across stages. */
|
||||
{ "dotbase_array_tagged_write",
|
||||
"type T = (i64 | str);\n"
|
||||
"type S = struct{ pad: i64, arr: [4]T };\n"
|
||||
"fn probe(s: *S) void = {\n"
|
||||
" let i: i32 = 0;\n"
|
||||
" s.arr[i] = 42i64;\n"
|
||||
"};\n"
|
||||
"export fn main() i32 = { return 0; };\n",
|
||||
"\tMOVQ\t$32, CX\n",
|
||||
"" },
|
||||
};
|
||||
|
||||
static int
|
||||
slurp(const char *path, char *buf, size_t cap)
|
||||
{
|
||||
FILE *f = fopen(path, "rb");
|
||||
if (!f) return -1;
|
||||
size_t n = fread(buf, 1, cap - 1, f);
|
||||
fclose(f);
|
||||
buf[n] = '\0';
|
||||
return (int)n;
|
||||
}
|
||||
|
||||
static int
|
||||
emit_s(const char *w6c, const struct row *r, int i, char *out_s, size_t cap)
|
||||
{
|
||||
char src[96], cmd[1024];
|
||||
snprintf(src, sizeof src, "/tmp/dotbase_%d_%d.ww", getpid(), i);
|
||||
snprintf(out_s, cap, "/tmp/dotbase_%d_%d_%s.s",
|
||||
getpid(), i, w6c[strlen(w6c) - 1] == 'w' ? "ww" : "c");
|
||||
|
||||
FILE *f = fopen(src, "wb");
|
||||
if (!f) return -1;
|
||||
wwtest_fputs(r->src, f);
|
||||
fclose(f);
|
||||
|
||||
snprintf(cmd, sizeof cmd, "%s -o %s %s 2>/dev/null", w6c, out_s, src);
|
||||
int rc = runwait(cmd);
|
||||
unlink(src);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* Inside `TEXT probe`, the needle must appear and the antineedle
|
||||
* must NOT appear (anti-regression on pre-fix wwstage emit). */
|
||||
static int
|
||||
check_probe(const char *spath, const struct row *r, const char *stage)
|
||||
{
|
||||
char buf[1 << 14];
|
||||
if (slurp(spath, buf, sizeof buf) < 0) {
|
||||
fprintf(stderr, "row[%s][%s]: cannot read %s\n",
|
||||
r->label, stage, spath);
|
||||
return -1;
|
||||
}
|
||||
const char *fn = strstr(buf, "TEXT main.probe");
|
||||
if (!fn) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: no TEXT probe in %s\n",
|
||||
r->label, stage, spath);
|
||||
return -1;
|
||||
}
|
||||
const char *ret = strstr(fn, "\tRET\n");
|
||||
const char *m = strstr(fn, r->needle);
|
||||
if (!m || (ret && m > ret)) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: expected `%s` in probe body\n",
|
||||
r->label, stage, r->needle);
|
||||
return -1;
|
||||
}
|
||||
if (r->antineedle[0] != '\0') {
|
||||
const char *bad = strstr(fn, r->antineedle);
|
||||
if (bad && (!ret || bad < ret)) {
|
||||
fprintf(stderr,
|
||||
"row[%s][%s]: stray `%s` in probe body — "
|
||||
"pre-fix wwstage regression\n",
|
||||
r->label, stage, r->antineedle);
|
||||
return -1;
|
||||
};
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
const char *bin = getenv("BIN");
|
||||
if (!bin) bin = "out/bin";
|
||||
char absbin[512];
|
||||
if (bin[0] != '/') {
|
||||
char cwd[256];
|
||||
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
|
||||
snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin);
|
||||
bin = absbin;
|
||||
}
|
||||
|
||||
char w6c[640], w6c_ww[640];
|
||||
snprintf(w6c, sizeof w6c, "%s/w6c", bin);
|
||||
snprintf(w6c_ww, sizeof w6c_ww, "%s/w6c_ww", bin);
|
||||
|
||||
int have_ww = (access(w6c_ww, X_OK) == 0);
|
||||
int n = (int)(sizeof rows / sizeof rows[0]);
|
||||
int total = 0, fail = 0;
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
char cs_path[128], ws_path[128];
|
||||
|
||||
if (emit_s(w6c, &rows[i], i, cs_path, sizeof cs_path) != 0) {
|
||||
fprintf(stderr,
|
||||
"dotbase_chained[cstage][%s]: w6c failed\n",
|
||||
rows[i].label);
|
||||
fail++; total++; continue;
|
||||
}
|
||||
total++;
|
||||
if (check_probe(cs_path, &rows[i], "cstage") != 0) fail++;
|
||||
|
||||
if (!have_ww) { unlink(cs_path); continue; }
|
||||
|
||||
if (emit_s(w6c_ww, &rows[i], i, ws_path, sizeof ws_path) != 0) {
|
||||
fprintf(stderr,
|
||||
"dotbase_chained[wwstage][%s]: w6c_ww failed\n",
|
||||
rows[i].label);
|
||||
fail++; total++;
|
||||
unlink(cs_path); continue;
|
||||
}
|
||||
total++;
|
||||
if (check_probe(ws_path, &rows[i], "wwstage") != 0) fail++;
|
||||
|
||||
total++;
|
||||
char cmd[512];
|
||||
snprintf(cmd, sizeof cmd, "cmp -s %s %s", cs_path, ws_path);
|
||||
if (runwait(cmd) != 0) {
|
||||
fprintf(stderr,
|
||||
"dotbase_chained[%s]: cstage vs wwstage asm differs\n",
|
||||
rows[i].label);
|
||||
fail++;
|
||||
}
|
||||
|
||||
unlink(cs_path); unlink(ws_path);
|
||||
}
|
||||
|
||||
if (fail) {
|
||||
fprintf(stderr,
|
||||
"dotbase_chained: %d/%d fixtures failed\n", fail, total);
|
||||
return 1;
|
||||
}
|
||||
printf("dotbase_chained: %d/%d ok\n", total, total);
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user