X-Git-Url: https://git.llucax.com/software/dgc/dgcbench.git/blobdiff_plain/c0a78176c710a53333b9daf864b2265495b2e009..HEAD:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index a8b02ea..c2bd3ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,80 +1,118 @@
 
-VERS    := naive
-DC      := dmd
-DL      := dmd
-GNUPLOT := gnuplot
-DFLAGS  += -defaultlib=tango-base-dmd-$(VERS) -debuglib=tango-base-dmd-$(VERS)
-DFLAGS  += -release -inline -O
-
-O := $(VERS)
+GC       := cdgc
+B        := build
+O        := $B/$(GC)
+DC       := ../dmd/src/dmd
+LD       := ../dmd/src/dmd
+LN       := ln
+GNUPLOT  := gnuplot
+override DFLAGS ?= -release -inline -O -gc
+LDFLAGS  := -defaultlib=tango-$(GC) -debuglib=tango-$(GC)
+LIBTANGO := ../lib/libtango-$(GC).a
 
 ifndef V
 P      = @
 P_DC   = @printf '   DC    %- 40s <-  %s\n' '$@' '$(if \
 		$(subst 1,,$(words $^)),$< ... $(lastword $^),$<)';
-P_PLOT = @printf '   PLOT  %- 40s <-  %s\n' '$@' '$(filter %.csv,$^)';
+P_PLOT = @printf '   PLOT  %- 40s <-  %s\n' '$@' '$(notdir $(filter %.csv,$^))';
 P_AWK  = @printf '   AWK   %- 40s <-  %s\n' '$@' '$<';
 P_RUN  = @printf '   RUN   $< $(args)\n';
 P_MAKE = @printf '   MAKE  $@\n';
 P_RM   = @printf '   RM    $^\n';
+P_LN   = @printf '   LN    %- 40s <-  %s\n' '$@' '$<';
 endif
 
 # create build directories if they don't already exist
-ifneq ($(wildcard $O),$O)
-dummy_mkdir := $(shell mkdir -p $O)
-endif
+dummy_mkdir := $(shell mkdir -p $O $O/bin $O/time $O/stats $O/pause)
 
-# don't use Gold with old DMDs
-ifeq ($(subst dmd,,$(DC)),)
-ifneq ($(strip $(shell ld --version | grep gold)),)
-export LD_ := /usr/bin/ld.single
-endif
-endif
+
+########################################################
+# general rules that doesn't depend on the GC variable #
+########################################################
 
 .PHONY: all
-all: naive
+all: basic cdgc
+
+.PHONY: cdgc basic
+cdgc basic:
+	$(P_MAKE) $(MAKE) --no-print-directory micro-gc-build dil-gc-build GC=$@
+
+
+.PHONY: clean-all clean-cdgc clean-basic
+clean-all: clean-cdgc clean-basic
+clean-cdgc:
+	$(P_MAKE) $(MAKE) --no-print-directory clean GC=cdgc
+clean-basic:
+	$(P_MAKE) $(MAKE) --no-print-directory clean GC=basic
 
-.PHONY: naive basic
-naive basic:
-	$(P_MAKE) $(MAKE) --no-print-directory micro VERS=$@
 
+#########################################
+# rules that depends on the GC variable #
+#########################################
 
 # micro
 ########
 
