[llvm-commits] CVS: llvm-test/TEST.nightly.Makefile TEST.nightly.report

[Chris Lattner]

Changes in directory llvm-test:

TEST.nightly.Makefile updated: 1.33 -> 1.34
TEST.nightly.report updated: 1.27 -> 1.28
---
Log message:

Make the nightly tester use user+system time, NOT 'real' time.  This should
provide substantially more stable numbers.


---
Diffs of the changes:  (+12 -12)

Index: llvm-test/TEST.nightly.Makefile
diff -u llvm-test/TEST.nightly.Makefile:1.33 llvm-test/TEST.nightly.Makefile:1.34
--- llvm-test/TEST.nightly.Makefile:1.33	Sun Sep  5 02:56:51 2004
+++ llvm-test/TEST.nightly.Makefile	Sat Nov  6 15:34:36 2004
@@ -52,7 +52,7 @@
 Output/%.nightly.nat.report.txt: Output/%.out-nat
 	@echo > $@
 	printf "TEST-RESULT-nat-time: " >> $@
-	-grep "^real" Output/$*.out-nat.time >> $@
+	-grep "^program" Output/$*.out-nat.time >> $@
 
 # LLC tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.llc.report.txt): \
@@ -65,7 +65,7 @@
 	  printf "TEST-RESULT-llc: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-llc-time: " >> $@;\
-	  grep "^real" Output/$*.out-llc.time >> $@;\
+	  grep "^program" Output/$*.out-llc.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc $(RELDIR)/$*" >> $@;\
@@ -82,7 +82,7 @@
 	  printf "TEST-RESULT-llc-ls: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-llc-ls-time: " >> $@;\
-	  grep "^real" Output/$*.out-llc-ls.time >> $@;\
+	  grep "^program" Output/$*.out-llc-ls.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc-ls $(RELDIR)/$*" >> $@;\
@@ -98,7 +98,7 @@
 	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-cbe-time: " >> $@;\
-	  grep "^real" Output/$*.out-cbe.time >> $@;\
+	  grep "^program" Output/$*.out-cbe.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: cbe $(RELDIR)/$*" >> $@;\
@@ -112,7 +112,7 @@
 	@-if test -f Output/$*.exe-jit; then \
 	  echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-jit-time: " >> $@;\
-	  grep "^real" Output/$*.out-jit.time >> $@;\
+	  grep "^program" Output/$*.out-jit.time >> $@;\
 	  echo >> $@;\
 	  printf "TEST-RESULT-jit-comptime: " >> $@;\
 	  grep "Total Execution Time" Output/$*.out-jit.info >> $@;\
@@ -134,7 +134,7 @@
 	  printf "TEST-RESULT-jit-ls: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-jit-ls-time: " >> $@;\
-	  grep "^real" Output/$*.out-jit-ls.time >> $@;\
+	  grep "^program" Output/$*.out-jit-ls.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: jit-ls $(RELDIR)/$*" >> $@;\


Index: llvm-test/TEST.nightly.report
diff -u llvm-test/TEST.nightly.report:1.27 llvm-test/TEST.nightly.report:1.28
--- llvm-test/TEST.nightly.report:1.27	Sun Aug  8 19:04:33 2004
+++ llvm-test/TEST.nightly.report	Sat Nov  6 15:34:36 2004
@@ -67,12 +67,12 @@
  ["JIT<br>codegen" , "TEST-RESULT-jit-comptime: $WallTimeRE"],
  ["Machine<br>code", 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code'],
  [],
- ["GCC"      , 'TEST-RESULT-nat-time: real\s*([.0-9m:]+)', \&FormatTime],
- ["CBE"      , 'TEST-RESULT-cbe-time: real\s*([.0-9m:]+)', \&FormatTime],
- ["LLC"      , 'TEST-RESULT-llc-time: real\s*([.0-9m:]+)', \&FormatTime],
- ["LLC-BETA" , 'TEST-RESULT-llc-ls-time: real\s*([.0-9m:]+)', \&FormatTime],
- ["JIT"      , 'TEST-RESULT-jit-time: real\s*([.0-9m:]+)', \&FormatTime],
- ["JIT-BETA" , 'TEST-RESULT-jit-ls-time: real\s*([.0-9m:]+)', \&FormatTime],
+ ["GCC"      , 'TEST-RESULT-nat-time: program\s*([.0-9m:]+)', \&FormatTime],
+ ["CBE"      , 'TEST-RESULT-cbe-time: program\s*([.0-9m:]+)', \&FormatTime],
+ ["LLC"      , 'TEST-RESULT-llc-time: program\s*([.0-9m:]+)', \&FormatTime],
+ ["LLC-BETA" , 'TEST-RESULT-llc-ls-time: program\s*([.0-9m:]+)', \&FormatTime],
+ ["JIT"      , 'TEST-RESULT-jit-time: program\s*([.0-9m:]+)', \&FormatTime],
+ ["JIT-BETA" , 'TEST-RESULT-jit-ls-time: program\s*([.0-9m:]+)', \&FormatTime],
  ["GCC/CBE"  , \&GCCCBERatio],
  ["GCC/LLC"  , \&GCCLLCRatio],
  ["GCC/LLC-BETA"  , \&GCCLLC_BETARatio]