[llvm-commits] CVS: llvm-poolalloc/test/TEST.optzn.Makefile TEST.optzn.report TEST.pacompiletime.report TEST.poolalloc.Makefile TEST.poolalloc.report
Chris Lattner
lattner at cs.uiuc.edu
Thu Apr 21 09:11:12 PDT 2005
Changes in directory llvm-poolalloc/test:
TEST.optzn.Makefile updated: 1.1 -> 1.2
TEST.optzn.report updated: 1.1 -> 1.2
TEST.pacompiletime.report updated: 1.1 -> 1.2
TEST.poolalloc.Makefile updated: 1.38 -> 1.39
TEST.poolalloc.report updated: 1.25 -> 1.26
---
Log message:
tweak a bunch of reports
---
Diffs of the changes: (+112 -58)
TEST.optzn.Makefile | 84 ++++++++++++++++++++++++++++++++--------------
TEST.optzn.report | 2 -
TEST.pacompiletime.report | 4 +-
TEST.poolalloc.Makefile | 48 +++++++++++++-------------
TEST.poolalloc.report | 32 +++++++++++++----
5 files changed, 112 insertions(+), 58 deletions(-)
Index: llvm-poolalloc/test/TEST.optzn.Makefile
diff -u llvm-poolalloc/test/TEST.optzn.Makefile:1.1 llvm-poolalloc/test/TEST.optzn.Makefile:1.2
--- llvm-poolalloc/test/TEST.optzn.Makefile:1.1 Thu Nov 11 04:13:00 2004
+++ llvm-poolalloc/test/TEST.optzn.Makefile Thu Apr 21 11:10:58 2005
@@ -21,12 +21,12 @@
RELDIR := $(subst $(PROGDIR),,$(CURDIR))
# Pool allocator pass shared object
-PA_SO := $(PROJECT_DIR)/lib/Debug/libpoolalloc$(SHLIBEXT)
+PA_SO := $(PROJECT_DIR)/Debug/lib/poolalloc$(SHLIBEXT)
# Pool allocator runtime library
#PA_RT := $(PROJECT_DIR)/lib/Bytecode/libpoolalloc_fl_rt.bc
#PA_RT_O := $(PROJECT_DIR)/lib/$(CONFIGURATION)/poolalloc_rt.o
-PA_RT_O := $(PROJECT_DIR)/lib/Release/poolalloc_rt.o
+PA_RT_O := $(PROJECT_DIR)/Release/lib/poolalloc_rt.o
#PA_RT_O := $(PROJECT_DIR)/lib/Release/poolalloc_fl_rt.o
# Command to run opt with the pool allocator pass loaded
@@ -36,11 +36,17 @@
# output to a file.
OPT_PA_STATS = $(OPT_PA) -info-output-file=$(CURDIR)/$@.info -stats -time-passes
-OPTZN_PASSES := -globaldce -ipconstprop -deadargelim -adce -instcombine -simplifycfg
+OPTZN_PASSES := -globaldce -ipsccp -deadargelim -adce -instcombine -simplifycfg
# This rule runs the pool allocator on the .llvm.bc file to produce a new .bc
# file
+$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).basepa.bc): \
+Output/%.$(TEST).basepa.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+ - at rm -f $(CURDIR)/$@.info
+ -$(OPT_PA_STATS) -poolalloc -poolalloc-disable-alignopt -poolalloc-heuristic=AllNodes $(EXTRA_PA_FLAGS) $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
+
+
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).selectivepa.bc): \
Output/%.$(TEST).selectivepa.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
@@ -49,22 +55,26 @@
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).bumpptr.bc): \
Output/%.$(TEST).bumpptr.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
- -$(OPT_PA_STATS) -poolalloc $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
+ -$(OPT_PA_STATS) -poolalloc $(EXTRA_PA_FLAGS) $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
-$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).basepa.bc): \
-Output/%.$(TEST).basepa.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).align.bc): \
+Output/%.$(TEST).align.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
- -$(OPT_PA_STATS) -poolalloc -poolalloc-heuristic=AllNodes -poolalloc-force-all-poolfrees $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
+ -$(OPT_PA_STATS) -poolalloc -poolalloc-disable-alignopt $(EXTRA_PA_FLAGS) $(OPTZN_PASSES) -pooloptimize $< -o $@ -f 2>&1 > $@.out
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).freeelim.bc): \
Output/%.$(TEST).freeelim.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
- -$(OPT_PA_STATS) -poolalloc -poolalloc-force-all-poolfrees $(OPTZN_PASSES) -pooloptimize $< -o $@ -f 2>&1 > $@.out
+ -$(OPT_PA_STATS) -poolalloc -poolalloc-force-all-poolfrees $(EXTRA_PA_FLAGS) $(OPTZN_PASSES) -pooloptimize $< -o $@ -f 2>&1 > $@.out
# This rule compiles the new .bc file into a .c file using CBE
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe.c): \
+Output/%.basepa.cbe.c: Output/%.$(TEST).basepa.bc $(LLC)
+ -$(LLC) -march=c -f $< -o $@
+
$(PROGRAMS_TO_TEST:%=Output/%.selectivepa.cbe.c): \
Output/%.selectivepa.cbe.c: Output/%.$(TEST).selectivepa.bc $(LLC)
-$(LLC) -march=c -f $< -o $@
@@ -73,8 +83,8 @@
Output/%.bumpptr.cbe.c: Output/%.$(TEST).bumpptr.bc $(LLC)
-$(LLC) -march=c -f $< -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe.c): \
-Output/%.basepa.cbe.c: Output/%.$(TEST).basepa.bc $(LLC)
+$(PROGRAMS_TO_TEST:%=Output/%.align.cbe.c): \
+Output/%.align.cbe.c: Output/%.$(TEST).align.bc $(LLC)
-$(LLC) -march=c -f $< -o $@
$(PROGRAMS_TO_TEST:%=Output/%.freeelim.cbe.c): \
@@ -83,6 +93,10 @@
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe): \
+Output/%.basepa.cbe: Output/%.basepa.cbe.c $(PA_RT_O)
+ -$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
+
$(PROGRAMS_TO_TEST:%=Output/%.selectivepa.cbe): \
Output/%.selectivepa.cbe: Output/%.selectivepa.cbe.c $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
@@ -91,8 +105,8 @@
Output/%.bumpptr.cbe: Output/%.bumpptr.cbe.c $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe): \
-Output/%.basepa.cbe: Output/%.basepa.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.align.cbe): \
+Output/%.align.cbe: Output/%.align.cbe.c $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
$(PROGRAMS_TO_TEST:%=Output/%.freeelim.cbe): \
@@ -105,6 +119,10 @@
# This rule runs the generated executable, generating timing information, for
# normal test programs
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.out-cbe): \
+Output/%.basepa.out-cbe: Output/%.basepa.cbe
+ -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+
$(PROGRAMS_TO_TEST:%=Output/%.selectivepa.out-cbe): \
Output/%.selectivepa.out-cbe: Output/%.selectivepa.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
@@ -113,8 +131,8 @@
Output/%.bumpptr.out-cbe: Output/%.bumpptr.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.out-cbe): \
-Output/%.basepa.out-cbe: Output/%.basepa.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.align.out-cbe): \
+Output/%.align.out-cbe: Output/%.align.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
$(PROGRAMS_TO_TEST:%=Output/%.freeelim.out-cbe): \
@@ -125,6 +143,14 @@
# This rule runs the generated executable, generating timing information, for
# SPEC
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.out-cbe): \
+Output/%.basepa.out-cbe: Output/%.basepa.cbe
+ -$(SPEC_SANDBOX) basepacbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+ ../../$< $(RUN_OPTIONS)
+ -(cd Output/basepacbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/basepacbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+
$(PROGRAMS_TO_TEST:%=Output/%.selectivepa.out-cbe): \
Output/%.selectivepa.out-cbe: Output/%.selectivepa.cbe
-$(SPEC_SANDBOX) selectivepacbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
@@ -141,13 +167,13 @@
-(cd Output/bumpptrcbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-cp Output/bumpptrcbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.out-cbe): \
-Output/%.basepa.out-cbe: Output/%.basepa.cbe
- -$(SPEC_SANDBOX) basepacbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+$(PROGRAMS_TO_TEST:%=Output/%.align.out-cbe): \
+Output/%.align.out-cbe: Output/%.align.cbe
+ -$(SPEC_SANDBOX) aligncbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
../../$< $(RUN_OPTIONS)
- -(cd Output/basepacbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
- -cp Output/basepacbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+ -(cd Output/aligncbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/aligncbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
$(PROGRAMS_TO_TEST:%=Output/%.freeelim.out-cbe): \
Output/%.freeelim.out-cbe: Output/%.freeelim.cbe
@@ -162,6 +188,11 @@
# This rule diffs the post-poolallocated version to make sure we didn't break
# the program!
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.diff-cbe): \
+Output/%.basepa.diff-cbe: Output/%.out-nat Output/%.basepa.out-cbe
+ @cp Output/$*.out-nat Output/$*.basepa.out-nat
+ -$(DIFFPROG) cbe $*.basepa $(HIDEDIFF)
+
$(PROGRAMS_TO_TEST:%=Output/%.selectivepa.diff-cbe): \
Output/%.selectivepa.diff-cbe: Output/%.out-nat Output/%.selectivepa.out-cbe
@cp Output/$*.out-nat Output/$*.selectivepa.out-nat
@@ -172,10 +203,10 @@
@cp Output/$*.out-nat Output/$*.bumpptr.out-nat
-$(DIFFPROG) cbe $*.bumpptr $(HIDEDIFF)
-$(PROGRAMS_TO_TEST:%=Output/%.basepa.diff-cbe): \
-Output/%.basepa.diff-cbe: Output/%.out-nat Output/%.basepa.out-cbe
- @cp Output/$*.out-nat Output/$*.basepa.out-nat
- -$(DIFFPROG) cbe $*.basepa $(HIDEDIFF)
+$(PROGRAMS_TO_TEST:%=Output/%.align.diff-cbe): \
+Output/%.align.diff-cbe: Output/%.out-nat Output/%.align.out-cbe
+ @cp Output/$*.out-nat Output/$*.align.out-nat
+ -$(DIFFPROG) cbe $*.align $(HIDEDIFF)
$(PROGRAMS_TO_TEST:%=Output/%.freeelim.diff-cbe): \
Output/%.freeelim.diff-cbe: Output/%.out-nat Output/%.freeelim.out-cbe
@@ -188,9 +219,10 @@
# generated from.
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
Output/%.$(TEST).report.txt: Output/%.out-nat \
+ Output/%.basepa.diff-cbe \
Output/%.selectivepa.diff-cbe \
Output/%.bumpptr.diff-cbe \
- Output/%.basepa.diff-cbe \
+ Output/%.align.diff-cbe \
Output/%.freeelim.diff-cbe \
Output/%.LOC.txt
@echo > $@
@@ -198,6 +230,10 @@
printf "CBE-RUN-TIME-BASEPA: " >> $@;\
grep "^program" Output/$*.basepa.out-cbe.time >> $@;\
fi
+ @-if test -f Output/$*.align.diff-cbe; then \
+ printf "CBE-RUN-TIME-ALIGN: " >> $@;\
+ grep "^program" Output/$*.align.out-cbe.time >> $@;\
+ fi
@-if test -f Output/$*.freeelim.diff-cbe; then \
printf "CBE-RUN-TIME-FREEELIM: " >> $@;\
grep "^program" Output/$*.freeelim.out-cbe.time >> $@;\
Index: llvm-poolalloc/test/TEST.optzn.report
diff -u llvm-poolalloc/test/TEST.optzn.report:1.1 llvm-poolalloc/test/TEST.optzn.report:1.2
--- llvm-poolalloc/test/TEST.optzn.report:1.1 Thu Nov 11 04:13:00 2004
+++ llvm-poolalloc/test/TEST.optzn.report Thu Apr 21 11:10:58 2005
@@ -65,10 +65,10 @@
[],
# Times
["BasePA", 'CBE-RUN-TIME-BASEPA: program\s*([.0-9m:]+)', \&FormatTime],
- [],
["NoSelectivePA", 'CBE-RUN-TIME-SELECTIVEPA: program\s*([.0-9m:]+)', \&FormatTime],
["NoFreeElim", 'CBE-RUN-TIME-FREEELIM: program\s*([.0-9m:]+)', \&FormatTime],
["NoBumpPtr", 'CBE-RUN-TIME-BUMPPTR: program\s*([.0-9m:]+)', \&FormatTime],
+ ["NoAlign", 'CBE-RUN-TIME-ALIGN: program\s*([.0-9m:]+)', \&FormatTime],
[]
);
Index: llvm-poolalloc/test/TEST.pacompiletime.report
diff -u llvm-poolalloc/test/TEST.pacompiletime.report:1.1 llvm-poolalloc/test/TEST.pacompiletime.report:1.2
--- llvm-poolalloc/test/TEST.pacompiletime.report:1.1 Sat Apr 2 13:53:52 2005
+++ llvm-poolalloc/test/TEST.pacompiletime.report Thu Apr 21 11:10:58 2005
@@ -49,9 +49,11 @@
["LOC", "${USERSYSTTIME}Local"],
["BU", "${USERSYSTTIME}Bottom-up"],
["TD", "${USERSYSTTIME}Top-down"],
+ ["DSASUM", sub { return SumCols(@_, 3); }],
+ [],
["COM", "${USERSYSTTIME}'Complete'"],
["EQ", "${USERSYSTTIME}Equivalence"],
- ["DSASUM", sub { return SumCols(@_, 5); }],
+ ["EBUSUM", sub { return SumCols(@_, 2); }],
[],
["PA Time", "${USERSYSTTIME}Pool allocate"],
[]
Index: llvm-poolalloc/test/TEST.poolalloc.Makefile
diff -u llvm-poolalloc/test/TEST.poolalloc.Makefile:1.38 llvm-poolalloc/test/TEST.poolalloc.Makefile:1.39
--- llvm-poolalloc/test/TEST.poolalloc.Makefile:1.38 Mon Apr 11 16:34:36 2005
+++ llvm-poolalloc/test/TEST.poolalloc.Makefile Thu Apr 21 11:10:58 2005
@@ -46,10 +46,10 @@
- at rm -f $(CURDIR)/$@.info
-$(OPT_PA_STATS) -poolalloc $(EXTRA_PA_FLAGS) $(OPTZN_PASSES) -pooloptimize $< -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).basepa.bc): \
+Output/%.$(TEST).basepa.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
- at rm -f $(CURDIR)/$@.info
- -$(OPT_PA_STATS) -poolalloc -poolalloc-heuristic=AllNodes $(OPTZN_PASSES) -pooloptimize $< -o $@ -f 2>&1 > $@.out
+ -$(OPT_PA_STATS) -poolalloc -poolalloc-disable-alignopt -poolalloc-force-all-poolfrees -poolalloc-heuristic=AllNodes $(OPTZN_PASSES) $< -o $@ -f 2>&1 > $@.out
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).mallocrepl.bc): \
@@ -72,8 +72,8 @@
Output/%.poolalloc.cbe.c: Output/%.$(TEST).poolalloc.bc $(LLC)
-$(LLC) -march=c -f $< -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.cbe.c): \
-Output/%.allnodes.cbe.c: Output/%.$(TEST).allnodes.bc $(LLC)
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe.c): \
+Output/%.basepa.cbe.c: Output/%.$(TEST).basepa.bc $(LLC)
-$(LLC) -march=c -f $< -o $@
$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.cbe.c): \
@@ -94,8 +94,8 @@
Output/%.poolalloc.cbe: Output/%.poolalloc.cbe.c $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.cbe): \
-Output/%.allnodes.cbe: Output/%.allnodes.cbe.c $(PA_RT_O)
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.cbe): \
+Output/%.basepa.cbe: Output/%.basepa.cbe.c $(PA_RT_O)
-$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.cbe): \
@@ -120,8 +120,8 @@
Output/%.poolalloc.out-cbe: Output/%.poolalloc.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-$(PROGRAMS_TO_TEST:%=Output/%.allnodes.out-cbe): \
-Output/%.allnodes.out-cbe: Output/%.allnodes.cbe
+$(PROGRAMS_TO_TEST:%=Output/%.basepa.out-cbe): \
+Output/%.basepa.out-cbe: Output/%.basepa.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out-cbe): \
@@ -147,13 +147,13 @@
-(cd Output/poolalloccbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
-cp Output/poolalloccbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
-$(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/%.basepa.out-cbe): \
+Output/%.basepa.out-cbe: Output/%.basepa.cbe
+ -$(SPEC_SANDBOX) basepacbe-$(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/basepacbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/basepacbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.out-cbe): \
Output/%.mallocrepl.out-cbe: Output/%.mallocrepl.cbe
@@ -189,10 +189,10 @@
@cp Output/$*.out-nat Output/$*.poolalloc.out-nat
-$(DIFFPROG) cbe $*.poolalloc $(HIDEDIFF)
-$(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/%.basepa.diff-cbe): \
+Output/%.basepa.diff-cbe: Output/%.out-nat Output/%.basepa.out-cbe
+ @cp Output/$*.out-nat Output/$*.basepa.out-nat
+ -$(DIFFPROG) cbe $*.basepa $(HIDEDIFF)
$(PROGRAMS_TO_TEST:%=Output/%.mallocrepl.diff-cbe): \
Output/%.mallocrepl.diff-cbe: Output/%.out-nat Output/%.mallocrepl.out-cbe
@@ -216,7 +216,7 @@
Output/%.$(TEST).report.txt: Output/%.out-nat \
Output/%.nonpa.diff-cbe \
Output/%.poolalloc.diff-cbe \
- Output/%.allnodes.diff-cbe \
+ Output/%.basepa.diff-cbe \
Output/%.mallocrepl.diff-cbe \
Output/%.onlyoverhead.diff-cbe \
Output/%.LOC.txt
@@ -237,9 +237,9 @@
printf "CBE-RUN-TIME-ONLYOVERHEAD: " >> $@;\
grep "^program" Output/$*.onlyoverhead.out-cbe.time >> $@;\
fi
- @-if test -f Output/$*.allnodes.diff-cbe; then \
- printf "CBE-RUN-TIME-ALLNODES: " >> $@;\
- grep "^program" Output/$*.allnodes.out-cbe.time >> $@;\
+ @-if test -f Output/$*.basepa.diff-cbe; then \
+ printf "CBE-RUN-TIME-BASEPA: " >> $@;\
+ grep "^program" Output/$*.basepa.out-cbe.time >> $@;\
fi
@-if test -f Output/$*.poolalloc.diff-cbe; then \
printf "CBE-RUN-TIME-POOLALLOC: " >> $@;\
@@ -247,8 +247,8 @@
fi
printf "LOC: " >> $@
cat Output/$*.LOC.txt >> $@
- @cat Output/$*.$(TEST).allnodes.bc.info >> $@
- @#cat Output/$*.$(TEST).allnodes.bc.out >> $@
+ @cat Output/$*.$(TEST).poolalloc.bc.info >> $@
+ @#cat Output/$*.$(TEST).basepa.bc.out >> $@
$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
Index: llvm-poolalloc/test/TEST.poolalloc.report
diff -u llvm-poolalloc/test/TEST.poolalloc.report:1.25 llvm-poolalloc/test/TEST.poolalloc.report:1.26
--- llvm-poolalloc/test/TEST.poolalloc.report:1.25 Thu Nov 11 04:13:00 2004
+++ llvm-poolalloc/test/TEST.poolalloc.report Thu Apr 21 11:10:58 2005
@@ -35,12 +35,6 @@
my $PTRDIST = 'MultiSource/Benchmarks/Ptrdist';
@LatexRowMapOrder = (
- "anagram/anagram" => 'anagram',
- "bc/bc" => 'bc',
- "ft/ft" => 'ft',
- "ks/ks" => 'ks',
- "yacr2/yacr2" => 'yacr2',
- '-' => '-',
'164.gzip/164.gzip' => '164.gzip',
'175.vpr/175.vpr' => '175.vpr',
'181.mcf/181.mcf' => '181.mcf',
@@ -51,7 +45,27 @@
'256.bzip2/256.bzip2' => '256.bzip2',
'300.twolf/300.twolf' => '300.twolf',
'-' => '-',
+ "anagram/anagram" => 'anagram',
+ "bc/bc" => 'bc',
+ "ft/ft" => 'ft',
+ "ks/ks" => 'ks',
+ "yacr2/yacr2" => 'yacr2',
+ '-' => '-',
"analyzer" => 'analyzer',
+ "neural" => 'neural',
+ "pcompress2" => 'pcompress2',
+ "piff2" => 'piff2',
+ '-' => '-',
+ "bh/bh" => 'bh',
+ "bisort/bisort" => 'bisort',
+ "em3d/em3d" => 'em3d',
+ "health/health" => 'health',
+ "mst/mst" => 'mst',
+ "perimeter/perimeter" => 'perimeter',
+ "power/power" => 'power',
+ "treeadd/treeadd" => 'treeadd',
+ "tsp/tsp" => 'tsp',
+ '-' => '-',
"llu" => 'llu-bench',
);
@@ -77,13 +91,15 @@
["PA Time", 'CBE-RUN-TIME-POOLALLOC: program\s*([.0-9m:]+)', \&FormatTime],
["PA run%", \&RuntimePercent],
[],
- ["AllNodes", 'CBE-RUN-TIME-ALLNODES: program\s*([.0-9m:]+)', \&FormatTime],
- ["AN run%", \&RuntimePercent],
+ ["Basepa", 'CBE-RUN-TIME-BASEPA: program\s*([.0-9m:]+)', \&FormatTime],
+ ["Base run%", \&RuntimePercent],
[],
["NumPools", '([0-9]+).*Number of pools allocated'],
["Typesafe", '([0-9]+).*Number of typesafe pools'],
["BumpPtr", '([0-9]+).*Number of bump pointer pools'],
+ ["PFE", '([0-9]+).*Number of poolfree.s elided'],
["NumArgs", '([0-9]+).*Number of function arguments added'],
+ ["MaxArgs", '([0-9]+).*Maximum function arguments added'],
#["Nonprofit", '([0-9]+).*Number of DSNodes not profitable'],
[]
);
More information about the llvm-commits
mailing list