wingo pushed a commit to branch wip-whippet
in repository guile.
commit 07d7df195208c8dcc1edae825426613dc3e99507
Author: Andy Wingo <wi...@igalia.com>
AuthorDate: Mon Aug 7 09:28:45 2023 +0200
Update benchmark target names
---
.gitignore | 17 ++++++++++--
Makefile | 92 +++++++++++++++++++++++++++++++-------------------------------
2 files changed, 60 insertions(+), 49 deletions(-)
diff --git a/.gitignore b/.gitignore
index 64f222418..8dd74cd6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,16 @@
/*.d
/*.o
-/*-ephemerons
-/*-mt-gcbench
-/*-quads
+/*.bdw
+/*.semi
+/*.whippet
+/*.generational-whippet
+/*.parallel-whippet
+/*.parallel-generational-whippet
+/*.stack-conservative-whippet
+/*.stack-conservative-generational-whippet
+/*.stack-conservative-parallel-whippet
+/*.stack-conservative-parallel-generational-whippet
+/*.heap-conservative-whippet
+/*.heap-conservative-generational-whippet
+/*.heap-conservative-parallel-whippet
+/*.heap-conservative-parallel-generational-whippet
diff --git a/Makefile b/Makefile
index 61165242b..5f959c210 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(OUTPUT_OPTION)
LINK=$(CC) $(LDFLAGS) -o $@
PLATFORM=gnu-linux
-ALL_TESTS=$(foreach COLLECTOR,$(COLLECTORS),$(addprefix
$(COLLECTOR)-,$(TESTS)))
+ALL_TESTS=$(foreach COLLECTOR,$(COLLECTORS),$(addsuffix
.$(COLLECTOR),$(TESTS)))
all: $(ALL_TESTS)
@@ -49,112 +49,112 @@ gc-stack.o: src/gc-stack.c
gc-options.o: src/gc-options.c api/gc-options.h src/gc-options-internal.h
$(COMPILE) -c $<
-gc-ephemeron-%.o: src/gc-ephemeron.c api/gc-ephemeron.h
src/gc-ephemeron-internal.h benchmarks/%-embedder.h
+%.gc-ephemeron.o: src/gc-ephemeron.c api/gc-ephemeron.h
src/gc-ephemeron-internal.h benchmarks/%-embedder.h
$(COMPILE) -include benchmarks/$*-embedder.h -c $<
-bdw-%-gc.o: src/bdw.c benchmarks/%-embedder.h benchmarks/%.c
+%.bdw.gc.o: src/bdw.c benchmarks/%-embedder.h benchmarks/%.c
$(COMPILE) -DGC_CONSERVATIVE_ROOTS=1 -DGC_CONSERVATIVE_TRACE=1
`pkg-config --cflags bdw-gc` -include benchmarks/$*-embedder.h -c src/bdw.c
-bdw-%.o: src/bdw.c benchmarks/%.c
+%.bdw.o: src/bdw.c benchmarks/%.c
$(COMPILE) -DGC_CONSERVATIVE_ROOTS=1 -DGC_CONSERVATIVE_TRACE=1 -include
api/bdw-attrs.h -c benchmarks/$*.c
-bdw-%: bdw-%.o bdw-%-gc.o gc-stack.o gc-options.o gc-platform.o
gc-ephemeron-%.o
+%.bdw: %.bdw.o %.bdw.gc.o gc-stack.o gc-options.o gc-platform.o
%.gc-ephemeron.o
$(LINK) `pkg-config --libs bdw-gc` $^
-semi-%-gc.o: src/semi.c benchmarks/%-embedder.h
+%.semi.gc.o: src/semi.c benchmarks/%-embedder.h
$(COMPILE) -DGC_PRECISE_ROOTS=1 -include benchmarks/$*-embedder.h -c
src/semi.c
-semi-%.o: src/semi.c benchmarks/%.c
+%.semi.o: src/semi.c benchmarks/%.c
$(COMPILE) -DGC_PRECISE_ROOTS=1 -include api/semi-attrs.h -c
benchmarks/$*.c
-semi-%: semi-%.o semi-%-gc.o gc-stack.o gc-options.o gc-platform.o
gc-ephemeron-%.o
+%.semi: %.semi.o %.semi.gc.o gc-stack.o gc-options.o gc-platform.o
%.gc-ephemeron.o
$(LINK) $^
-whippet-%-gc.o: src/whippet.c benchmarks/%-embedder.h
+%.whippet.gc.o: src/whippet.c benchmarks/%-embedder.h
$(COMPILE) -DGC_PRECISE_ROOTS=1 -include benchmarks/$*-embedder.h -c
src/whippet.c
-whippet-%.o: src/whippet.c benchmarks/%.c
+%.whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_PRECISE_ROOTS=1 -include api/whippet-attrs.h -c
benchmarks/$*.c
-whippet-%: whippet-%.o whippet-%-gc.o gc-stack.o gc-options.o gc-platform.o
gc-ephemeron-%.o
+%.whippet: %.whippet.o %.whippet.gc.o gc-stack.o gc-options.o gc-platform.o
%.gc-ephemeron.o
$(LINK) $^
-stack-conservative-whippet-%-gc.o: src/whippet.c benchmarks/%-embedder.h
+%.stack-conservative-whippet.gc.o: src/whippet.c benchmarks/%-embedder.h
$(COMPILE) -DGC_CONSERVATIVE_ROOTS=1 -include benchmarks/$*-embedder.h
-c src/whippet.c
-stack-conservative-whippet-%.o: src/whippet.c benchmarks/%.c
+%.stack-conservative-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_CONSERVATIVE_ROOTS=1 -include api/whippet-attrs.h -c
benchmarks/$*.c
-stack-conservative-whippet-%: stack-conservative-whippet-%.o
stack-conservative-whippet-%-gc.o gc-stack.o gc-options.o gc-platform.o
gc-ephemeron-%.o
+%.stack-conservative-whippet: %.stack-conservative-whippet.o
%.stack-conservative-whippet.gc.o gc-stack.o gc-options.o gc-platform.o
%.gc-ephemeron.o
$(LINK) $^
-heap-conservative-whippet-%-gc.o: src/whippet.c benchmarks/%-embedder.h
+%.heap-conservative-whippet.gc.o: src/whippet.c benchmarks/%-embedder.h
$(COMPILE) -DGC_CONSERVATIVE_ROOTS=1 -DGC_CONSERVATIVE_TRACE=1 -include
benchmarks/$*-embedder.h -c src/whippet.c
-heap-conservative-whippet-%.o: src/whippet.c benchmarks/%.c
+%.heap-conservative-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_CONSERVATIVE_ROOTS=1 -DGC_CONSERVATIVE_TRACE=1 -include
api/whippet-attrs.h -c benchmarks/$*.c
-heap-conservative-whippet-%: heap-conservative-whippet-%.o
heap-conservative-whippet-%-gc.o gc-stack.o gc-options.o gc-platform.o
gc-ephemeron-%.o
+%.heap-conservative-whippet: %.heap-conservative-whippet.o
%.heap-conservative-whippet.gc.o gc-stack.o gc-options.o gc-platform.o
%.gc-ephemeron.o
$(LINK) $^
-parallel-whippet-%-gc.o: src/whippet.c benchmarks/%-embedder.h
+%.parallel-whippet.gc.o: src/whippet.c benchmarks/%-embedder.h
$(COMPILE) -DGC_PARALLEL=1 -DGC_PRECISE_ROOTS=1 -include
benchmarks/$*-embedder.h -c src/whippet.c
-parallel-whippet-%.o: src/whippet.c benchmarks/%.c
+%.parallel-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_PARALLEL=1 -DGC_PRECISE_ROOTS=1 -include
api/whippet-attrs.h -c benchmarks/$*.c
-parallel-whippet-%: parallel-whippet-%.o parallel-whippet-%-gc.o gc-stack.o
gc-options.o gc-platform.o gc-ephemeron-%.o
+%.parallel-whippet: %.parallel-whippet.o %.parallel-whippet.gc.o gc-stack.o
gc-options.o gc-platform.o %.gc-ephemeron.o
$(LINK) $^
-stack-conservative-parallel-whippet-%-gc.o: src/whippet.c
benchmarks/%-embedder.h
+%.stack-conservative-parallel-whippet.gc.o: src/whippet.c
benchmarks/%-embedder.h
$(COMPILE) -DGC_PARALLEL=1 -DGC_CONSERVATIVE_ROOTS=1 -include
benchmarks/$*-embedder.h -c src/whippet.c
-stack-conservative-parallel-whippet-%.o: src/whippet.c benchmarks/%.c
+%.stack-conservative-parallel-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_PARALLEL=1 -DGC_CONSERVATIVE_ROOTS=1 -include
api/whippet-attrs.h -c benchmarks/$*.c
-stack-conservative-parallel-whippet-%: stack-conservative-parallel-whippet-%.o
stack-conservative-parallel-whippet-%-gc.o gc-stack.o gc-options.o
gc-platform.o gc-ephemeron-%.o
+%.stack-conservative-parallel-whippet: %.stack-conservative-parallel-whippet.o
%.stack-conservative-parallel-whippet.gc.o gc-stack.o gc-options.o
gc-platform.o %.gc-ephemeron.o
$(LINK) $^
-heap-conservative-parallel-whippet-%-gc.o: src/whippet.c
benchmarks/%-embedder.h
+%.heap-conservative-parallel-whippet.gc.o: src/whippet.c
benchmarks/%-embedder.h
$(COMPILE) -DGC_PARALLEL=1 -DGC_CONSERVATIVE_ROOTS=1
-DGC_CONSERVATIVE_TRACE=1 -include benchmarks/$*-embedder.h -c src/whippet.c
-heap-conservative-parallel-whippet-%.o: src/whippet.c benchmarks/%.c
+%.heap-conservative-parallel-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_PARALLEL=1 -DGC_CONSERVATIVE_ROOTS=1
-DGC_CONSERVATIVE_TRACE=1 -DGC_FULLY_CONSERVATIVE=1 -include
api/whippet-attrs.h -c benchmarks/$*.c
-heap-conservative-parallel-whippet-%: heap-conservative-parallel-whippet-%.o
heap-conservative-parallel-whippet-%-gc.o gc-stack.o gc-options.o gc-platform.o
gc-ephemeron-%.o
+%.heap-conservative-parallel-whippet: %.heap-conservative-parallel-whippet.o
%.heap-conservative-parallel-whippet.gc.o gc-stack.o gc-options.o gc-platform.o
%.gc-ephemeron.o
$(LINK) $^
-generational-whippet-%-gc.o: src/whippet.c benchmarks/%-embedder.h
+%.generational-whippet.gc.o: src/whippet.c benchmarks/%-embedder.h
$(COMPILE) -DGC_GENERATIONAL=1 -DGC_PRECISE_ROOTS=1 -include
benchmarks/$*-embedder.h -c src/whippet.c
-generational-whippet-%.o: src/whippet.c benchmarks/%.c
+%.generational-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_GENERATIONAL=1 -DGC_PRECISE_ROOTS=1 -include
api/whippet-attrs.h -c benchmarks/$*.c
-generational-whippet-%: generational-whippet-%.o generational-whippet-%-gc.o
gc-stack.o gc-options.o gc-platform.o gc-ephemeron-%.o
+%.generational-whippet: %.generational-whippet.o %.generational-whippet.gc.o
gc-stack.o gc-options.o gc-platform.o %.gc-ephemeron.o
$(LINK) $^
-stack-conservative-generational-whippet-%-gc.o: src/whippet.c
benchmarks/%-embedder.h
+%.stack-conservative-generational-whippet.gc.o: src/whippet.c
benchmarks/%-embedder.h
$(COMPILE) -DGC_GENERATIONAL=1 -DGC_CONSERVATIVE_ROOTS=1 -include
benchmarks/$*-embedder.h -c src/whippet.c
-stack-conservative-generational-whippet-%.o: src/whippet.c benchmarks/%.c
+%.stack-conservative-generational-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_GENERATIONAL=1 -DGC_CONSERVATIVE_ROOTS=1 -include
api/whippet-attrs.h -c benchmarks/$*.c
-stack-conservative-generational-whippet-%:
stack-conservative-generational-whippet-%.o
stack-conservative-generational-whippet-%-gc.o gc-stack.o gc-options.o
gc-platform.o gc-ephemeron-%.o
+%.stack-conservative-generational-whippet:
%.stack-conservative-generational-whippet.o
%.stack-conservative-generational-whippet.gc.o gc-stack.o gc-options.o
gc-platform.o %.gc-ephemeron.o
$(LINK) $^
-heap-conservative-generational-whippet-%-gc.o: src/whippet.c
benchmarks/%-embedder.h
+%.heap-conservative-generational-whippet.gc.o: src/whippet.c
benchmarks/%-embedder.h
$(COMPILE) -DGC_GENERATIONAL=1 -DGC_CONSERVATIVE_ROOTS=1
-DGC_CONSERVATIVE_TRACE=1 -include benchmarks/$*-embedder.h -c src/whippet.c
-heap-conservative-generational-whippet-%.o: src/whippet.c benchmarks/%.c
+%.heap-conservative-generational-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_GENERATIONAL=1 -DGC_CONSERVATIVE_ROOTS=1
-DGC_CONSERVATIVE_TRACE=1 -include api/whippet-attrs.h -c benchmarks/$*.c
-heap-conservative-generational-whippet-%:
heap-conservative-generational-whippet-%.o
heap-conservative-generational-whippet-%-gc.o gc-stack.o gc-options.o
gc-platform.o gc-ephemeron-%.o
+%.heap-conservative-generational-whippet:
%.heap-conservative-generational-whippet.o
%.heap-conservative-generational-whippet.gc.o gc-stack.o gc-options.o
gc-platform.o %.gc-ephemeron.o
$(LINK) $^
-parallel-generational-whippet-%-gc.o: src/whippet.c benchmarks/%-embedder.h
+%.parallel-generational-whippet.gc.o: src/whippet.c benchmarks/%-embedder.h
$(COMPILE) -DGC_PARALLEL=1 -DGC_GENERATIONAL=1 -DGC_PRECISE_ROOTS=1
-include benchmarks/$*-embedder.h -c src/whippet.c
-parallel-generational-whippet-%.o: src/whippet.c benchmarks/%.c
+%.parallel-generational-whippet.o: src/whippet.c benchmarks/%.c
$(COMPILE) -DGC_PARALLEL=1 -DGC_GENERATIONAL=1 -DGC_PRECISE_ROOTS=1
-include api/whippet-attrs.h -c benchmarks/$*.c
-parallel-generational-whippet-%: parallel-generational-whippet-%.o
parallel-generational-whippet-%-gc.o gc-stack.o gc-options.o gc-platform.o
gc-ephemeron-%.o
+%.parallel-generational-whippet: %.parallel-generational-whippet.o
%.parallel-generational-whippet.gc.o gc-stack.o gc-options.o gc-platform.o
%.gc-ephemeron.o
$(LINK) $^
-stack-conservative-parallel-generational-whippet-%-gc.o: src/whippet.c
benchmarks/%-embedder.h
+%.stack-conservative-parallel-generational-whippet.gc.o: src/whippet.c
benchmarks/%-embedder.h
$(COMPILE) -DGC_PARALLEL=1 -DGC_GENERATIONAL=1
-DGC_CONSERVATIVE_ROOTS=1 -include benchmarks/$*-embedder.h -c src/whippet.c
-stack-conservative-parallel-generational-whippet-%.o: src/whippet.c
benchmarks/%.c
+%.stack-conservative-parallel-generational-whippet.o: src/whippet.c
benchmarks/%.c
$(COMPILE) -DGC_PARALLEL=1 -DGC_GENERATIONAL=1
-DGC_CONSERVATIVE_ROOTS=1 -include api/whippet-attrs.h -c benchmarks/$*.c
-stack-conservative-parallel-generational-whippet-%:
stack-conservative-parallel-generational-whippet-%.o
stack-conservative-parallel-generational-whippet-%-gc.o gc-stack.o gc-options.o
gc-platform.o gc-ephemeron-%.o
+%.stack-conservative-parallel-generational-whippet:
%.stack-conservative-parallel-generational-whippet.o
%.stack-conservative-parallel-generational-whippet.gc.o gc-stack.o gc-options.o
gc-platform.o %.gc-ephemeron.o
$(LINK) $^
-heap-conservative-parallel-generational-whippet-%-gc.o: src/whippet.c
benchmarks/%-embedder.h
+%.heap-conservative-parallel-generational-whippet.gc.o: src/whippet.c
benchmarks/%-embedder.h
$(COMPILE) -DGC_PARALLEL=1 -DGC_GENERATIONAL=1
-DGC_CONSERVATIVE_ROOTS=1 -DGC_CONSERVATIVE_TRACE=1 -include
benchmarks/$*-embedder.h -c src/whippet.c
-heap-conservative-parallel-generational-whippet-%.o: src/whippet.c
benchmarks/%.c
+%.heap-conservative-parallel-generational-whippet.o: src/whippet.c
benchmarks/%.c
$(COMPILE) -DGC_PARALLEL=1 -DGC_GENERATIONAL=1
-DGC_CONSERVATIVE_ROOTS=1 -DGC_CONSERVATIVE_TRACE=1 -include
api/whippet-attrs.h -c benchmarks/$*.c
-heap-conservative-parallel-generational-whippet-%:
heap-conservative-parallel-generational-whippet-%.o
heap-conservative-parallel-generational-whippet-%-gc.o gc-stack.o gc-options.o
gc-platform.o gc-ephemeron-%.o
+%.heap-conservative-parallel-generational-whippet:
%.heap-conservative-parallel-generational-whippet.o
%.heap-conservative-parallel-generational-whippet.gc.o gc-stack.o gc-options.o
gc-platform.o %.gc-ephemeron.o
$(LINK) $^
-include gc-platform.d gc-stack.d gc-options.d
-include $(foreach COLLECTOR,$(COLLECTORS),gc-ephemeron-$(COLLECTOR).d)
--include $(foreach TEST,$(ALL_TESTS),$(TEST)-gc.d $(TEST).d)
+-include $(foreach TEST,$(ALL_TESTS),$(TEST).gc.d $(TEST).d)
-.PRECIOUS: $(ALL_TESTS) $(foreach TEST,$(ALL_TESTS),$(TEST)-gc.o $(TEST).o)
+.PRECIOUS: $(ALL_TESTS) $(foreach TEST,$(ALL_TESTS),$(TEST).gc.o $(TEST).o)
clean:
rm -f $(ALL_TESTS) *.d *.o
