[llvm-commits] [poolalloc] r104241 - in /poolalloc/trunk/test: Makefile TEST.dsgraph.Makefile
John Criswell
criswell at uiuc.edu
Thu May 20 10:57:21 PDT 2010
Author: criswell
Date: Thu May 20 12:57:20 2010
New Revision: 104241
URL: http://llvm.org/viewvc/llvm-project?rev=104241&view=rev
Log:
Started getting the DSGraph test working again.
Modified:
poolalloc/trunk/test/Makefile
poolalloc/trunk/test/TEST.dsgraph.Makefile
Modified: poolalloc/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/Makefile?rev=104241&r1=104240&r2=104241&view=diff
==============================================================================
--- poolalloc/trunk/test/Makefile (original)
+++ poolalloc/trunk/test/Makefile Thu May 20 12:57:20 2010
@@ -37,12 +37,14 @@
NORMAL_PROBLEM_SIZE_DIRS := \
- MultiSource/Benchmarks/Olden/bh \
- #MultiSource/Benchmarks/Olden \
- #MultiSource/Benchmarks/SciMark2-C/scimark2 \
- #External/Povray \
+ MultiSource/Benchmarks/Olden/bisort \
+ #MultiSource/Benchmarks/Olden/bh \
+ #External/SPEC/CINT2000 \
#External/FPGrowth \
#External/Namd \
+ #External/Povray \
+ #MultiSource/Benchmarks/Olden \
+ #MultiSource/Benchmarks/SciMark2-C/scimark2 \
#External/SPEC/CINT2000/164.gzip \
#External/SPEC/CINT2000/175.vpr \
#External/SPEC/CINT2000/176.gcc \
@@ -82,6 +84,29 @@
##############################################################################
# Targets for gathering statistics for programs for papers
##############################################################################
+# Program tests for DSA
+progdsa::
+ for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
+ (cd $$dir; \
+ PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -j1 TEST=dsgraph \
+ LARGE_PROBLEM_SIZE=1 report.html) \
+ done
+ for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
+ (cd $$dir; \
+ PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -j1 TEST=dsgraph \
+ report.html) \
+ done
+ @for dir in $(LARGE_PROBLEM_SIZE_DIRS); do \
+ (cd $$dir; \
+ PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -s -j1 TEST=dsgraph \
+ LARGE_PROBLEM_SIZE=1 report) \
+ done
+ @for dir in $(NORMAL_PROBLEM_SIZE_DIRS); do \
+ (cd $$dir; \
+ PROJECT_DIR=$(PROJ_OBJ_ROOT) $(MAKE) -s -j1 TEST=dsgraph \
+ report) \
+ done
+ @printf "\a"; sleep 1; printf "\a"; sleep 1; printf "\a"
# Program tests for Pool Allocation
progtest::
Modified: poolalloc/trunk/test/TEST.dsgraph.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.dsgraph.Makefile?rev=104241&r1=104240&r2=104241&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.dsgraph.Makefile (original)
+++ poolalloc/trunk/test/TEST.dsgraph.Makefile Thu May 20 12:57:20 2010
@@ -8,58 +8,84 @@
RELDIR := $(subst $(PROJ_OBJ_ROOT),,$(PROJ_OBJ_DIR))
# We require the programs to be linked with libdummy
-include $(LEVEL)/Makefile.dummylib
+#include $(LEVEL)/Makefile.dummylib
+
+# Pathname to poolalloc object tree
+PADIR := $(LLVM_OBJ_ROOT)/projects/poolalloc
+
+# Pathame to the DSA pass dynamic library
+DSA_SO := $(PADIR)/$(CONFIGURATION)/lib/libLLVMDataStructure$(SHLIBEXT)
# PASS - The dsgraph pass to run: ds, bu, td
-PASS := td
+PASS := eqtd
-ANALYZE_OPTS := -stats -time-passes -only-print-main-ds -dsstats
+#ANALYZE_OPTS := -stats -time-passes -only-print-main-ds -dsstats
+ANALYZE_OPTS := -stats -time-passes -dsstats
ANALYZE_OPTS += -instcount -disable-verify
MEM := -track-memory -time-passes
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
-Output/%.$(TEST).report.txt: Output/%.lib.bc Output/%.LOC.txt $(LOPT)
+Output/%.$(TEST).report.txt: Output/%.llvm.bc Output/%.LOC.txt $(LOPT)
@# Gather data
- -($(LOPT) -analyze -$(PASS)datastructure $(ANALYZE_OPTS) $<)> $@.time.1 2>&1
- -($(LOPT) -analyze $(MEM) -$(PASS)datastructure -disable-verify $<)> $@.mem.1 2>&1
- -($(LOPT) -steens-aa -time-passes -disable-output $<) > $@.time.2 2>&1
- -($(LOPT) -steens-aa $(MEM) -disable-output $<) > $@.mem.2 2>&1
+ -($(LOPT) -load $(DSA_SO) -analyze -dsa-$(PASS) $(ANALYZE_OPTS) $<)> $@.time.1 2>&1
+ -($(LOPT) -load $(DSA_SO) -analyze $(MEM) -dsa-$(PASS) -disable-verify $<)> $@.mem.1 2>&1
+ -($(LOPT) -load $(DSA_SO) -steens-aa -time-passes -disable-output $<) > $@.time.2 2>&1
+ -($(LOPT) -load $(DSA_SO) -steens-aa $(MEM) -disable-output $<) > $@.mem.2 2>&1
@# Emit data.
- @echo -n "LOC: " > $@
+ @echo "---------------------------------------------------------------" > $@
+ @echo ">>> ========= '$(RELDIR)/$*' Program" > $@
+ @echo "---------------------------------------------------------------" > $@
+ @/bin/echo -n "LOC: " >> $@
@cat Output/$*.LOC.txt >> $@
- @echo -n "MEMINSTS: " >> $@
+ @echo >> $@
+ @/bin/echo -n "MEMINSTS: " >> $@
- at grep 'Number of memory instructions' $@.time.1 >> $@
- @echo -n "FOLDEDNODES: " >> $@
+ @echo >> $@
+ @/bin/echo -n "FOLDEDNODES: " >> $@
- at grep 'Number of folded nodes' $@.time.1 >> $@
- @echo -n "TOTALNODES: " >> $@
+ @echo >> $@
+ @/bin/echo -n "TOTALNODES: " >> $@
- at grep 'Graphs contain.*nodes total' $@.time.1 >> $@
- @echo -n "MAXGRAPHSIZE: " >> $@
+ @echo >> $@
+ @/bin/echo -n "MAXGRAPHSIZE: " >> $@
- at grep 'Maximum graph size' $@.time.1 >> $@
- @echo -n "GLOBALSGRAPH: " >> $@
+ @echo >> $@
+ @/bin/echo -n "GLOBALSGRAPH: " >> $@
- at grep 'td.GlobalsGraph.dot' $@.time.1 >> $@
- @echo -n "SCCSIZE: " >> $@
+ @echo >> $@
+ @/bin/echo -n "SCCSIZE: " >> $@
- at grep 'Maximum SCC Size in Call Graph' $@.time.1 >> $@
- @echo -n "ACCESSES TYPED: " >> $@
+ @echo >> $@
+ @/bin/echo -n "ACCESSES TYPED: " >> $@
- at grep 'Number of loads/stores which are fully typed' $@.time.1 >> $@
- @echo -n "ACCESSES UNTYPED: " >> $@
+ @echo >> $@
+ @/bin/echo -n "ACCESSES UNTYPED: " >> $@
- at grep 'Number of loads/stores which are untyped' $@.time.1 >> $@
+ @echo >> $@
@# Emit timing data.
- @echo -n "TIME: " >> $@
+ @/bin/echo -n "TIME: " >> $@
- at grep ' Local Data Structure' $@.time.1 >> $@
- @echo -n "TIME: " >> $@
+ @echo >> $@
+ @/bin/echo -n "TIME: " >> $@
- at grep ' Bottom-up Data Structure' $@.time.1 >> $@
- @echo -n "TIME: " >> $@
+ @echo >> $@
+ @/bin/echo -n "TIME: " >> $@
- at grep ' Top-down Data Structure' $@.time.1 >> $@
- @echo -n "TIME: " >> $@
+ @echo >> $@
+ @/bin/echo -n "TIME: " >> $@
- at grep ' Steensgaard.s alias analysis' $@.time.2 >> $@
+ @echo >> $@
@# Emit space data.
- @echo -n "MEM: " >> $@
+ @/bin/echo -n "MEM: " >> $@
- at grep ' Local Data Structure' $@.mem.1 >> $@
- @echo -n "MEM: " >> $@
+ @echo >> $@
+ @/bin/echo -n "MEM: " >> $@
- at grep ' Bottom-up Data Structure' $@.mem.1 >> $@
- @echo -n "MEM: " >> $@
+ @echo >> $@
+ @/bin/echo -n "MEM: " >> $@
- at grep ' Top-down Data Structure' $@.mem.1 >> $@
- @echo -n "MEM: " >> $@
+ @echo >> $@
+ @/bin/echo -n "MEM: " >> $@
- at grep ' Steensgaard.s alias analysis' $@.mem.2 >> $@
More information about the llvm-commits
mailing list