`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.
60 lines
1.6 KiB
C++
60 lines
1.6 KiB
C++
// The assembler CLI.
|
|
//
|
|
// r8forge [--synth-chars] <file.r8asm>
|
|
//
|
|
// %synth charges a block for a layout free tape by default: the block is
|
|
// copied to many call sites, so the .tp walk is not part of the search and one
|
|
// cache entry serves every layout. --synth-chars charges the real characters
|
|
// for the layout written in the source instead (much slower, and the result is
|
|
// only optimal for that layout). It is a property of the run, not of a block,
|
|
// which is why there is no `metric` line inside %synth any more.
|
|
#include "r8forge/r8asm.hh"
|
|
#include <iostream>
|
|
#include <string>
|
|
|
|
namespace {
|
|
|
|
void usage() {
|
|
std::cerr << "usage: r8forge [--synth-chars] <file.r8asm>\n";
|
|
}
|
|
|
|
} // namespace
|
|
|
|
int main(int argc, char **argv) {
|
|
const char *file = nullptr;
|
|
int metric = 1; // layout free
|
|
for (int i = 1; i < argc; i++) {
|
|
const std::string arg = argv[i];
|
|
if (arg == "--synth-chars") {
|
|
metric = 0;
|
|
} else if (arg == "--synth-flat") {
|
|
metric = 1;
|
|
} else if (arg == "-h" || arg == "--help") {
|
|
usage();
|
|
return (0);
|
|
} else if (arg.size() > 1 && arg[0] == '-') {
|
|
std::cerr << "unknown option '" << arg << "'\n";
|
|
usage();
|
|
return (2);
|
|
} else if (file == nullptr) {
|
|
file = argv[i];
|
|
} else {
|
|
usage();
|
|
return (2);
|
|
}
|
|
}
|
|
if (file == nullptr) {
|
|
usage();
|
|
return (2);
|
|
}
|
|
r8asm a;
|
|
a.set_synth_metric(metric);
|
|
if (!a.import_file(file, kDefaultCellSize))
|
|
return (1);
|
|
std::string tape = a.export_rot8();
|
|
if (a.failed())
|
|
return (1);
|
|
std::cout << tape;
|
|
return (0);
|
|
}
|