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

[Chris Lattner]

Changes in directory poolalloc/test:

TEST.poolalloc.Makefile updated: 1.2 -> 1.3
TEST.poolalloc.report updated: 1.2 -> 1.3

---
Log message:

fix bugs in test script and convert to compare CBE times instead of LLC times


---
Diffs of the changes:  (+22 -23)

Index: poolalloc/test/TEST.poolalloc.Makefile
diff -u poolalloc/test/TEST.poolalloc.Makefile:1.2 poolalloc/test/TEST.poolalloc.Makefile:1.3
--- poolalloc/test/TEST.poolalloc.Makefile:1.2	Thu Aug 21 11:04:40 2003
+++ poolalloc/test/TEST.poolalloc.Makefile	Tue Oct 21 15:41:49 2003
@@ -26,41 +26,40 @@
 Output/%.$(TEST).transformed.bc: Output/%.llvm.bc $(PA_SO)
 	-$(OPT_PA_STATS) -q -poolalloc $< -o $@ -f 2>&1 > $@.out
 
-# This rule compiles the new .bc file into a .s file using LLC
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.llc.s): \
-Output/%.poolalloc.llc.s: Output/%.llvm.bc $(LLC)
-	-$(LLC) $(LLCFLAGS) -f $< -o $@
-
-# This rule compiles the .s file into an executable using $CC
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.llc): \
-Output/%.poolalloc.llc: Output/%.poolalloc.llc.s
+# This rule compiles the new .bc file into a .c file using CBE
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.cbe.c): \
+Output/%.poolalloc.cbe.c: Output/%.llvm.bc $(LDIS)
+	-$(LDIS) -c -f $< -o $@
+
+# This rule compiles the .c file into an executable using $CC
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.cbe): \
+Output/%.poolalloc.cbe: Output/%.poolalloc.cbe.c
 	-$(CC) $(CFLAGS) $< $(LLCLIBS) $(LDFLAGS) -o $@
 
 # This rule runs the generated executable, generating timing information
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out-llc): \
-Output/%.poolalloc.out-llc: Output/%.poolalloc.llc
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out-cbe): \
+Output/%.poolalloc.out-cbe: Output/%.poolalloc.cbe
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
 
 # This rule diffs the post-poolallocated version to make sure we didn't break
 # the program!
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.diff-llc): \
-Output/%.poolalloc.diff-llc: Output/%.out-nat Output/%.poolalloc.out-llc
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.diff-cbe): \
+Output/%.poolalloc.diff-cbe: Output/%.out-nat Output/%.poolalloc.out-cbe
 	@cp Output/$*.out-nat Output/$*.poolalloc.out-nat
-	-$(DIFFPROG) llc $*.poolalloc $(HIDEDIFF)
-
+	-$(DIFFPROG) cbe $*.poolalloc $(HIDEDIFF)
 
 
 # This rule wraps everything together to build the actual output the report is
 # generated from.
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
-Output/%.$(TEST).report.txt: Output/%.$(TEST).transformed.bc Output/%.exe-llc \
-			     Output/%.poolalloc.diff-llc
+Output/%.$(TEST).report.txt: Output/%.$(TEST).transformed.bc Output/%.exe-cbe \
+			     Output/%.poolalloc.diff-cbe
 	@echo > $@
-	@-if test -f Output/$*.poolalloc.diff-llc; then \
-	  printf "LLC-RUN-TIME-NORMAL: " >> $@;\
-	  grep "^real" Output/$*.out-llc.time >> $@;\
-	  printf "LLC-RUN-TIME-POOLALLOC: " >> $@;\
-	  grep "^real" Output/$*.poolalloc.out-llc.time >> $@;\
+	@-if test -f Output/$*.poolalloc.diff-cbe; then \
+	  printf "CBE-RUN-TIME-NORMAL: " >> $@;\
+	  grep "^real" Output/$*.out-cbe.time >> $@;\
+	  printf "CBE-RUN-TIME-POOLALLOC: " >> $@;\
+	  grep "^real" Output/$*.poolalloc.out-cbe.time >> $@;\
 	fi
 
 	@cat Output/$*.$(TEST).transformed.bc.info >> $@


Index: poolalloc/test/TEST.poolalloc.report
diff -u poolalloc/test/TEST.poolalloc.report:1.2 poolalloc/test/TEST.poolalloc.report:1.3
--- poolalloc/test/TEST.poolalloc.report:1.2	Thu Aug 21 11:04:40 2003
+++ poolalloc/test/TEST.poolalloc.report	Tue Oct 21 15:41:49 2003
@@ -25,8 +25,8 @@
  ["Name:" , '\'([^\']+)\' Program'],
  [],
 # Times
- ["Normal<br>ExeTime"  ,  'LLC-RUN-TIME-NORMAL: real[\t ]+0m([0-9.]+)'],
- ["PoolAlloc<br>ExeTime", 'LLC-RUN-TIME-POOLALLOC: real[\t ]+0m([0-9.]+)'],
+ ["Normal<br>ExeTime"  ,  'CBE-RUN-TIME-NORMAL: real[\t ]+0m([0-9.]+)'],
+ ["PoolAlloc<br>ExeTime", 'CBE-RUN-TIME-POOLALLOC: real[\t ]+0m([0-9.]+)'],
  ["% Speedup", \&Ratio],         # Normal / PA
  ["NumPools",             '([0-9]+).*Number of poolinit.s inserted'],
  ["NumCloned",            '([0-9]+).*Number of functions cloned'],