Add a helper script to improve accuracy when benchmarking

[software/dgc/dgcbench.git] / Makefile

diff --git a/Makefile b/Makefile
index 5ff8b622e1442f52944058bc6b4194bfae05604a..f32edb62ae29a89359ab1a75cdd78e23975b3a37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 
 GC       := cdgc
 
 GC       := cdgc

-O        := build/$(GC)
-DC       := dmd
-LD       := dmd
+B        := build
+O        := $B/$(GC)
+DC       := ../dmd/src/dmd
+LD       := ../dmd/src/dmd

 LN       := ln
 LN       := ln

-GNUPLOT  := gnuplot
+TIME     := /usr/bin/time

 override DFLAGS ?= -release -inline -O -gc
 LDFLAGS  := -defaultlib=tango-$(GC) -debuglib=tango-$(GC)
 LIBTANGO := ../lib/libtango-$(GC).a
 override DFLAGS ?= -release -inline -O -gc
 LDFLAGS  := -defaultlib=tango-$(GC) -debuglib=tango-$(GC)
 LIBTANGO := ../lib/libtango-$(GC).a


@@ -13,7 +14,7 @@ ifndef V
 P      = @
 P_DC   = @printf '   DC    %- 40s <-  %s\n' '$@' '$(if \
                $(subst 1,,$(words $^)),$< ... $(lastword $^),$<)';
 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_AWK  = @printf '   AWK   %- 40s <-  %s\n' '$@' '$<';
 P_RUN  = @printf '   RUN   $< $(args)\n';
 P_MAKE = @printf '   MAKE  $@\n';


@@ -24,46 +25,81 @@ endif
 # create build directories if they don't already exist
 dummy_mkdir := $(shell mkdir -p $O $O/bin $O/time $O/stats)
 
 # create build directories if they don't already exist
 dummy_mkdir := $(shell mkdir -p $O $O/bin $O/time $O/stats)
 

+
+########################################################
+# general rules that doesn't depend on the GC variable #
+########################################################
+

 .PHONY: all
 .PHONY: all

