[llvm-commits] [poolalloc] r57184 - in /poolalloc/trunk/test: TEST.poolalloc.Makefile TEST.poolalloc.report

[Andrew Lenharth]

Author: alenhar2
Date: Mon Oct  6 13:17:18 2008
New Revision: 57184

URL: http://llvm.org/viewvc/llvm-project?rev=57184&view=rev
Log:
fix test script

Modified:
    poolalloc/trunk/test/TEST.poolalloc.Makefile
    poolalloc/trunk/test/TEST.poolalloc.report

Modified: poolalloc/trunk/test/TEST.poolalloc.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.poolalloc.Makefile?rev=57184&r1=57183&r2=57184&view=diff

==============================================================================
--- poolalloc/trunk/test/TEST.poolalloc.Makefile (original)
+++ poolalloc/trunk/test/TEST.poolalloc.Makefile Mon Oct  6 13:17:18 2008
@@ -186,28 +186,28 @@
 
 # This rule diffs the post-poolallocated version to make sure we didn't break
 # the program!
-$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.diff): \
-Output/%.poolalloc.diff: Output/%.out-nat Output/%.poolalloc.out
+$(PROGRAMS_TO_TEST:%=Output/%.poolalloc.diff-nat): \
+Output/%.poolalloc.diff-nat: Output/%.out-nat Output/%.poolalloc.out
 	@cp Output/$*.out-nat Output/$*.poolalloc.out-nat
 	-$(DIFFPROG) nat $*.poolalloc $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.diff): \
-Output/%.basepa.diff: Output/%.out-nat Output/%.basepa.out
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.diff-nat): \
+Output/%.basepa.diff-nat: Output/%.out-nat Output/%.basepa.out
 	@cp Output/$*.out-nat Output/$*.basepa.out-nat
 	-$(DIFFPROG) nat $*.basepa $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.diff): \
-Output/%.mallocrepl.diff: Output/%.out-nat Output/%.mallocrepl.out
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.diff-nat): \
+Output/%.mallocrepl.diff-nat: Output/%.out-nat Output/%.mallocrepl.out
 	@cp Output/$*.out-nat Output/$*.mallocrepl.out-nat
 	-$(DIFFPROG) nat $*.mallocrepl $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.diff): \
-Output/%.onlyoverhead.diff: Output/%.out-nat Output/%.onlyoverhead.out
+$(PROGRAMS_TO_TEST:%=Output/%.onlyoverhead.diff-nat): \
+Output/%.onlyoverhead.diff-nat: Output/%.out-nat Output/%.onlyoverhead.out
 	@cp Output/$*.out-nat Output/$*.onlyoverhead.out-nat
 	-$(DIFFPROG) nat $*.onlyoverhead $(HIDEDIFF)
 
-$(PROGRAMS_TO_TEST:%=Output/%.nonpa.diff): \
-Output/%.nonpa.diff: Output/%.out-nat Output/%.nonpa.out
+$(PROGRAMS_TO_TEST:%=Output/%.nonpa.diff-nat): \
+Output/%.nonpa.diff-nat: Output/%.out-nat Output/%.nonpa.out
 	@cp Output/$*.out-nat Output/$*.nonpa.out-nat
 	-$(DIFFPROG) nat $*.nonpa $(HIDEDIFF)
 
@@ -216,34 +216,34 @@
 # generated from.
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
 Output/%.$(TEST).report.txt: Output/%.out-nat                \
-                             Output/%.nonpa.diff         \
-			     Output/%.poolalloc.diff     \
-			     Output/%.basepa.diff      \
-			     Output/%.mallocrepl.diff    \
-			     Output/%.onlyoverhead.diff  \
+                             Output/%.nonpa.diff-nat         \
+			     Output/%.poolalloc.diff-nat     \
+			     Output/%.basepa.diff-nat      \
+			     Output/%.mallocrepl.diff-nat    \
+			     Output/%.onlyoverhead.diff-nat  \
                              Output/%.LOC.txt
 	@echo > $@
