[llvm-commits] [poolalloc] r124876 - in /poolalloc/trunk/test: TEST.dsgraph.Makefile TEST.dsgraph.report

[Arushi Aggarwal]

Author: aggarwa4
Date: Fri Feb  4 11:49:42 2011
New Revision: 124876

URL: http://llvm.org/viewvc/llvm-project?rev=124876&view=rev
Log:
Correcting makefile, to get all the stats.

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

Modified: poolalloc/trunk/test/TEST.dsgraph.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.dsgraph.Makefile?rev=124876&r1=124875&r2=124876&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.dsgraph.Makefile (original)
+++ poolalloc/trunk/test/TEST.dsgraph.Makefile Fri Feb  4 11:49:42 2011
@@ -24,7 +24,7 @@
 
 ANALYZE_OPTS := -stats -time-passes -disable-output -dsstats
 #ANALYZE_OPTS := -stats -time-passes -dsstats 
-ANALYZE_OPTS +=  -instcount -disable-verify
+ANALYZE_OPTS +=  -instcount -disable-verify -analyze
 MEM := -track-memory -time-passes -disable-output
 
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
@@ -44,10 +44,10 @@
 	- at grep 'Number of memory instructions' $@.time.1 >> $@
 	@echo >> $@
 	@/bin/echo -n "FOLDEDNODES: " >> $@
-	- at grep 'Number of folded nodes' $@.time.1 >> $@
+	- at grep 'Number of nodes completely folded' $@.time.1 >> $@
 	@echo >> $@
 	@/bin/echo -n "TOTALNODES: " >> $@
-	- at grep 'Graphs contain.*nodes total' $@.time.1 >> $@
+	- at grep 'Number of nodes allocated' $@.time.1 >> $@
 	@echo >> $@
 	@/bin/echo -n "MAXGRAPHSIZE: " >> $@
 	- at grep 'Maximum graph size' $@.time.1 >> $@

Modified: poolalloc/trunk/test/TEST.dsgraph.report
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.dsgraph.report?rev=124876&r1=124875&r2=124876&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.dsgraph.report (original)
+++ poolalloc/trunk/test/TEST.dsgraph.report Fri Feb  4 11:49:42 2011
@@ -150,11 +150,11 @@
             ["BUTDSz:" , sub { return SumCols(@_, 2); }],
             [],
 # Misc stuff
-            ["NumNodes", 'Graphs contain \\[([0-9+]+)\\] nodes total'],
-            ["NumFold" , '([0-9]+).*Number of folded nodes '],
-            ["MaxSz"   , '([0-9]+).*Maximum graph size'],
-            ["GlobGr"  , '\\.GlobalsGraph\\.dot\'... \\[([0-9+]+)\\]'],
-            ["MaxSCC"  , '([0-9]+).*Maximum SCC Size in Call Graph'],
+            ["NumNodes", "TOTALNODES: *([0-9]+)"],
+            ["NumFold",  "FOLDEDNODES: *([0-9]+)"],
+            ["MaxSz"   , "MAXGRAPHSIZE: *([0-9]+)"],
+            ["GlobGr"   , "GLOBALSGRAPH: *([0-9]+)"],
+            ["MaxSCC"   , "SCCSIZE: *([0-9]+)"],
             [],
             ["TypeSafe", "ACCESSES TYPED: *([0-9]+)"],
             ["NonType",  "ACCESSES UNTYPED: *([0-9]+)"],