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

[Will Dietz]

Author: wdietz2
Date: Tue Jun 29 13:42:52 2010
New Revision: 107190

URL: http://llvm.org/viewvc/llvm-project?rev=107190&view=rev
Log:
Improve the dsaa tests
fix the report to properly parse the results
add watchdog in opt invocation
remove passes that trigger the 'use after invalidated' issue, for now

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

Modified: poolalloc/trunk/test/TEST.dsaa.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.dsaa.Makefile?rev=107190&r1=107189&r2=107190&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.dsaa.Makefile (original)
+++ poolalloc/trunk/test/TEST.dsaa.Makefile Tue Jun 29 13:42:52 2010
@@ -15,6 +15,9 @@
 #PADIR   := /home/andrewl/Research/llvm/projects/poolalloc
 PADIR   := $(LLVM_OBJ_ROOT)/projects/poolalloc
 
+# Watchdog utility
+WATCHDOG := $(LLVM_OBJ_ROOT)/projects/poolalloc/$(CONFIGURATION)/bin/watchdog
+
 # Bits of runtime to improve analysis
 PA_PRE_RT := $(PADIR)/$(CONFIGURATION)/lib/libpa_pre_rt.bca
 
@@ -22,14 +25,17 @@
 DSA_SO   := $(PADIR)/$(CONFIGURATION)/lib/libLLVMDataStructure$(SHLIBEXT)
 
 # Command to run opt with the ds-aa pass loaded
-OPT_PA := $(LOPT) -load $(DSA_SO)
+OPT_PA := $(WATCHDOG) $(LOPT) -load $(DSA_SO)
 
 # OPT_PA_STATS - Run opt with the -stats and -time-passes options, capturing the
 # output to a file.
 OPT_PA_STATS = $(OPT_PA) -info-output-file=$(CURDIR)/$@.info -stats -time-passes
 
 #All llvm 2.7 -O3 passes
-OPTZN_PASSES := -preverify -domtree -verify -lowersetjmp -globalopt -ipsccp -deadargelim -instcombine -simplifycfg -basiccg -prune-eh -inline -functionattrs -argpromotion -domtree -domfrontier -scalarrepl -simplify-libcalls -instcombine -jump-threading -simplifycfg -instcombine -tailcallelim -simplifycfg -reassociate -domtree -loops -loopsimplify -domfrontier -loopsimplify -lcssa -loop-rotate -licm -lcssa -loop-unswitch -instcombine -scalar-evolution -loopsimplify -lcssa -iv-users -indvars -loop-deletion -loopsimplify -lcssa -loop-unroll -instcombine -memdep -gvn -memdep -memcpyopt -sccp -instcombine -jump-threading -domtree -memdep -dse -adce -simplifycfg -strip-dead-prototypes -print-used-types -deadtypeelim -globaldce -constmerge -preverify -domtree -verify
+#OPTZN_PASSES := -preverify -domtree -verify -lowersetjmp -globalopt -ipsccp -deadargelim -instcombine -simplifycfg -basiccg -prune-eh -inline -functionattrs -argpromotion -domtree -domfrontier -scalarrepl -simplify-libcalls -instcombine -jump-threading -simplifycfg -instcombine -tailcallelim -simplifycfg -reassociate -domtree -loops -loopsimplify -domfrontier -loopsimplify -lcssa -loop-rotate -licm -lcssa -loop-unswitch -instcombine -scalar-evolution -loopsimplify -lcssa -iv-users -indvars -loop-deletion -loopsimplify -lcssa -loop-unroll -instcombine -memdep -gvn -memdep -memcpyopt -sccp -instcombine -jump-threading -domtree -memdep -dse -adce -simplifycfg -strip-dead-prototypes -print-used-types -deadtypeelim -globaldce -constmerge -preverify -domtree -verify
+
+#Subset of -O3 passes to work around bugs
+OPTZN_PASSES := -preverify -domtree -verify -lowersetjmp -globalopt -ipsccp -deadargelim -instcombine -simplifycfg -basiccg -prune-eh -inline -functionattrs -argpromotion -domtree -domfrontier -scalarrepl -simplify-libcalls -instcombine -jump-threading -simplifycfg -instcombine -tailcallelim -simplifycfg -reassociate -domtree -loops -loopsimplify -domfrontier -loopsimplify -lcssa -loop-rotate -lcssa -loop-unswitch -instcombine -scalar-evolution -loopsimplify -lcssa -iv-users -indvars -loop-deletion -loopsimplify -lcssa -loop-unroll -instcombine -memdep -gvn -memdep -memcpyopt -sccp -instcombine -jump-threading -domtree -adce -simplifycfg -strip-dead-prototypes -print-used-types -deadtypeelim -globaldce -constmerge -preverify -domtree -verify
 
 #-ds-aa -opt1 -ds-aa -opt2, etc
 #this forces each pass to use -ds-aa as it's AA if it would use one
@@ -57,7 +63,7 @@
 $(PROGRAMS_TO_TEST:%=Output/%.dsaopt.bc): \
 Output/%.dsaopt.bc: Output/%.base.bc $(LOPT)
 	- at rm -f $(CURDIR)/$@.info
-	-$(OPT_PA_STATS) $(AA_OPT) $< -o $@ -f 2>&1 > $@.out
+	-$(OPT_PA_STATS) $(AA_OPT) -debug-pass=Executions $< -o $@ -f 2>&1 > $@.out
 
 # This rule compiles the new .bc file into a .s file
 Output/%.s: Output/%.bc $(LLC)

Modified: poolalloc/trunk/test/TEST.dsaa.report
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.dsaa.report?rev=107190&r1=107189&r2=107190&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.dsaa.report (original)
+++ poolalloc/trunk/test/TEST.dsaa.report Tue Jun 29 13:42:52 2010
@@ -83,7 +83,7 @@
  ["LLVMOptTime",      'RUN-TIME-LLVMOPT: program\s*([.0-9m:]+)', \&FormatTime],
  ["LLVMOpt run%",        \&RuntimePercent],
  [],
- ["DSA Time",        'RUN-TIME-DSAAOPT: program\s*([.0-9m:]+)', \&FormatTime],
+ ["DSA Time",        'RUN-TIME-DSAA: program\s*([.0-9m:]+)', \&FormatTime],
  ["DSA run%",        \&RuntimePercent],
 # [],
 # ["NoAlias",        'no alias responses[^0-9]*([0-9]*\.[0-9]*)'],