diff --git a/code-size-benchmark/Makefile b/code-size-benchmark/Makefile index 02dc461..79841af 100644 --- a/code-size-benchmark/Makefile +++ b/code-size-benchmark/Makefile @@ -6,32 +6,35 @@ all: $(TARGETS) lib/libmorph_%.so: src/%.c $(CC) -O3 -shared -o $@ -fPIC -Iinclude $< -posint-dec-to-hex-generated.c: - cargo run -- \ +ldmc: + cargo install --path .. + +posint-dec-to-hex-generated.c: ldmc + ldmc \ "ℕ~<PosInt 10 BigEndian>~<Seq~<ValueTerminated '\\0'> <Digit 10>~Char~Ascii~x86.UInt8>" \ "ℕ~<PosInt 16 BigEndian>~<Seq~<ValueTerminated '\\0'> <Digit 16>~Char~Ascii~x86.UInt8>" \ - ../morphisms/*.morphism-base >| $@ + ../morphisms/*.morphism-base >| target/$@ posint-dec-to-hex-generated-gcc: posint-dec-to-hex-generated.c - gcc -g -Os -flto -o $@ -I../morphisms/include $< ../morphisms/src/length-prefix.c + gcc -g -Os -flto -o target/$@ -I../morphisms/runtime/include target/$< ../morphisms/runtime/src/*.c posint-dec-to-hex-generated-clang: posint-dec-to-hex-generated.c - clang -g -Os -flto -o $@ -I../morphisms/include $< ../morphisms/src/length-prefix.c + clang -g -Os -flto -o target/$@ -I../morphisms/runtime/include target/$< ../morphisms/runtime/src/*.c posint-dec-to-hex-optimal-gcc: posint-dec-to-hex-optimal.c - gcc -g -Os -flto -o $@ $< + gcc -g -Os -flto -o target/$@ target/$< posint-dec-to-hex-optimal-clang: posint-dec-to-hex-optimal.c - clang -g -Os -flto -o $@ $< + clang -g -Os -flto -o target/$@ target/$< code-size-benchmark: posint-dec-to-hex-generated-gcc \ posint-dec-to-hex-generated-clang \ posint-dec-to-hex-optimal-gcc \ posint-dec-to-hex-optimal-clang - INST_COUNT_GEN_GCC=$(shell gdb --batch -ex "file posint-dec-to-hex-generated-gcc" -ex "disassemble main" | wc -l) - INST_COUNT_GEN_CLANG=$(shell gdb --batch -ex "file posint-dec-to-hex-generated-clang" -ex "disassemble main" | wc -l) - INST_COUNT_OPT_GCC=$(shell gdb --batch -ex "file posint-dec-to-hex-optimal-gcc" -ex "disassemble main" | wc -l) - INST_COUNT_OPT_CLANG=$(shell gdb --batch -ex "file posint-dec-to-hex-optimal-clang" -ex "disassemble main" | wc -l) + INST_COUNT_GEN_GCC=$(shell gdb --batch -ex "file target/posint-dec-to-hex-generated-gcc" -ex "disassemble main" | wc -l) + INST_COUNT_GEN_CLANG=$(shell gdb --batch -ex "file target/posint-dec-to-hex-generated-clang" -ex "disassemble main" | wc -l) + INST_COUNT_OPT_GCC=$(shell gdb --batch -ex "file target/posint-dec-to-hex-optimal-gcc" -ex "disassemble main" | wc -l) + INST_COUNT_OPT_CLANG=$(shell gdb --batch -ex "file target/posint-dec-to-hex-optimal-clang" -ex "disassemble main" | wc -l) clean: rm $(TARGETS) diff --git a/morphisms/include/array/length-prefix.h b/morphisms/runtime/include/array/length-prefix.h similarity index 100% rename from morphisms/include/array/length-prefix.h rename to morphisms/runtime/include/array/length-prefix.h diff --git a/morphisms/src/length-prefix.c b/morphisms/runtime/src/length-prefix.c similarity index 100% rename from morphisms/src/length-prefix.c rename to morphisms/runtime/src/length-prefix.c