`metric chars|flat|blocks` inside %synth meant the same truth table could be
searched twice for two call sites, and every library block had to spell out
`metric flat` to avoid the default. The cost model belongs to the whole
assembly, so it is one now:
r8forge <file.r8asm> flat (layout free), the default
r8forge --synth-chars <file.r8asm> charge the real .tp walk
flat stays the default because a library block is expanded at dozens of call
sites with different layouts: only a layout free result can share one cache
entry, and it is usually within a few percent (full_add: 95 vs 90 characters).
The chars search is far more expensive (full_add: 415M states, ~21 minutes,
~10 GB), which is exactly why it should be asked for on the command line.
`metric blocks` goes with it: block count is a poor proxy for tape length (and
it was only another way to ask for mode layers).
Implementation: the metric lives in the assembler (ast::synth_metric, default
1) and is set through r8asm::set_synth_metric() before import_file; the CLI in
tests/asm_test.cc parses --synth-chars / --synth-flat. The cache key already
carried metric, so the committed entries still hit: assembling the library and
asm/test.r8asm gives byte identical tapes (28729 characters, byte_op_test all
green, all 13 examples green, synth_test still 8/8).
A `metric` line now fails with a message that names the flag instead of being
silently ignored. examples/full_add_flat.r8asm and full_add_flat_spaced.r8asm
are removed: they only existed to demonstrate the per block metric (the flat
default makes them copies of full_add.r8asm).
Also repairs the mojibake in README's metric section: an earlier tool wrote
\x0c / \x08 / \x0d where \f, \b and \r belonged, which ate characters out of
"flat", "blocks", "biz/flb/rnz" and "rnz". The section is rewritten for the
flag, and the %synth numbers in README/SPEC/AGENTS now match what the tree
prints.
New cache entry c16bf083bb0ccbc8.txt is full_add's stat table with mode layers
+ flat, which full_add_stat.r8asm now produces.
66 lines
1.2 KiB
Plaintext
66 lines
1.2 KiB
Plaintext
%include "asm/lib.r8asm"
|
|
|
|
; bit 宏由 %synth 合成。
|
|
; stat 那张表是用 r8forge_derive 在旧实现上跑出来的:6 个参数、64 个输入组合,
|
|
; 每项是该组合下 6 个 bit 的终值。合成结果因此和旧实现逐位一致。
|
|
|
|
; Macro bit_raw_add
|
|
; %1: CellBit A
|
|
; %2: CellBit B
|
|
; %3: CellBit Ci
|
|
; %4: CellBit S
|
|
; %5: CellBit Co
|
|
; %6: CellBit buf
|
|
%synth bit_raw_add_synth
|
|
params 6
|
|
stat 0 9 10 19 12 21 22 31 0 9 10 19 12 21 22 31 0 9 10 19 12 21 22 31 0 9 10 19 12 21 22 31 0 9 10 19 12 21 22 31 0 9 10 19 12 21 22 31 0 9 10 19 12 21 22 31 0 9 10 19 12 21 22 31
|
|
mode tape
|
|
%endsynth
|
|
|
|
%macro bit_raw_add 6
|
|
.tp %4
|
|
set_0
|
|
.tp %5
|
|
set_0
|
|
.tp %6
|
|
set_0
|
|
bit_raw_add_synth %1 %2 %3 %4 %5 %6
|
|
%endmacro
|
|
|
|
|
|
; Macro raw_add
|
|
; %1: Cell A
|
|
; %2: Cell B
|
|
; %3: CellBit Ci
|
|
; %4: Cell S
|
|
; %5: CellBit Co
|
|
; %6: Cell tmp
|
|
%macro raw_add 6
|
|
.anchor before_raw_add
|
|
|
|
.tp %3
|
|
bit_copy %6 %5
|
|
.tp %6
|
|
ror
|
|
|
|
%rep _CELL_SIZE
|
|
bit_raw_add %1 %2 %3 %4 %5 %6
|
|
.tp %5
|
|
clb_bit_mov %3
|
|
.tp %1
|
|
ror
|
|
.tp %2
|
|
ror
|
|
.tp %4
|
|
ror
|
|
%endrep
|
|
|
|
.tp %3
|
|
clb_bit_mov %5
|
|
.tp %6
|
|
rol
|
|
clb_bit_mov %3
|
|
|
|
.tp before_raw_add
|
|
%endmacro
|