-.PHONY: build-micro
-build-micro: $(patsubst %.d,$O/%,$(wildcard micro/*.d))
+micro-src := $(wildcard micro/*.d)
+
+.PHONY: micro-gc-build
+micro-gc-build: $(patsubst micro/%.d,$O/bin/%,$(wildcard micro/*.d))
+
+.PRECIOUS: $O/bin/%
+$O/bin/%: $O/micro/%.o $(LIBTANGO)
+	$(P_DC) $(DC) $(LDFLAGS) -of$@ $^
+
+.PHONY: micro-gc-stats
+micro-gc-stats: $(patsubst micro/%.d,$O/stats/%.eps,$(wildcard micro/*.d))
+
+# special command line arguments for 'shootout_binarytrees' micro benchmark
+$O/stats/shootout_binarytrees.c.csv $O/stats/shootout_binarytrees.a.csv: \
+	override args := 16
+
+# special command line arguments for 'split' micro benchmark
+$O/stats/split.c.csv $O/stats/split.a.csv: override args := micro/bible.txt 2
+
+# special command line arguments for 'voronoi' micro benchmark
+$O/stats/voronoi.c.csv $O/voronoi/split.a.csv: override args := -n 30000
+
+
+# dil
+######
 
-.PHONY: micro
-micro: $(patsubst %.d,$O/%.eps,$(wildcard micro/*.d))
+DIL_SRC = $(wildcard dil/src/*.d dil/src/cmd/*.d dil/src/util/*.d \
+			dil/src/dil/*.d dil/src/dil/*/*.d)
 
-# special command line arguments 'split' micro benchmark
-$O/micro/split.c.csv $O/micro/split.a.csv: override args := micro/bible.txt
+.PHONY: dil-gc-build
+dil-gc-build: $O/bin/dil
+$O/bin/dil: override DFLAGS += -Idil/src
+$O/bin/dil: $(patsubst %.d,$O/%.o,$(DIL_SRC)) $(LIBTANGO)
+	$(P_DC) $(DC) $(LDFLAGS) -L-lmpfr -L-lgmp -of$@ $^
 
 
 # common rules
 ###############
 
-.PRECIOUS: $O/%
-$O/%: %.d
-	$(P_DC) $(DC) $(DFLAGS) -of$@ $^
+.PRECIOUS: $O/%.o
+$O/%.o: %.d
+	$(P_DC) $(DC) -c $(DFLAGS) -of$@ $^
 
-.PRECIOUS: $O/%.c.csv $O/%.a.csv
-$O/%.c.csv $O/%.a.csv: $O/%
+.PRECIOUS: $O/stats/%.c.csv $O/stats/%.a.csv
+$O/stats/%.c.csv $O/stats/%.a.csv: $O/bin/%
 	$(P_RUN) D_GC_STATS=1 ./$< $(args)
-	$P mv gc-collections.csv $O/$*.c.csv
-	$P mv gc-mallocs.csv $O/$*.a.csv
+	$P mv gc-collections.csv $O/stats/$*.c.csv
+	$P mv gc-mallocs.csv $O/stats/$*.a.csv
 
-.PRECIOUS: $O/%.h.csv
-$O/%.h.csv: $O/%.a.csv hist.awk
+.PRECIOUS: $O/stats/%.h.csv
+$O/stats/%.h.csv: $O/stats/%.a.csv hist.awk
 	$(P_AWK) awk -F, -f $(lastword $^) $< > $@
 
-.PRECIOUS: $O/%.tics
-$O/%.tics: $O/%.h.csv tics.awk
+.PRECIOUS: $O/stats/%.tics
+$O/stats/%.tics: $O/stats/%.h.csv tics.awk
 	$(P_AWK) awk -F, -f $(lastword $^) $< > $@
 
-$O/%.eps: $O/%.c.csv $O/%.a.csv $O/%.h.csv $O/%.tics plot.gpi
-	$(P_PLOT) sed "s|@@PRG@@|$(*F)|g; s|@@COL@@|$(VERS)|g; \
+$O/stats/%.eps: $O/stats/%.c.csv $O/stats/%.a.csv $O/stats/%.h.csv \
+			 $O/stats/%.tics plot.gpi
+	$(P_PLOT) sed "s|@@PRG@@|$(*F)|g; s|@@COL@@|$(GC)|g; \
 			s|@@INC@@|$(word 1,$^)|g; s|@@INA@@|$(word 2,$^)|g; \
 			s|@@INH@@|$(word 3,$^)|g; s|@@OUT@@|$@|g; \
 			s|@@TICS@@|$(shell cat $(word 4,$^))|g" $(word 5,$^) \