[llvm-commits] CVS: poolalloc/test/TEST.poolalloc.Makefile TEST.poolalloc.report
Chris Lattner
lattner at cs.uiuc.edu
Sun Mar 7 20:26:38 PST 2004
Changes in directory poolalloc/test:
TEST.poolalloc.Makefile updated: 1.21 -> 1.22
TEST.poolalloc.report updated: 1.14 -> 1.15
---
Log message:
Hack on the report a bunch to calculate both the 'all nodes' and the 'smart' heuristic in the same run
---
Diffs of the changes: (+81 -32)
Index: poolalloc/test/TEST.poolalloc.Makefile
diff -u poolalloc/test/TEST.poolalloc.Makefile:1.21 poolalloc/test/TEST.poolalloc.Makefile:1.22
--- poolalloc/test/TEST.poolalloc.Makefile:1.21 Fri Mar 5 14:40:04 2004
+++ poolalloc/test/TEST.poolalloc.Makefile Fri Mar 5 15:36:53 2004
@@ -42,16 +42,33 @@
- at rm -f $(CURDIR)/$@.info
-$(OPT_PA_STATS) -q -poolalloc $(EXTRA_PA_FLAGS) -globaldce -ipconstprop -deadargelim $< -o $@ -f 2>&1 > $@.out
+
+$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).allnodes.bc): \
+Output/%.$(TEST).allnodes.bc: Output/%.llvm.bc $(PA_SO) $(LOPT)
+ - at rm -f $(CURDIR)/$@.info
+ -$(OPT_PA_STATS) -q -poolalloc -poolalloc-heuristic=AllNodes -globaldce -ipconstprop -deadargelim $< -o $@ -f 2>&1 > $@.out
+
# 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/%.$(TEST).transformed.bc $(LLC)
-$(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)
+ -$(LLC) -march=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 $(PA_RT_O)
-$(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)
+ -$(CC) $(CFLAGS) $< $(PA_RT_O) $(LLCLIBS) $(LDFLAGS) -o $@
+
$(PROGRAMS_TO_TEST:%=Output/%.nonpa.bc): \
Output/%.nonpa.bc: Output/%.llvm.bc $(LOPT)
- at rm -f $(CURDIR)/$@.info
@@ -76,6 +93,12 @@
Output/%.poolalloc.out-cbe: Output/%.poolalloc.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+# 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
+ -$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+
# This rule runs the generated executable, generating timing information, for
# normal test programs
@@ -96,6 +119,16 @@
# 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) \
+ $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+ ../../$< $(RUN_OPTIONS)
+ -(cd Output/allnodescbe-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+ -cp Output/allnodescbe-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
+
+# This rule runs the generated executable, generating timing information, for
+# SPEC
$(PROGRAMS_TO_TEST:%=Output/%.nonpa.out-cbe): \
Output/%.nonpa.out-cbe: Output/%.nonpa.cbe
-$(SPEC_SANDBOX) nonpacbe-$(RUN_TYPE) $@ $(REF_IN_DIR) \
@@ -114,6 +147,13 @@
@cp Output/$*.out-nat Output/$*.poolalloc.out-nat
-$(DIFFPROG) cbe $*.poolalloc $(HIDEDIFF)
+# 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)
+
# This rule diffs the post-nonpa version to make sure we didn't break the
# program!
$(PROGRAMS_TO_TEST:%=Output/%.nonpa.diff-cbe): \
@@ -128,6 +168,7 @@
Output/%.$(TEST).report.txt: Output/%.$(TEST).transformed.bc \
Output/%.nonpa.diff-cbe \
Output/%.poolalloc.diff-cbe \
+ Output/%.allnodes.diff-cbe \
Output/%.LOC.txt
@echo > $@
@-if test -f Output/$*.poolalloc.diff-cbe; then \
@@ -135,6 +176,12 @@
grep "^user" Output/$*.nonpa.out-cbe.time >> $@;\
printf "CBE-RUN-TIME-NORMAL-SYS: " >> $@;\
grep "^sys" Output/$*.nonpa.out-cbe.time >> $@;\
+ \
+ printf "CBE-RUN-TIME-ALLNODES-USER: " >> $@;\
+ grep "^user" Output/$*.allnodes.out-cbe.time >> $@;\
+ printf "CBE-RUN-TIME-ALLNODES-SYS: " >> $@;\
+ grep "^sys" Output/$*.allnodes.out-cbe.time >> $@;\
+ \
printf "CBE-RUN-TIME-POOLALLOC-USER: " >> $@;\
grep "^user" Output/$*.poolalloc.out-cbe.time >> $@;\
printf "CBE-RUN-TIME-POOLALLOC-SYS: " >> $@;\
@@ -143,8 +190,8 @@
cat Output/$*.LOC.txt >> $@;\
fi
- @cat Output/$*.$(TEST).transformed.bc.info >> $@
- @#cat Output/$*.$(TEST).transformed.bc.out >> $@
+ @cat Output/$*.$(TEST).allnodes.bc.info >> $@
+ @#cat Output/$*.$(TEST).allnodes.bc.out >> $@
$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
Index: poolalloc/test/TEST.poolalloc.report
diff -u poolalloc/test/TEST.poolalloc.report:1.14 poolalloc/test/TEST.poolalloc.report:1.15
--- poolalloc/test/TEST.poolalloc.report:1.14 Fri Mar 5 15:07:56 2004
+++ poolalloc/test/TEST.poolalloc.report Fri Mar 5 15:36:53 2004
@@ -10,9 +10,9 @@
sub Ratio {
my ($Cols, $Col) = @_;
- if ($Cols->[$Col-1] ne "*" and $Cols->[$Col-4] ne "*" and
+ if ($Cols->[$Col-1] ne "*" and $Cols->[5] ne "*" and
$Cols->[$Col-1] != "0") {
- return sprintf "%1.3f", $Cols->[$Col-4]/$Cols->[$Col-1];
+ return sprintf "%1.3f", $Cols->[5]/$Cols->[$Col-1];
} else {
return "n/a";
}
@@ -42,32 +42,32 @@
my $FREEBENCH = 'MultiSource/Benchmarks/FreeBench';
my $PTRDIST = 'MultiSource/Benchmarks/Ptrdist';
- at LatexRowMapOrder = (
- "$OLDEN/bh/bh" => 'bh',
- "$OLDEN/bisort/bisort" => 'bisort',
- "$OLDEN/em3d/em3d" => 'em3d',
- "$OLDEN/health/health" => 'health',
- "$OLDEN/mst/mst" => 'mst',
- "$OLDEN/perimeter/perimeter" => 'perimeter',
- "$OLDEN/power/power" => 'power',
- "$OLDEN/treeadd/treeadd" => 'treeadd',
- "$OLDEN/tsp/tsp" => 'tsp',
- "$OLDEN/voronoi/voronoi" => 'voronoi',
- '-' => '-',
- "$FREEBENCH/analyzer/analyzer" => 'analyzer',
+#@LatexRowMapOrder = (
+# "$OLDEN/bh/bh" => 'bh',
+# "$OLDEN/bisort/bisort" => 'bisort',
+# "$OLDEN/em3d/em3d" => 'em3d',
+# "$OLDEN/health/health" => 'health',
+# "$OLDEN/mst/mst" => 'mst',
+# "$OLDEN/perimeter/perimeter" => 'perimeter',
+# "$OLDEN/power/power" => 'power',
+# "$OLDEN/treeadd/treeadd" => 'treeadd',
+# "$OLDEN/tsp/tsp" => 'tsp',
+# "$OLDEN/voronoi/voronoi" => 'voronoi',
+# '-' => '-',
+# "$FREEBENCH/analyzer/analyzer" => 'analyzer',
# "$FREEBENCH/distray/distray" => 'distray',
# "$FREEBENCH/fourinarow/fourinarow" => 'fourinarow',
# "$FREEBENCH/mason/mason" => 'mason',
- "$FREEBENCH/neural/neural" => 'neural',
- "$FREEBENCH/pcompress2/pcompress2" => 'pcompress2',
- "$FREEBENCH/pifft/pifft" => 'pifft',
- '-' => '-',
- "$PTRDIST/anagram/anagram" => 'anagram',
- "$PTRDIST/bc/bc" => 'bc',
- "$PTRDIST/ft/ft" => 'ft',
- "$PTRDIST/ks/ks" => 'ks',
- "$PTRDIST/yacr2/yacr2" => 'yacr2',
- );
+# "$FREEBENCH/neural/neural" => 'neural',
+# "$FREEBENCH/pcompress2/pcompress2" => 'pcompress2',
+# "$FREEBENCH/pifft/pifft" => 'pifft',
+# '-' => '-',
+# "$PTRDIST/anagram/anagram" => 'anagram',
+# "$PTRDIST/bc/bc" => 'bc',
+# "$PTRDIST/ft/ft" => 'ft',
+# "$PTRDIST/ks/ks" => 'ks',
+# "$PTRDIST/yacr2/yacr2" => 'yacr2',
+# );
# These are the columns for the report. The first entry is the header for the
@@ -82,16 +82,18 @@
["NormalUser", 'CBE-RUN-TIME-NORMAL-USER: user\s*([.0-9m:]+)', \&FormatTime],
["NormalSys", 'CBE-RUN-TIME-NORMAL-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
["NormalSum", \&Sum],
+ ["AllNodesUser", 'CBE-RUN-TIME-ALLNODES-USER: user\s*([.0-9m:]+)', \&FormatTime],
+ ["AllNodesSys", 'CBE-RUN-TIME-ALLNODES-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
+ ["AllNodesSum", \&Sum],
+ ["AN Speedup", \&Ratio],
["PoolAllocUser", 'CBE-RUN-TIME-POOLALLOC-USER: user\s*([.0-9m:]+)', \&FormatTime],
["PoolAllocSys", 'CBE-RUN-TIME-POOLALLOC-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
["PoolAllocSum", \&Sum],
- ["Speedup", \&Ratio],
- ["NumPools", '([0-9]+).*Number of pools allocated'],
- ["NumTSPools", '([0-9]+).*Number of typesafe pools'],
+ ["PA Speedup", \&Ratio],
+ ["AP NumPools", '([0-9]+).*Number of pools allocated'],
+ ["AP Typesafe", '([0-9]+).*Number of typesafe pools'],
["NumArgs", '([0-9]+).*Number of function arguments added'],
["Nonprofit", '([0-9]+).*Number of DSNodes not profitable'],
- ["Colocated", '([0-9]+).*Number of DSNodes colocated'],
- ["NumPFElide", '([0-9]+).*Number of poolfree.s elided'],
[]
);
More information about the llvm-commits
mailing list