-all: cdgc basic
+all: basic cdgc
+
+.PHONY: micro-time
+micro: micro-time
+
+.PHONY: dil
+dil:
+       # TODO
+
+.PHONY: micro-time
+micro-time: $B/time.eps $B/time.svg
+$B/time.%: $(patsubst micro/%.d,$B/time-%.csv,$(wildcard micro/*.d)) \
+                       time-plot.tpl-gpi time-plot.sh templite.py
+       $(P_PLOT) ./time-plot.sh $* $@ $(filter %.csv,$^)
+
+.PRECIOUS: $B/time-%.csv
+$B/time-%.csv: $B/basic/time/%.csv | basic cdgc
+       $P echo -n > $@
+       $P for t in basic cdgc; do \
+               (echo -n $$t,; ./stats.py < $B/$$t/time/$*.csv) >> $@; \
+               echo "   STATS `tail -n1 $@` >> $@"; \
+          done

 
 .PHONY: cdgc basic
 cdgc basic:
 
 .PHONY: cdgc basic
 cdgc basic:

-       $(P_MAKE) $(MAKE) --no-print-directory micro-time dil-build GC=$@
+       $(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
+
+
+#########################################
+# rules that depends on the GC variable #
+#########################################
+

 # micro
 ########
 
 micro-src := $(wildcard micro/*.d)
 
 # micro
 ########
 
 micro-src := $(wildcard micro/*.d)
 

-.PHONY: micro-build
-micro-build: $(patsubst micro/%.d,$O/bin/%,$(wildcard micro/*.d))
+.PHONY: micro-gc-build
+micro-gc-build: $(patsubst micro/%.d,$O/bin/%,$(wildcard micro/*.d))

 
 .PRECIOUS: $O/bin/%
 
 .PRECIOUS: $O/bin/%

-$O/bin/%: $O/micro/%.o
+$O/bin/%: $O/micro/%.o $(LIBTANGO)

        $(P_DC) $(DC) $(LDFLAGS) -of$@ $^
 
        $(P_DC) $(DC) $(LDFLAGS) -of$@ $^
 

-.PHONY: micro-time
-micro-time: $O/time/stats.csv
+.PHONY: micro-gc-time
+micro-gc-time: $(patsubst micro/%.d,$O/time/%.csv,$(wildcard micro/*.d))

 
 

-.PHONY: micro-stats
-micro-stats: $(patsubst micro/%.d,$O/stats/%.eps,$(wildcard micro/*.d))
+.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
 
 # special command line arguments for 'shootout_binarytrees' micro benchmark

-$O/time/shootout_binarytrees.t.csv $O/time/shootout_binarytrees.s.csv \
-               $O/stats/shootout_binarytrees.c.csv \
+$O/time/shootout_binarytrees.csv $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/shootout_binarytrees.a.csv: \
        override args := 16
 
 # special command line arguments for 'split' micro benchmark

-$O/time/split.t.csv $O/time/split.s.csv \
-               $O/stats/split.c.csv $O/stats/split.a.csv: \
-       override args := micro/bible.txt
+$O/time/split.csv $O/stats/split.c.csv $O/stats/split.a.csv: \
+       override args := micro/bible.txt 2

 
 # special command line arguments for 'voronoi' micro benchmark
 
 # special command line arguments for 'voronoi' micro benchmark

-$O/time/voronoi.t.csv $O/time/voronoi.s.csv \
-               $O/stats/voronoi.c.csv $O/voronoi/split.a.csv: \
+$O/time/voronoi.csv $O/stats/voronoi.c.csv $O/voronoi/split.a.csv: \

        override args := -n 30000
 
 
        override args := -n 30000
 
 


@@ -73,17 +109,14 @@ $O/time/voronoi.t.csv $O/time/voronoi.s.csv \
 DIL_SRC = $(wildcard dil/src/*.d dil/src/cmd/*.d dil/src/util/*.d \
                        dil/src/dil/*.d dil/src/dil/*/*.d)
 
 DIL_SRC = $(wildcard dil/src/*.d dil/src/cmd/*.d dil/src/util/*.d \
                        dil/src/dil/*.d dil/src/dil/*/*.d)
 

-.PHONY: dil-nop-stats
-dil-nop-stats: $O/stats/dil-nop.eps
-
-.PHONY: dil-build
-dil-build: $O/bin/dil
+.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$@ $^
 
 $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$@ $^
 

-$O/bin/dil-nop: $O/bin/dil
-       @$(P_LN) $(LN) -sf $(<F) $@
+.PHONY: dil-gc-time
+dil-gc-time: $O/time/dil.csv

 
 
 # common rules
 
 
 # common rules


@@ -93,26 +126,18 @@ $O/bin/dil-nop: $O/bin/dil
 $O/%.o: %.d
        $(P_DC) $(DC) -c $(DFLAGS) -of$@ $^
 
 $O/%.o: %.d
        $(P_DC) $(DC) -c $(DFLAGS) -of$@ $^
 

-I := 10
-.PRECIOUS: $O/time/%.t.csv
+I := 3
+.PRECIOUS: $O/time/%.csv

 ifeq ($F,1)
 .PHONY: $(patsubst micro/%.d,$O/bin/%,$(wildcard micro/*.d))
 endif
 ifeq ($F,1)
 .PHONY: $(patsubst micro/%.d,$O/bin/%,$(wildcard micro/*.d))
 endif

-$O/time/%.t.csv: $O/bin/%
+$O/time/%.csv: $O/bin/%

        $P echo -n '   RUN   $* $(args) > $@ ($I)'
        $P echo -n > $@
        $P for i in `seq $I`; do \
                echo -n " $$i"; \
        $P echo -n '   RUN   $* $(args) > $@ ($I)'
        $P echo -n > $@
        $P for i in `seq $I`; do \
                echo -n " $$i"; \

-               time -f%e -a -o $@ ./$< $(args); \
-          done; echo
-
-.PRECIOUS: $O/time/stats.csv
-$O/time/stats.csv: $(patsubst micro/%.d,$O/time/%.t.csv,$(micro-src))
-       $P echo -n > $@
-       $P for t in $^; do \
-               (echo -n `basename $$t`,; ./stats.py < $$t) >> $@; \
-               echo "   STATS `tail -n1 $@` >> $@"; \
-          done
+               $(TIME) -f%e -a -o $@ ./$< $(args); \
+       done; echo

 
 .PRECIOUS: $O/stats/%.c.csv $O/stats/%.a.csv
 $O/stats/%.c.csv $O/stats/%.a.csv: $O/bin/%
 
 .PRECIOUS: $O/stats/%.c.csv $O/stats/%.a.csv
 $O/stats/%.c.csv $O/stats/%.a.csv: $O/bin/%


@@ -140,10 +165,3 @@ $O/stats/%.eps: $O/stats/%.c.csv $O/stats/%.a.csv $O/stats/%.h.csv \
 clean: $O/
        $(P_RM) $(RM) -r $^
 
 clean: $O/
        $(P_RM) $(RM) -r $^
 

-.PHONY: clean-all
-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
-