[llvm-commits] [test-suite] r91013 - in /test-suite/trunk: Makefile.programs TEST.nightly.Makefile TEST.nightly2.Makefile
Daniel Dunbar
daniel at zuster.org
Wed Dec 9 16:30:10 PST 2009
Author: ddunbar
Date: Wed Dec 9 18:30:10 2009
New Revision: 91013
URL: http://llvm.org/viewvc/llvm-project?rev=91013&view=rev
Log:
Fix llc and lli to always produce .info files.
- This is analogous to what we do for opt, and means we don't need to run LLC twice in a nightlytest. This makes a nightlytest run 10% faster!
- This also eliminates the dynamic-variable-substitution use of EXTRA_LLIFLAGS, simple is good.
Modified:
test-suite/trunk/Makefile.programs
test-suite/trunk/TEST.nightly.Makefile
test-suite/trunk/TEST.nightly2.Makefile
Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=91013&r1=91012&r2=91013&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Wed Dec 9 18:30:10 2009
@@ -381,7 +381,8 @@
#
$(PROGRAMS_TO_TEST:%=Output/%.cbe.c): \
Output/%.cbe.c: Output/%.llvm.bc $(LLC)
- $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) -march=c $< -o $@
+ $(VERB) $(RM) -f $(CURDIR)/$@.info
+ $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) -march=c $< -o $@ -info-output-file=$(CURDIR)/$@.info $(STATS)
$(PROGRAMS_TO_TEST:%=Output/%.cbe): \
Output/%.cbe: Output/%.cbe.c
@@ -392,15 +393,18 @@
#
$(PROGRAMS_TO_TEST:%=Output/%.llc.s): \
Output/%.llc.s: Output/%.llvm.bc $(LLC)
- $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) $< -o $@
+ $(VERB) $(RM) -f $(CURDIR)/$@.info
+ $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) $< -o $@ -info-output-file=$(CURDIR)/$@.info $(STATS)
$(PROGRAMS_TO_TEST:%=Output/%.llc-beta.s): \
Output/%.llc-beta.s: Output/%.llvm.bc $(LLC)
- $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) $(LLCBETAOPTION) $< -o $@
+ $(VERB) $(RM) -f $(CURDIR)/$@.info
+ $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) $(LLCBETAOPTION) $< -o $@ -info-output-file=$(CURDIR)/$@.info $(STATS)
$(PROGRAMS_TO_TEST:%=Output/%.opt-beta.s): \
Output/%.opt-beta.s: Output/%.llvm.optbeta.bc $(LLC)
- $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) $< -o $@
+ $(VERB) $(RM) -f $(CURDIR)/$@.info
+ $(RUNTOOLSAFELY) $(LLC) $(LLCFLAGS) $< -o $@ -info-output-file=$(CURDIR)/$@.info $(STATS)
# On darwin, pass -force_cpusubtype_ALL to allow all ppc instructions.
ifeq ($(ARCH),PowerPC)
@@ -477,15 +481,15 @@
$(PROGRAMS_TO_TEST:%=Output/%.out-lli): \
Output/%.out-lli: Output/%.llvm.bc $(LLI)
- $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLI_OPTS) $< $(RUN_OPTIONS)
+ $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLI_OPTS) $< $(RUN_OPTIONS) -info-output-file=$(CURDIR)/$@.info $(STATS)
$(PROGRAMS_TO_TEST:%=Output/%.out-jit): \
Output/%.out-jit: Output/%.llvm.bc $(LLI)
- $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(JIT_OPTS) $< $(RUN_OPTIONS)
+ $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(JIT_OPTS) $< $(RUN_OPTIONS) -info-output-file=$(CURDIR)/$@.info $(STATS)
$(PROGRAMS_TO_TEST:%=Output/%.out-jit-beta): \
Output/%.out-jit-beta: Output/%.llvm.bc $(LLI)
- $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLCBETAOPTION) $(JIT_OPTS) $< $(RUN_OPTIONS)
+ $(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLCBETAOPTION) $(JIT_OPTS) $< $(RUN_OPTIONS) -info-output-file=$(CURDIR)/$@.info $(STATS)
$(PROGRAMS_TO_TEST:%=Output/%.out-llc): \
Output/%.out-llc: Output/%.llc
Modified: test-suite/trunk/TEST.nightly.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.nightly.Makefile?rev=91013&r1=91012&r2=91013&view=diff
==============================================================================
--- test-suite/trunk/TEST.nightly.Makefile (original)
+++ test-suite/trunk/TEST.nightly.Makefile Wed Dec 9 18:30:10 2009
@@ -33,13 +33,9 @@
endif
REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN))
-
-TIMEOPT = -time-passes -stats -info-output-file=$(CURDIR)/$@.info
-EXTRA_LLIFLAGS = $(TIMEOPT)
-
# Compilation tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.compile.report.txt): \
-Output/%.nightly.compile.report.txt: Output/%.llvm.bc $(LOPT)
+Output/%.nightly.compile.report.txt: Output/%.llvm.bc
@echo > $@
@-if test -f Output/$*.linked.bc.info; then \
echo "TEST-PASS: compile $(RELDIR)/$*" >> $@;\
@@ -62,14 +58,13 @@
# LLC tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.llc.report.txt): \
-Output/%.nightly.llc.report.txt: Output/%.llvm.bc Output/%.exe-llc $(LLC)
+Output/%.nightly.llc.report.txt: Output/%.llvm.bc Output/%.exe-llc
@echo > $@
-head -n 100 Output/$*.exe-llc >> $@
@-if test -f Output/$*.exe-llc; then \
echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
- $(LLC) $< $(LLCFLAGS) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
printf "TEST-RESULT-llc: " >> $@;\
- grep "Total Execution Time" $@.info | tail -n 1 >> $@;\
+ grep "Total Execution Time" Output/$*.llc.s.info | tail -n 1 >> $@;\
printf "TEST-RESULT-llc-time: " >> $@;\
grep "^program" Output/$*.out-llc.time >> $@;\
echo >> $@;\
@@ -79,14 +74,13 @@
# LLC experimental tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.llc-beta.report.txt): \
-Output/%.nightly.llc-beta.report.txt: Output/%.llvm.bc Output/%.exe-llc-beta $(LLC)
+Output/%.nightly.llc-beta.report.txt: Output/%.llvm.bc Output/%.exe-llc-beta
@echo > $@
-head -n 100 Output/$*.exe-llc-beta >> $@
@-if test -f Output/$*.exe-llc-beta; then \
echo "TEST-PASS: llc-beta $(RELDIR)/$*" >> $@;\
- $(LLC) $< $(LLCFLAGS) $(LLCBETAOPTION) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
printf "TEST-RESULT-llc-beta: " >> $@;\
- grep "Total Execution Time" $@.info | tail -n 1 >> $@;\
+ grep "Total Execution Time" Output/$*.llc-beta.s.info | tail -n 1 >> $@;\
printf "TEST-RESULT-llc-beta-time: " >> $@;\
grep "^program" Output/$*.out-llc-beta.time >> $@;\
echo >> $@;\
@@ -96,14 +90,13 @@
# OPT experimental tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.opt-beta.report.txt): \
-Output/%.nightly.opt-beta.report.txt: Output/%.llvm.optbeta.bc Output/%.exe-opt-beta $(LOPT)
+Output/%.nightly.opt-beta.report.txt: Output/%.llvm.optbeta.bc Output/%.exe-opt-beta
@echo > $@
-head -n 100 Output/$*.exe-opt-beta >> $@
@-if test -f Output/$*.exe-opt-beta; then \
echo "TEST-PASS: opt-beta $(RELDIR)/$*" >> $@;\
- $(LLC) $< $(LLCFLAGS) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
printf "TEST-RESULT-opt-beta: " >> $@;\
- grep "Total Execution Time" $@.info | tail -n 1 >> $@;\
+ grep "Total Execution Time" Output/$*.opt-beta.s.info | tail -n 1 >> $@;\
printf "TEST-RESULT-opt-beta-time: " >> $@;\
grep "^program" Output/$*.out-opt-beta.time >> $@;\
echo >> $@;\
@@ -113,7 +106,7 @@
# CBE tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.cbe.report.txt): \
-Output/%.nightly.cbe.report.txt: Output/%.llvm.bc Output/%.exe-cbe $(LLC)
+Output/%.nightly.cbe.report.txt: Output/%.llvm.bc Output/%.exe-cbe
@echo > $@
-head -n 100 Output/$*.exe-cbe >> $@
@-if test -f Output/$*.exe-cbe; then \
@@ -127,7 +120,7 @@
# JIT tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.jit.report.txt): \
-Output/%.nightly.jit.report.txt: Output/%.llvm.bc Output/%.exe-jit $(LLI)
+Output/%.nightly.jit.report.txt: Output/%.llvm.bc Output/%.exe-jit
@echo > $@
-head -n 100 Output/$*.exe-jit >> $@
@-if test -f Output/$*.exe-jit; then \
Modified: test-suite/trunk/TEST.nightly2.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.nightly2.Makefile?rev=91013&r1=91012&r2=91013&view=diff
==============================================================================
--- test-suite/trunk/TEST.nightly2.Makefile (original)
+++ test-suite/trunk/TEST.nightly2.Makefile Wed Dec 9 18:30:10 2009
@@ -33,13 +33,9 @@
endif
REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN))
-
-TIMEOPT = -time-passes -stats -info-output-file=$(CURDIR)/$@.info
-EXTRA_LLIFLAGS = $(TIMEOPT)
-
# Compilation tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.compile.report.txt): \
-Output/%.nightly.compile.report.txt: Output/%.llvm.bc $(LOPT)
+Output/%.nightly.compile.report.txt: Output/%.llvm.bc
@echo > $@
@-if test -f Output/$*.linked.bc.info; then \
echo "TEST-PASS: compile $(RELDIR)/$*" >> $@;\
@@ -62,14 +58,13 @@
# LLC tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.llc.report.txt): \
-Output/%.nightly.llc.report.txt: Output/%.llvm.bc Output/%.exe-llc $(LLC)
+Output/%.nightly.llc.report.txt: Output/%.llvm.bc Output/%.exe-llc
@echo > $@
-head -n 100 Output/$*.exe-llc >> $@
@-if test -f Output/$*.exe-llc; then \
echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
- $(LLC) $< $(LLCFLAGS) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
printf "TEST-RESULT-llc: " >> $@;\
- grep "Total Execution Time" $@.info >> $@;\
+ grep "Total Execution Time" Output/$*.llc.s.info >> $@;\
printf "TEST-RESULT-llc-time: " >> $@;\
grep "^program" Output/$*.out-llc.time >> $@;\
echo >> $@;\
@@ -79,14 +74,13 @@
# LLC experimental tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.llc-beta.report.txt): \
-Output/%.nightly.llc-beta.report.txt: Output/%.llvm.bc Output/%.exe-llc-beta $(LLC)
+Output/%.nightly.llc-beta.report.txt: Output/%.llvm.bc Output/%.exe-llc-beta
@echo > $@
-head -n 100 Output/$*.exe-llc-beta >> $@
@-if test -f Output/$*.exe-llc-beta; then \
echo "TEST-PASS: llc-beta $(RELDIR)/$*" >> $@;\
- $(LLC) $< $(LLCFLAGS) $(LLCBETAOPTION) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
printf "TEST-RESULT-llc-beta: " >> $@;\
- grep "Total Execution Time" $@.info >> $@;\
+ grep "Total Execution Time" Output/$*.llc-beta.s.info >> $@;\
printf "TEST-RESULT-llc-beta-time: " >> $@;\
grep "^program" Output/$*.out-llc-beta.time >> $@;\
echo >> $@;\
@@ -96,12 +90,11 @@
# OPT experimental tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.opt-beta.report.txt): \
-Output/%.nightly.opt-beta.report.txt: Output/%.llvm.optbeta.bc Output/%.exe-opt-beta $(LOPT)
+Output/%.nightly.opt-beta.report.txt: Output/%.llvm.optbeta.bc Output/%.exe-opt-beta
@echo > $@
-head -n 100 Output/$*.exe-opt-beta >> $@
@-if test -f Output/$*.exe-opt-beta; then \
echo "TEST-PASS: opt-beta $(RELDIR)/$*" >> $@;\
- $(LLC) $< $(LLCFLAGS) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
printf "TEST-RESULT-opt-beta: " >> $@;\
grep "Total Execution Time" $@.info >> $@;\
printf "TEST-RESULT-opt-beta-time: " >> $@;\
@@ -113,7 +106,7 @@
# CBE tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.cbe.report.txt): \
-Output/%.nightly.cbe.report.txt: Output/%.llvm.bc Output/%.exe-cbe $(LLC)
+Output/%.nightly.cbe.report.txt: Output/%.llvm.bc Output/%.exe-cbe
@echo > $@
-head -n 100 Output/$*.exe-cbe >> $@
@-if test -f Output/$*.exe-cbe; then \
@@ -127,7 +120,7 @@
# JIT tests
$(PROGRAMS_TO_TEST:%=Output/%.nightly.jit.report.txt): \
-Output/%.nightly.jit.report.txt: Output/%.llvm.bc Output/%.exe-jit $(LLI)
+Output/%.nightly.jit.report.txt: Output/%.llvm.bc Output/%.exe-jit
@echo > $@
-head -n 100 Output/$*.exe-jit >> $@
@-if test -f Output/$*.exe-jit; then \
More information about the llvm-commits
mailing list