-	@-if test -f Output/$*.nonpa.diff; then \
+	@-if test -f Output/$*.nonpa.diff-nat; then \
 	  printf "GCC-RUN-TIME: " >> $@;\
 	  grep "^program" Output/$*.out-nat.time >> $@;\
         fi
-	@-if test -f Output/$*.nonpa.diff; then \
+	@-if test -f Output/$*.nonpa.diff-nat; then \
 	  printf "RUN-TIME-NORMAL: " >> $@;\
 	  grep "^program" Output/$*.nonpa.out.time >> $@;\
         fi
-	@-if test -f Output/$*.mallocrepl.diff; then \
+	@-if test -f Output/$*.mallocrepl.diff-nat; then \
 	  printf "RUN-TIME-MALLOCREPL: " >> $@;\
 	  grep "^program" Output/$*.mallocrepl.out.time >> $@;\
         fi
-	@-if test -f Output/$*.onlyoverhead.diff; then \
+	@-if test -f Output/$*.onlyoverhead.diff-nat; then \
 	  printf "RUN-TIME-ONLYOVERHEAD: " >> $@;\
 	  grep "^program" Output/$*.onlyoverhead.out.time >> $@;\
         fi
-	@-if test -f Output/$*.basepa.diff; then \
+	@-if test -f Output/$*.basepa.diff-nat; then \
 	  printf "RUN-TIME-BASEPA: " >> $@;\
 	  grep "^program" Output/$*.basepa.out.time >> $@;\
         fi
-	@-if test -f Output/$*.poolalloc.diff; then \
+	@-if test -f Output/$*.poolalloc.diff-nat; then \
 	  printf "RUN-TIME-POOLALLOC: " >> $@;\
 	  grep "^program" Output/$*.poolalloc.out.time >> $@;\
 	fi

Modified: poolalloc/trunk/test/TEST.poolalloc.report
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.poolalloc.report?rev=57184&r1=57183&r2=57184&view=diff

==============================================================================
--- poolalloc/trunk/test/TEST.poolalloc.report (original)
+++ poolalloc/trunk/test/TEST.poolalloc.report Mon Oct  6 13:17:18 2008
@@ -80,18 +80,18 @@
  [],
 # Times
  ["GCC",            'GCC-RUN-TIME: program\s*([.0-9m:]+)', \&FormatTime],
- ["NonPATime",      'CBE-RUN-TIME-NORMAL: program\s*([.0-9m:]+)', \&FormatTime],
+ ["NonPATime",      'RUN-TIME-NORMAL: program\s*([.0-9m:]+)', \&FormatTime],
  [],
- ["OnlyOHTime",     'CBE-RUN-TIME-ONLYOVERHEAD: program\s*([.0-9m:]+)', \&FormatTime],
+ ["OnlyOHTime",     'RUN-TIME-ONLYOVERHEAD: program\s*([.0-9m:]+)', \&FormatTime],
  ["OO run%",        \&RuntimePercent],
  [],
- ["ReplTime",       'CBE-RUN-TIME-MALLOCREPL: program\s*([.0-9m:]+)', \&FormatTime],
+ ["ReplTime",       'RUN-TIME-MALLOCREPL: program\s*([.0-9m:]+)', \&FormatTime],
  ["MR run%",        \&RuntimePercent],
  [],
- ["PA Time",        'CBE-RUN-TIME-POOLALLOC: program\s*([.0-9m:]+)', \&FormatTime],
+ ["PA Time",        'RUN-TIME-POOLALLOC: program\s*([.0-9m:]+)', \&FormatTime],
  ["PA run%",        \&RuntimePercent],
  [],
- ["Basepa",        'CBE-RUN-TIME-BASEPA: program\s*([.0-9m:]+)', \&FormatTime],
+ ["Basepa",        'RUN-TIME-BASEPA: program\s*([.0-9m:]+)', \&FormatTime],
  ["Base run%",      \&RuntimePercent],
  [],
  ["NumPools",       '([0-9]+).*Number of pools allocated'],