[llvm-commits] CVS: poolalloc/test/TEST.poolalloc.Makefile TEST.poolalloc.report
Chris Lattner
lattner at cs.uiuc.edu
Sat Nov 6 21:24:33 PST 2004
Changes in directory poolalloc/test:
TEST.poolalloc.Makefile updated: 1.29 -> 1.30
TEST.poolalloc.report updated: 1.20 -> 1.21
---
Log message:
Start reporting numbers for the new AllInOneGlobalPool heuristic. Do not
report numbers twice for 'allnodes'
---
Diffs of the changes: (+25 -25)
Index: poolalloc/test/TEST.poolalloc.Makefile
diff -u poolalloc/test/TEST.poolalloc.Makefile:1.29 poolalloc/test/TEST.poolalloc.Makefile:1.30
--- poolalloc/test/TEST.poolalloc.Makefile:1.29 Sat Nov 6 13:48:11 2004
+++ poolalloc/test/TEST.poolalloc.Makefile Sat Nov 6 23:24:22 2004
@@ -47,10 +47,10 @@
-$(OPT_PA_STATS) -poolalloc $(EXTRA_PA_FLAGS) $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
-$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).allnodes.bc): \
-Output/%.$(TEST).allnodes.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).mallocrepl.bc): \
+Output/%.$(TEST).mallocrepl.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
- -$(OPT_PA_STATS) -poolalloc -poolalloc-heuristic=AllNodes $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
+ -$(OPT_PA_STATS) -poolalloc -poolalloc-heuristic=AllInOneGlobalPool $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).onlyoverhead.bc): \
Output/%.$(TEST).onlyoverhead.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
@@ -64,8 +64,8 @@
-$(LLC) -march=c -f $< -o $@
# This rule compiles the new .bc file into a .c file using CBE
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.cbe.c): \
-Output/%.allnodes.cbe.c: Output/%.$(TEST).allnodes.bc $(LLC)
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.cbe.c): \
+Output/%.mallocrepl.cbe.c: Output/%.$(TEST).mallocrepl.bc $(LLC)
-$(LLC) -march=c -f $< -o $@
# This rule compiles the new .bc file into a .c file using CBE
@@ -79,8 +79,8 @@
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
# This rule compiles the .c file into an executable using $CC
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.cbe): \
-Output/%.allnodes.cbe: Output/%.allnodes.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.cbe): \
+Output/%.mallocrepl.cbe: Output/%.mallocrepl.cbe.c $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
# This rule compiles the .c file into an executable using $CC
@@ -115,8 +115,8 @@
# This rule runs the generated executable, generating timing information, for
# normal test programs
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.out-cbe): \
-Output/%.allnodes.out-cbe: Output/%.allnodes.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out-cbe): \
+Output/%.mallocrepl.out-cbe: Output/%.mallocrepl.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
@@ -146,13 +146,13 @@
# This rule runs the generated executable, generating timing information, for
# SPEC
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.out-cbe): \
-Output/%.allnodes.out-cbe: Output/%.allnodes.cbe
- -$(SPEC_SANDBOX) allnodescbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out-cbe): \
+Output/%.mallocrepl.out-cbe: Output/%.mallocrepl.cbe
+ -$(SPEC_SANDBOX) mallocreplcbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
../../$< $(RUN_OPTIONS)
- -(cd Output/allnodescbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
- -cp Output/allnodescbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+ -(cd Output/mallocreplcbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/mallocreplcbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
# This rule runs the generated executable, generating timing information, for
# SPEC
@@ -186,10 +186,10 @@
# This rule diffs the post-poolallocated version to make sure we didn't break
# the program!
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.diff-cbe): \
-Output/%.allnodes.diff-cbe: Output/%.out-nat Output/%.allnodes.out-cbe
- @cp Output/$*.out-nat Output/$*.allnodes.out-nat
- -$(DIFFPROG) cbe $*.allnodes $(HIDEDIFF)
+$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.diff-cbe): \
+Output/%.mallocrepl.diff-cbe: Output/%.out-nat Output/%.mallocrepl.out-cbe
+ @cp Output/$*.out-nat Output/$*.mallocrepl.out-nat
+ -$(DIFFPROG) cbe $*.mallocrepl $(HIDEDIFF)
# This rule diffs the post-poolallocated version to make sure we didn't break
# the program!
@@ -211,7 +211,7 @@
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
Output/%.$(TEST).report.txt: Output/%.nonpa.diff-cbe \
Output/%.poolalloc.diff-cbe \
- Output/%.allnodes.diff-cbe \
+ Output/%.mallocrepl.diff-cbe \
Output/%.onlyoverhead.diff-cbe \
Output/%.LOC.txt
@echo > $@
@@ -219,8 +219,8 @@
printf "CBE-RUN-TIME-NORMAL: " >> $@;\
grep "^program" Output/$*.nonpa.out-cbe.time >> $@;\
\
- printf "CBE-RUN-TIME-ALLNODES: " >> $@;\
- grep "^program" Output/$*.allnodes.out-cbe.time >> $@;\
+ printf "CBE-RUN-TIME-MALLOCREPL: " >> $@;\
+ grep "^program" Output/$*.mallocrepl.out-cbe.time >> $@;\
\
printf "CBE-RUN-TIME-ONLYOVERHEAD: " >> $@;\
grep "^program" Output/$*.onlyoverhead.out-cbe.time >> $@;\
@@ -231,8 +231,8 @@
cat Output/$*.LOC.txt >> $@;\
fi
- @cat Output/$*.$(TEST).allnodes.bc.info >> $@
- @#cat Output/$*.$(TEST).allnodes.bc.out >> $@
+ @cat Output/$*.$(TEST).poolalloc.bc.info >> $@
+ @#cat Output/$*.$(TEST).poolalloc.bc.out >> $@
$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
Index: poolalloc/test/TEST.poolalloc.report
diff -u poolalloc/test/TEST.poolalloc.report:1.20 poolalloc/test/TEST.poolalloc.report:1.21
--- poolalloc/test/TEST.poolalloc.report:1.20 Sat Nov 6 15:25:18 2004
+++ poolalloc/test/TEST.poolalloc.report Sat Nov 6 23:24:22 2004
@@ -60,8 +60,8 @@
["OnlyOHTime", 'CBE-RUN-TIME-ONLYOVERHEAD: program\s*([.0-9m:]+)'],
["OO run%", \&RuntimePercent],
- ["AllNodesTime", 'CBE-RUN-TIME-ALLNODES: program\s*([.0-9m:]+)'],
- ["AN run%", \&RuntimePercent],
+ ["MallocReplTime", 'CBE-RUN-TIME-MALLOCREPL: program\s*([.0-9m:]+)'],
+ ["MR run%", \&RuntimePercent],
["PoolAllocTime", 'CBE-RUN-TIME-POOLALLOC: program\s*([.0-9m:]+)'],
["PA run%", \&RuntimePercent],
More information about the llvm-commits
mailing list