标准宏真值矩阵压测:raw_xor=raw_or 体复制(76/121 错)+ raw_inc S/Co 实参接反(21/22 错)
- tools/stdmac_matrix.py: raw_add/and/or/xor/inc 全量对拍(真链路:probe_dump 汇编 -> ROT-8 VM -> 读 out) - tools/stdmac_xor_fix_probe.py + tests/xor_fix_probe.r8asm.frag: 候选体 = OR 体删末块 %3 set_1,121/121 通过 - tools/stdmac_inc_fix_probe.py + tests/inc_fix_probe.r8asm.frag: 最小修法 = 对调 bit_raw_inc 第 3/4 实参,22/22 + 链式通过 - tools/stdmac_preserve.py: 五个 raw_ 宏均保留输入(A/B/Ci) - tests/probe_dump.cc: 任意 .r8asm -> tape 的驱动(须在 r8asm_rev 根目录跑,include 是相对 cwd)
This commit is contained in:
1 parent
9281945900
commit
6f5d39030c
8 files changed
+415
No files matched your search
@@ -0,0 +1,28 @@
|
||||
; 探针:raw_inc 接线假设验证(不改核心仓,只在测试侧重写 glue)
|
||||
; 假设:bit_raw_inc 体内 %3 装的是 Cout、%4 装的是 Sum(与宏头注释相反)。
|
||||
; 当前 raw_inc 把实参按注释顺序传(S->%3, Co->%4),于是输出接反,且进位链
|
||||
; `.tp %4; clb_bit_mov %2` 喂进 Ci 的是 Sum 而不是 Cout。
|
||||
; 最小修法 = 只把第 3/4 个实参对调,其余(链源 %4、旋转 %3、尾巴)全都不动。
|
||||
|
||||
%macro raw_inc_fix 5
|
||||
.anchor before_raw_inc_fix
|
||||
.tp %2
|
||||
bit_copy %5 %4
|
||||
.tp %5
|
||||
ror
|
||||
%rep _CELL_SIZE
|
||||
bit_raw_inc %1 %2 %4 %3 %5 ; <== 唯一改动:对调 S/Co 实参
|
||||
.tp %4 ; %4 = Cout 位
|
||||
clb_bit_mov %2
|
||||
.tp %1
|
||||
ror
|
||||
.tp %3 ; %3 = Sum 累加器,跟着 A 一起旋
|
||||
ror
|
||||
%endrep
|
||||
.tp %2
|
||||
clb_bit_mov %4
|
||||
.tp %5
|
||||
rol
|
||||
clb_bit_mov %2
|
||||
.tp before_raw_inc_fix
|
||||
%endmacro
|
||||
@@ -0,0 +1,15 @@
|
||||
#include "r8asm/r8asm.hh"
|
||||
#include <iostream>
|
||||
|
||||
// 探针驱动:把任意 .r8asm 文件汇编成 ROT-8 tape 打到 stdout。
|
||||
// 必须在 r8asm_rev 仓库根目录运行(文件内的 %include "asm/..." 是相对 cwd 的路径)。
|
||||
int main(int argc, char **argv) {
|
||||
if (argc < 2) {
|
||||
std::cerr << "usage: probe_dump <file.r8asm>\n";
|
||||
return (1);
|
||||
}
|
||||
r8asm a;
|
||||
a.import_file(argv[1]);
|
||||
std::cout << a.export_rot8();
|
||||
return (0);
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
; 探针:bit_raw_xor 候选体 —— 与 bit_raw_or 体逐行相同,只把最后一个块里的 `%3 set_1` 删掉。
|
||||
; (OR 的末块用 ans set_1 补上 "B 侧贡献";XOR 的 ans 在前面的翻转链里已经对了,
|
||||
; 末块只需把 B 恢复回去。)
|
||||
|
||||
%macro bit_raw_xor_cand 4
|
||||
.anchor before_bit_raw_xor_cand
|
||||
|
||||
.tp %3
|
||||
biz
|
||||
flb
|
||||
rnz
|
||||
|
||||
.tp %4
|
||||
biz
|
||||
flb
|
||||
rnz
|
||||
|
||||
.tp %1
|
||||
biz
|
||||
.tp %3
|
||||
set_1
|
||||
.tp %1
|
||||
flb
|
||||
rnz
|
||||
|
||||
.tp %3
|
||||
biz
|
||||
.tp %1
|
||||
flb
|
||||
.tp %2
|
||||
flb
|
||||
.tp %4
|
||||
flb
|
||||
.tp %3
|
||||
flb
|
||||
rnz
|
||||
|
||||
.tp %2
|
||||
biz
|
||||
.tp %3
|
||||
flb
|
||||
.tp %4
|
||||
flb
|
||||
.tp %2
|
||||
flb
|
||||
rnz
|
||||
|
||||
.tp %4
|
||||
biz
|
||||
.tp %2
|
||||
set_1
|
||||
.tp %4
|
||||
flb
|
||||
rnz
|
||||
|
||||
.tp before_bit_raw_xor_cand
|
||||
%endmacro
|
||||
|
||||
%macro raw_xor_cand 4
|
||||
.anchor before_raw_xor_cand
|
||||
|
||||
%rep _CELL_SIZE
|
||||
bit_raw_xor_cand %1 %2 %3 %4
|
||||
.tp %1
|
||||
ror
|
||||
.tp %2
|
||||
ror
|
||||
.tp %3
|
||||
ror
|
||||
%endrep
|
||||
.tp before_raw_xor_cand
|
||||
%endmacro
|
||||
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env python3
|
||||
"""stdmac_inc_detail.py — 聚焦 raw_inc / bit_raw_inc 的失败面。"""
|
||||
import os
|
||||
import sys
|
||||
|
||||
HERE = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
from stdmac_matrix import PRELUDE, build_tools, run_case, set_cell # noqa: E402
|
||||
|
||||
build_tools()
|
||||
|
||||
print("=== bit_raw_inc 单比特真值表(A+Cin -> S,Cout 期望) ===")
|
||||
for a in (0, 1):
|
||||
for cin in (0, 1):
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("Ci", cin)
|
||||
src += "bit_raw_inc A Ci S Co tmp\noutput S\noutput Co\n"
|
||||
print(" A=%d Ci=%d want=%s got=%s" % (a, cin, [a ^ cin, a & cin], run_case(src)))
|
||||
|
||||
print("\n=== raw_inc 全表 (a,cin) -> (S,Co) ===")
|
||||
bad = []
|
||||
for a in (0, 1, 2, 3, 5, 126, 127, 128, 170, 254, 255):
|
||||
for cin in (0, 1):
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("Ci", cin)
|
||||
src += "raw_inc A Ci S Co tmp\noutput S\noutput Co\n"
|
||||
got = run_case(src)
|
||||
want = [(a + cin) & 0xFF, (a + cin) >> 8]
|
||||
flag = "" if got == want else " <== 错"
|
||||
print(" A=%-4d Ci=%d want=%-10s got=%s%s" % (a, cin, want, got, flag))
|
||||
if got != want:
|
||||
bad.append((a, cin, want, got))
|
||||
|
||||
print("\n差异规律: got[0]^want[0] 与 A/Ci 关系")
|
||||
for a, cin, want, got in bad:
|
||||
print(" A=%-4d Ci=%d got_S=%-4d want_S=%-4d S^A=%d S^Ci=%d" % (a, cin, got[0], want[0], got[0] ^ a, got[0] ^ cin))
|
||||
@@ -0,0 +1,43 @@
|
||||
#!/usr/bin/env python3
|
||||
"""stdmac_inc_fix_probe.py — 验证 raw_inc 的接线假设(测试侧重写 glue,不动核心仓)。
|
||||
|
||||
若修正版通过全表 + 链式用例,则结论钉死:bit_raw_inc 体内 %3=Cout / %4=Sum(与注释相反),
|
||||
当前 raw_inc 把 S/Co 实参按注释顺序传,导致输出接反且进位链喂 Sum。
|
||||
"""
|
||||
import itertools
|
||||
import os
|
||||
import sys
|
||||
|
||||
HERE = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
from stdmac_matrix import PRELUDE, build_tools, run_case, set_cell # noqa: E402
|
||||
|
||||
build_tools()
|
||||
FRAG = open(os.path.join(HERE, "tests", "inc_fix_probe.r8asm.frag")).read()
|
||||
|
||||
VALS = [0, 1, 2, 3, 5, 126, 127, 128, 170, 254, 255]
|
||||
|
||||
for variant, call in (("原样 raw_inc", "raw_inc A Ci S Co tmp"),
|
||||
("修正 raw_inc_fix", "raw_inc_fix A Ci S Co tmp")):
|
||||
bad = []
|
||||
for a, cin in itertools.product(VALS, [0, 1]):
|
||||
src = PRELUDE + FRAG + set_cell("A", a) + set_cell("Ci", cin)
|
||||
src += "%s\noutput A\noutput Ci\noutput S\noutput Co\n" % call
|
||||
got = run_case(src)
|
||||
want = [a, cin, (a + cin) & 0xFF, (a + cin) >> 8]
|
||||
if got != want:
|
||||
bad.append((a, cin, want, got))
|
||||
print("%-18s 失败 %2d / %d 例" % (variant, len(bad), len(VALS) * 2))
|
||||
for a, cin, want, got in bad[:4]:
|
||||
print(" A=%-4d Ci=%d want=%s got=%s" % (a, cin, want, got))
|
||||
|
||||
print("\n=== 链式:修正版连续自增(输出用独立 cell D,避免 A/S 混叠) ===")
|
||||
for a in (126, 254):
|
||||
want = [a + 1, 0, (a + 2) & 0xFF, (a + 2) >> 8]
|
||||
src = PRELUDE + FRAG + set_cell("A", a) + set_cell("Ci", 1)
|
||||
src += ".var D 10\n.tp D\n.xor 0\n"
|
||||
src += "raw_inc_fix A Ci S Co tmp\noutput S\noutput Co\n"
|
||||
src += "raw_inc_fix S Ci D Co tmp\noutput D\noutput Co\n"
|
||||
got = run_case(src)
|
||||
print(" A=%d Ci=1 两次自增: S,Co,D,Co 期望 %s got=%s %s"
|
||||
% (a, want, got, "" if got == want else "<== 错"))
|
||||
@@ -0,0 +1,144 @@
|
||||
#!/usr/bin/env python3
|
||||
"""stdmac_matrix.py — r8asm_rev 标准宏真值矩阵压测。
|
||||
|
||||
对 raw_add / raw_and / raw_or / raw_xor / raw_inc 逐用例生成一段 .r8asm,
|
||||
走真实链路(probe_dump 汇编 -> ROT-8 VM 运行 -> 读 out 字节),与 Python 参考语义对拍。
|
||||
|
||||
用法:
|
||||
python3 tools/stdmac_matrix.py [r8asm_rev 路径]
|
||||
|
||||
依赖: ../r8asm_rev(核心仓)、../ROT-8(VM 仓),二者都会用 g++/gcc 现场编译探针。
|
||||
"""
|
||||
import itertools
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
HERE = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
REV = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else os.path.join(os.path.dirname(HERE), "r8asm_rev")
|
||||
ROT8 = os.path.join(os.path.dirname(HERE), "ROT-8")
|
||||
BUILD = os.path.join(HERE, "build")
|
||||
|
||||
PROBE = os.path.join(BUILD, "probe_dump")
|
||||
VM = os.path.join(BUILD, "rot8_vm")
|
||||
|
||||
|
||||
def build_tools():
|
||||
os.makedirs(BUILD, exist_ok=True)
|
||||
subprocess.run(
|
||||
["g++", "-std=c++20", "-I", os.path.join(REV, "include"),
|
||||
os.path.join(REV, "src", "r8asm.cc"), os.path.join(HERE, "tests", "probe_dump.cc"),
|
||||
"-o", PROBE], check=True)
|
||||
subprocess.run(
|
||||
["gcc", "-std=c11", "-I", os.path.join(ROT8, "include"),
|
||||
*[os.path.join(ROT8, "src", f) for f in os.listdir(os.path.join(ROT8, "src")) if f.endswith(".c")],
|
||||
os.path.join(ROT8, "tests", "vm_test.c"), "-o", VM], check=True)
|
||||
|
||||
|
||||
PRELUDE = """%include "asm/lib.r8asm"
|
||||
%include "asm/raw_add.r8asm"
|
||||
%include "asm/raw_and.r8asm"
|
||||
%include "asm/raw_or.r8asm"
|
||||
%include "asm/raw_xor.r8asm"
|
||||
%include "asm/raw_inc.r8asm"
|
||||
|
||||
.var A 0
|
||||
.var B 2
|
||||
.var Ci 4
|
||||
.var S 6
|
||||
.var Co 8
|
||||
.var tmp 1
|
||||
"""
|
||||
|
||||
|
||||
def set_cell(name, value):
|
||||
return ".tp {n}\n.xor {v}\n".format(n=name, v=value)
|
||||
|
||||
|
||||
def run_case(src):
|
||||
"""汇编 + 跑 VM,返回 out 吐出的整数列表。"""
|
||||
with tempfile.NamedTemporaryFile("w", suffix=".r8asm", delete=False, dir=REV) as f:
|
||||
f.write(src)
|
||||
path = f.name
|
||||
tape = tempfile.NamedTemporaryFile("w", suffix=".rot8", delete=False)
|
||||
tape.close()
|
||||
try:
|
||||
asm = subprocess.run([PROBE, path], cwd=REV, capture_output=True, text=True)
|
||||
if asm.returncode != 0:
|
||||
raise RuntimeError("汇编失败: " + asm.stderr.strip()[-300:])
|
||||
with open(tape.name, "w") as fh:
|
||||
fh.write(asm.stdout)
|
||||
vm = subprocess.run([VM, tape.name], capture_output=True, text=True)
|
||||
if vm.returncode != 0:
|
||||
raise RuntimeError("VM 失败: " + (vm.stderr.strip() or "rc=%d" % vm.returncode)[-300:])
|
||||
return [int(line) for line in vm.stdout.split() if line.strip()]
|
||||
finally:
|
||||
os.unlink(path)
|
||||
os.unlink(tape.name)
|
||||
|
||||
|
||||
def cmp(name, got, want, case, fails):
|
||||
ok = got == want
|
||||
if not ok:
|
||||
fails.append((name, case, want, got))
|
||||
return ok
|
||||
|
||||
|
||||
def main():
|
||||
build_tools()
|
||||
fails = []
|
||||
fails_exec = []
|
||||
|
||||
def safe(name, src, want, case):
|
||||
try:
|
||||
got = run_case(src)
|
||||
except RuntimeError as e:
|
||||
fails_exec.append((name, case, str(e)))
|
||||
return
|
||||
cmp(name, got, want, case, fails)
|
||||
|
||||
VALS = [0, 1, 2, 3, 5, 126, 127, 128, 170, 254, 255]
|
||||
|
||||
# ---- raw_add: S = (a+b+cin) & 0xFF, Co = carry out ----
|
||||
for a, b, cin in itertools.product(VALS, VALS, [0, 1]):
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("B", b) + set_cell("Ci", cin)
|
||||
src += "raw_add A B Ci S Co tmp\noutput S\noutput Co\n"
|
||||
tot = a + b + cin
|
||||
safe("raw_add", src, [tot & 0xFF, (tot >> 8) & 1], (a, b, cin))
|
||||
|
||||
# ---- raw_and / raw_or / raw_xor ----
|
||||
for op, py in (("raw_and", lambda x, y: x & y), ("raw_or", lambda x, y: x | y), ("raw_xor", lambda x, y: x ^ y)):
|
||||
for a, b in itertools.product(VALS, VALS):
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("B", b)
|
||||
src += "%s A B S tmp\noutput S\n" % op
|
||||
safe(op, src, [py(a, b)], (a, b))
|
||||
|
||||
# ---- raw_inc: S = (a+cin) & 0xFF, Co = carry out ----
|
||||
for a, cin in itertools.product(VALS, [0, 1]):
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("Ci", cin)
|
||||
src += "raw_inc A Ci S Co tmp\noutput S\noutput Co\n"
|
||||
tot = a + cin
|
||||
safe("raw_inc", src, [tot & 0xFF, (tot >> 8) & 1], (a, cin))
|
||||
|
||||
for name in ("raw_add", "raw_and", "raw_or", "raw_xor", "raw_inc"):
|
||||
n_all = len([f for f in fails if f[0] == name])
|
||||
n_err = len([f for f in fails_exec if f[0] == name])
|
||||
print("%-9s 语义错 %-4d 展开/运行炸 %-4d" % (name, n_all, n_err))
|
||||
|
||||
if fails:
|
||||
print("\n--- 语义错样例(最多 12 条) ---")
|
||||
for name, case, want, got in fails[:12]:
|
||||
print(" %-9s %-14s want=%-12s got=%s" % (name, case, want, got))
|
||||
if fails_exec:
|
||||
print("\n--- 展开/运行炸(最多 5 条) ---")
|
||||
for name, case, err in fails_exec[:5]:
|
||||
print(" %-9s %-14s %s" % (name, case, err))
|
||||
|
||||
total = len(fails) + len(fails_exec)
|
||||
print("\n总失败 %d 例" % total)
|
||||
return 1 if total else 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env python3
|
||||
"""stdmac_preserve.py — raw_* 宏的输入保留性检查(链式调用前提)。"""
|
||||
import os
|
||||
import sys
|
||||
|
||||
HERE = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
from stdmac_matrix import PRELUDE, build_tools, run_case, set_cell # noqa: E402
|
||||
|
||||
build_tools()
|
||||
|
||||
CASES = [(0, 0, 0), (1, 1, 1), (126, 11, 1), (255, 255, 1), (170, 85, 0), (128, 1, 1), (254, 3, 1)]
|
||||
|
||||
print("=== raw_add: 输入 A/B/Ci 是否保留 ===")
|
||||
for a, b, cin in CASES:
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("B", b) + set_cell("Ci", cin)
|
||||
src += "raw_add A B Ci S Co tmp\noutput A\noutput B\noutput Ci\noutput S\noutput Co\n"
|
||||
got = run_case(src)
|
||||
ok = got[0:3] == [a, b, cin]
|
||||
print(" (%3d,%3d,%d) -> A,B,Ci=%-14s S=%3d Co=%d %s" % (a, b, cin, got[0:3], got[3], got[4],
|
||||
"" if ok else "<== 输入被破坏"))
|
||||
|
||||
print("\n=== raw_and/raw_or/raw_xor: 输入 A/B 是否保留 (用不相交位避免与 xor bug 混淆) ===")
|
||||
for op in ("raw_and", "raw_or", "raw_xor"):
|
||||
for a, b, _ in CASES[:5]:
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("B", b)
|
||||
src += "%s A B S tmp\noutput A\noutput B\noutput S\n" % op
|
||||
got = run_case(src)
|
||||
ok = got[0:2] == [a, b]
|
||||
print(" %-8s (%3d,%3d) -> A,B=%-14s S=%3d %s" % (op, a, b, got[0:2], got[2],
|
||||
"" if ok else "<== 输入被破坏"))
|
||||
|
||||
print("\n=== raw_inc: 输入 A/Ci 是否保留 ===")
|
||||
for a, b, cin in CASES:
|
||||
src = PRELUDE + set_cell("A", a) + set_cell("Ci", cin)
|
||||
src += "raw_inc A Ci S Co tmp\noutput A\noutput Ci\noutput S\noutput Co\n"
|
||||
got = run_case(src)
|
||||
ok = got[0:2] == [a, cin]
|
||||
print(" (A=%3d,Ci=%d) -> A,Ci=%-14s S=%3d Co=%d %s" % (a, cin, got[0:2], got[2], got[3],
|
||||
"" if ok else "<== 输入被破坏"))
|
||||
@@ -0,0 +1,39 @@
|
||||
#!/usr/bin/env python3
|
||||
"""stdmac_xor_fix_probe.py — 验证 bit_raw_xor 候选体(OR 体删一行)。"""
|
||||
import itertools
|
||||
import os
|
||||
import sys
|
||||
|
||||
HERE = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
from stdmac_matrix import PRELUDE, build_tools, run_case, set_cell # noqa: E402
|
||||
|
||||
build_tools()
|
||||
FRAG = open(os.path.join(HERE, "tests", "xor_fix_probe.r8asm.frag")).read()
|
||||
|
||||
VALS = [0, 1, 2, 3, 5, 126, 127, 128, 170, 254, 255]
|
||||
|
||||
for variant, call in (("现役 raw_xor", "raw_xor A B S tmp"),
|
||||
("候选 raw_xor_cand", "raw_xor_cand A B S tmp")):
|
||||
bad = []
|
||||
for a, b in itertools.product(VALS, VALS):
|
||||
src = PRELUDE + FRAG + set_cell("A", a) + set_cell("B", b)
|
||||
src += "%s\noutput A\noutput B\noutput S\n" % call
|
||||
got = run_case(src)
|
||||
want = [a, b, a ^ b]
|
||||
if got != want:
|
||||
bad.append((a, b, want, got))
|
||||
print("%-20s 失败 %3d / %d 例" % (variant, len(bad), len(VALS) ** 2))
|
||||
for a, b, want, got in bad[:3]:
|
||||
print(" A=%-4d B=%-4d want=%s got=%s" % (a, b, want, got))
|
||||
|
||||
print("\n=== 候选:和 raw_and / raw_or 同一个 A,B 连跑(链式) ===")
|
||||
for a, b in ((126, 11), (170, 85), (255, 255)):
|
||||
src = PRELUDE + FRAG + set_cell("A", a) + set_cell("B", b)
|
||||
src += ".var D 10\n.tp D\n.xor 0\n"
|
||||
src += "raw_xor_cand A B S tmp\noutput S\n"
|
||||
src += "raw_and A B D tmp\noutput D\n"
|
||||
src += "raw_or A B D tmp\noutput D\n"
|
||||
got = run_case(src)
|
||||
want = [a ^ b, a & b, a | b]
|
||||
print(" (%3d,%3d) xor,and,or 期望 %s got=%s %s" % (a, b, want, got, "" if got == want else "<== 错"))
|
||||
Reference in new issue
Block a user