[llvm-commits] [test-suite] r91033 - in /test-suite/trunk: TEST.aa.Makefile TEST.beta-compare.Makefile TEST.jit.Makefile TEST.libcalls.Makefile TEST.llc.Makefile TEST.nightly.Makefile
Daniel Dunbar
daniel at zuster.org
Wed Dec 9 17:39:37 PST 2009
Author: ddunbar
Date: Wed Dec 9 19:39:37 2009
New Revision: 91033
URL: http://llvm.org/viewvc/llvm-project?rev=91033&view=rev
Log:
NightlyTest: Include the individual program report header in the .report.txt files.
Modified:
test-suite/trunk/TEST.aa.Makefile
test-suite/trunk/TEST.beta-compare.Makefile
test-suite/trunk/TEST.jit.Makefile
test-suite/trunk/TEST.libcalls.Makefile
test-suite/trunk/TEST.llc.Makefile
test-suite/trunk/TEST.nightly.Makefile
Modified: test-suite/trunk/TEST.aa.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.aa.Makefile?rev=91033&r1=91032&r2=91033&view=diff
==============================================================================
--- test-suite/trunk/TEST.aa.Makefile (original)
+++ test-suite/trunk/TEST.aa.Makefile Wed Dec 9 19:39:37 2009
@@ -38,7 +38,11 @@
# 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 @@
$(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
Modified: test-suite/trunk/TEST.beta-compare.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.beta-compare.Makefile?rev=91033&r1=91032&r2=91033&view=diff
==============================================================================
--- test-suite/trunk/TEST.beta-compare.Makefile (original)
+++ test-suite/trunk/TEST.beta-compare.Makefile Wed Dec 9 19:39:37 2009
@@ -21,16 +21,17 @@
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
Output/%.$(TEST).report.txt: Output/%.$(TEST).llc-info.txt Output/%.$(TEST).llc-beta-info.txt
- - at printf "LLC: " > $@
+ $(VERB) $(RM) -f $@
+ @echo "---------------------------------------------------------------" >> $@
+ @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@
+ @echo "---------------------------------------------------------------" >> $@
+ - at printf "LLC: " >> $@
-grep 'Number of machine instrs printed' Output/$*.$(TEST).llc-info.txt >> $@
- at 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
Modified: test-suite/trunk/TEST.jit.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.jit.Makefile?rev=91033&r1=91032&r2=91033&view=diff
==============================================================================
--- test-suite/trunk/TEST.jit.Makefile (original)
+++ test-suite/trunk/TEST.jit.Makefile Wed Dec 9 19:39:37 2009
@@ -13,14 +13,15 @@
$(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
Modified: test-suite/trunk/TEST.libcalls.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.libcalls.Makefile?rev=91033&r1=91032&r2=91033&view=diff
==============================================================================
--- test-suite/trunk/TEST.libcalls.Makefile (original)
+++ test-suite/trunk/TEST.libcalls.Makefile Wed Dec 9 19:39:37 2009
@@ -18,16 +18,17 @@
$(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 -'
Modified: test-suite/trunk/TEST.llc.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.llc.Makefile?rev=91033&r1=91032&r2=91033&view=diff
==============================================================================
--- test-suite/trunk/TEST.llc.Makefile (original)
+++ test-suite/trunk/TEST.llc.Makefile Wed Dec 9 19:39:37 2009
@@ -13,13 +13,14 @@
$(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
Modified: test-suite/trunk/TEST.nightly.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.nightly.Makefile?rev=91033&r1=91032&r2=91033&view=diff
==============================================================================
--- test-suite/trunk/TEST.nightly.Makefile (original)
+++ test-suite/trunk/TEST.nightly.Makefile Wed Dec 9 19:39:37 2009
@@ -138,13 +138,14 @@
# 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 $<
More information about the llvm-commits
mailing list