diff --git a/TEST.aa.Makefile b/TEST.aa.Makefile index 2b179cd594..413dcf3c48 100644 --- a/TEST.aa.Makefile +++ b/TEST.aa.Makefile @@ -38,7 +38,11 @@ AA_OUTPUTS := $(addsuffix .txt, $(AA_IMPLS)) # Overall tests: just run subordinate tests $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ Output/%.$(TEST).report.txt: $(addprefix Output/%.aa., $(AA_OUTPUTS)) - -$(LDIS) < Output/$*.lib.bc | grep ^declare > $@ + $(VERB) $(RM) -f $@ + @echo "---------------------------------------------------------------" >> $@ + @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ + @echo "---------------------------------------------------------------" >> $@ + -$(LDIS) < Output/$*.lib.bc | grep ^declare >> $@ @-for output in $(addprefix Output/$*.aa., $(AA_OUTPUTS)); do \ echo -n "$$output:" >> $@; \ grep Summary $$output >> $@; \ @@ -50,9 +54,6 @@ Output/%.$(TEST).report.txt: $(addprefix Output/%.aa., $(AA_OUTPUTS)) $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ test.$(TEST).%: Output/%.$(TEST).report.txt - @echo "---------------------------------------------------------------" - @echo ">>> ========= '$*' Program" - @echo "---------------------------------------------------------------" @cat $< # Define REPORT_DEPENDENCIES so that the report is regenerated if analyze or diff --git a/TEST.beta-compare.Makefile b/TEST.beta-compare.Makefile index 514475e2a8..a3aef4a4b8 100644 --- a/TEST.beta-compare.Makefile +++ b/TEST.beta-compare.Makefile @@ -21,16 +21,17 @@ Output/%.$(TEST).llc-beta-info.txt: Output/%.llvm.bc $(LLC) $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ Output/%.$(TEST).report.txt: Output/%.$(TEST).llc-info.txt Output/%.$(TEST).llc-beta-info.txt - -@printf "LLC: " > $@ + $(VERB) $(RM) -f $@ + @echo "---------------------------------------------------------------" >> $@ + @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ + @echo "---------------------------------------------------------------" >> $@ + -@printf "LLC: " >> $@ -grep 'Number of machine instrs printed' Output/$*.$(TEST).llc-info.txt >> $@ -@printf "LLCBETA: " >> $@ -grep 'Number of machine instrs printed' Output/$*.$(TEST).llc-beta-info.txt >> $@ $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ test.$(TEST).%: Output/%.$(TEST).report.txt - @echo "---------------------------------------------------------------" - @echo ">>> ========= '$(RELDIR)/$*' Program" - @echo "---------------------------------------------------------------" @cat $< # Define REPORT_DEPENDENCIES so that the report is regenerated if llc changes diff --git a/TEST.jit.Makefile b/TEST.jit.Makefile index bc58bf3b8a..17b8437e94 100644 --- a/TEST.jit.Makefile +++ b/TEST.jit.Makefile @@ -13,14 +13,15 @@ RELDIR := $(subst $(PROGDIR),,$(CURDIR)) $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ Output/%.$(TEST).report.txt: Output/%.llvm.bc $(LLI) + $(VERB) $(RM) -f $@ + @echo "---------------------------------------------------------------" >> $@ + @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ + @echo "---------------------------------------------------------------" >> $@ -(time -p $(LLI) $(JIT_OPTS) $< $(RUN_OPTIONS) > /dev/null \ - < $(STDIN_FILENAME)) > $@ 2>&1 + < $(STDIN_FILENAME)) >> $@ 2>&1 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ test.$(TEST).%: Output/%.$(TEST).report.txt - @echo "---------------------------------------------------------------" - @echo ">>> ========= '$(RELDIR)/$*' Program" - @echo "---------------------------------------------------------------" @cat $< # Define REPORT_DEPENDENCIES so that the report is regenerated if lli changes diff --git a/TEST.libcalls.Makefile b/TEST.libcalls.Makefile index c13705c8cb..add6c87664 100644 --- a/TEST.libcalls.Makefile +++ b/TEST.libcalls.Makefile @@ -18,16 +18,17 @@ RELDIR := $(subst $(PROGDIR),,$(CURDIR)) $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ test.$(TEST).%: Output/%.$(TEST).report.txt - @echo "---------------------------------------------------------------" - @echo ">>> ========= '$(RELDIR)/$*' Program" - @echo "---------------------------------------------------------------" @cat $< $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ Output/%.$(TEST).report.txt: Output/%.linked.rbc $(LOPT) \ + $(VERB) $(RM) -f $@ + @echo "---------------------------------------------------------------" >> $@ + @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ + @echo "---------------------------------------------------------------" >> $@ $(PROJ_SRC_ROOT)/TEST.libcalls.Makefile @-$(LOPT) -simplify-libcalls -stats -debug-only=simplify-libcalls \ - -time-passes -disable-output $< 2>$@ + -time-passes -disable-output $< 2>>$@ summary: @$(MAKE) TEST=libcalls | egrep '======|simplify-libcalls -' diff --git a/TEST.llc.Makefile b/TEST.llc.Makefile index 8d12092e54..e5a53ffd6e 100644 --- a/TEST.llc.Makefile +++ b/TEST.llc.Makefile @@ -13,13 +13,14 @@ RELDIR := $(subst $(PROGDIR),,$(CURDIR)) $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ Output/%.$(TEST).report.txt: Output/%.llvm.bc $(LLC) - -(time -p $(LLC) $(LLC_OPTS) $<) > $@ 2>&1 + $(VERB) $(RM) -f $@ + @echo "---------------------------------------------------------------" >> $@ + @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ + @echo "---------------------------------------------------------------" >> $@ + -(time -p $(LLC) $(LLC_OPTS) $<) >> $@ 2>&1 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ test.$(TEST).%: Output/%.$(TEST).report.txt - @echo "---------------------------------------------------------------" - @echo ">>> ========= '$(RELDIR)/$*' Program" - @echo "---------------------------------------------------------------" @cat $< # Define REPORT_DEPENDENCIES so that the report is regenerated if llc changes diff --git a/TEST.nightly.Makefile b/TEST.nightly.Makefile index bd4b1208a6..3f7ff968ad 100644 --- a/TEST.nightly.Makefile +++ b/TEST.nightly.Makefile @@ -138,13 +138,14 @@ Output/%.nightly.jit.report.txt: Output/%.exe-jit # Overall tests: just run subordinate tests $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ Output/%.$(TEST).report.txt: $(addprefix Output/%.nightly., $(REPORTS_SUFFIX)) - -cat $(addprefix Output/$*.nightly., $(REPORTS_SUFFIX)) > $@ + $(VERB) $(RM) -f $@ + @echo "---------------------------------------------------------------" >> $@ + @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ + @echo "---------------------------------------------------------------" >> $@ + -cat $(addprefix Output/$*.nightly., $(REPORTS_SUFFIX)) >> $@ $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ test.$(TEST).%: Output/%.$(TEST).report.txt - @echo "---------------------------------------------------------------" - @echo ">>> ========= '$(RELDIR)/$*' Program" - @echo "---------------------------------------------------------------" @-cat $<