Changes in directory llvm-poolalloc/lib/DSA:
BottomUpClosure.cpp updated: 1.128 -> 1.129 CallTargets.cpp updated: 1.8 -> 1.9 CompleteBottomUp.cpp updated: 1.40 -> 1.41 DataStructure.cpp updated: 1.256 -> 1.257 DataStructureOpt.cpp updated: 1.15 -> 1.16 DataStructureStats.cpp updated: 1.25 -> 1.26 EquivClassGraphs.cpp updated: 1.54 -> 1.55 Local.cpp updated: 1.164 -> 1.165 Printer.cpp updated: 1.92 -> 1.93 TopDownClosure.cpp updated: 1.96 -> 1.97 --- Log message: Update to the new Statistic interface. --- Diffs of the changes: (+30 -35) BottomUpClosure.cpp | 6 +++--- CallTargets.cpp | 8 ++++---- CompleteBottomUp.cpp | 2 +- DataStructure.cpp | 14 +++++++------- DataStructureOpt.cpp | 6 ++---- DataStructureStats.cpp | 13 +++++-------- EquivClassGraphs.cpp | 4 ++-- Local.cpp | 6 +++--- Printer.cpp | 4 ++-- TopDownClosure.cpp | 2 +- 10 files changed, 30 insertions(+), 35 deletions(-) Index: llvm-poolalloc/lib/DSA/BottomUpClosure.cpp diff -u llvm-poolalloc/lib/DSA/BottomUpClosure.cpp:1.128 llvm-poolalloc/lib/DSA/BottomUpClosure.cpp:1.129 --- llvm-poolalloc/lib/DSA/BottomUpClosure.cpp:1.128 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/BottomUpClosure.cpp Wed Jan 10 12:10:32 2007 @@ -26,9 +26,9 @@ using namespace llvm; namespace { - Statistic MaxSCC("budatastructure", "Maximum SCC Size in Call Graph"); - Statistic NumBUInlines("budatastructures", "Number of graphs inlined"); - Statistic NumCallEdges("budatastructures", "Number of 'actual' call edges"); + STATISTIC (MaxSCC, "Maximum SCC Size in Call Graph"); + STATISTIC (NumBUInlines, "Number of graphs inlined"); + STATISTIC (NumCallEdges, "Number of 'actual' call edges"); cl::opt<bool> AddGlobals("budatastructures-annotate-calls", cl::Hidden, Index: llvm-poolalloc/lib/DSA/CallTargets.cpp diff -u llvm-poolalloc/lib/DSA/CallTargets.cpp:1.8 llvm-poolalloc/lib/DSA/CallTargets.cpp:1.9 --- llvm-poolalloc/lib/DSA/CallTargets.cpp:1.8 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/CallTargets.cpp Wed Jan 10 12:10:32 2007 @@ -29,10 +29,10 @@ using namespace llvm; namespace { - Statistic DirCall("calltarget", "Number of direct calls"); - Statistic IndCall("calltarget", "Number of indirect calls"); - Statistic CompleteInd("calltarget", "Number of complete indirect calls"); - Statistic CompleteEmpty("calltarget", "Number of complete empty calls"); + STATISTIC (DirCall, "Number of direct calls"); + STATISTIC (IndCall, "Number of indirect calls"); + STATISTIC (CompleteInd, "Number of complete indirect calls"); + STATISTIC (CompleteEmpty, "Number of complete empty calls"); RegisterPass<CallTargetFinder> X("calltarget","Find Call Targets (uses DSA)"); } Index: llvm-poolalloc/lib/DSA/CompleteBottomUp.cpp diff -u llvm-poolalloc/lib/DSA/CompleteBottomUp.cpp:1.40 llvm-poolalloc/lib/DSA/CompleteBottomUp.cpp:1.41 --- llvm-poolalloc/lib/DSA/CompleteBottomUp.cpp:1.40 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/CompleteBottomUp.cpp Wed Jan 10 12:10:32 2007 @@ -26,7 +26,7 @@ namespace { RegisterPass<CompleteBUDataStructures> X("cbudatastructure", "'Complete' Bottom-up Data Structure Analysis"); - Statistic NumCBUInlines("cbudatastructures", "Number of graphs inlined"); + STATISTIC (NumCBUInlines, "Number of graphs inlined"); } Index: llvm-poolalloc/lib/DSA/DataStructure.cpp diff -u llvm-poolalloc/lib/DSA/DataStructure.cpp:1.256 llvm-poolalloc/lib/DSA/DataStructure.cpp:1.257 --- llvm-poolalloc/lib/DSA/DataStructure.cpp:1.256 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/DataStructure.cpp Wed Jan 10 12:10:32 2007 @@ -38,14 +38,14 @@ #define COLLAPSE_ARRAYS_AGGRESSIVELY 0 namespace { - Statistic NumFolds ("dsa", "Number of nodes completely folded"); - Statistic NumCallNodesMerged("dsa", "Number of call nodes merged"); - Statistic NumNodeAllocated ("dsa", "Number of nodes allocated"); - Statistic NumDNE ("dsa", "Number of nodes removed by reachability"); - Statistic NumTrivialDNE ("dsa", "Number of nodes trivially removed"); - Statistic NumTrivialGlobalDNE("dsa", "Number of globals trivially removed"); + STATISTIC (NumFolds, "Number of nodes completely folded"); + STATISTIC (NumCallNodesMerged, "Number of call nodes merged"); + STATISTIC (NumNodeAllocated , "Number of nodes allocated"); + STATISTIC (NumDNE , "Number of nodes removed by reachability"); + STATISTIC (NumTrivialDNE , "Number of nodes trivially removed"); + STATISTIC (NumTrivialGlobalDNE, "Number of globals trivially removed"); #ifdef LLVA_KERNEL - Statistic LostPools ("dsa", "Number of pools lost to DSNode Merge"); + STATISTIC (LostPools , "Number of pools lost to DSNode Merge"); #endif static cl::opt<unsigned> DSAFieldLimit("dsa-field-limit", cl::Hidden, Index: llvm-poolalloc/lib/DSA/DataStructureOpt.cpp diff -u llvm-poolalloc/lib/DSA/DataStructureOpt.cpp:1.15 llvm-poolalloc/lib/DSA/DataStructureOpt.cpp:1.16 --- llvm-poolalloc/lib/DSA/DataStructureOpt.cpp:1.15 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/DataStructureOpt.cpp Wed Jan 10 12:10:32 2007 @@ -22,10 +22,8 @@ using namespace llvm; namespace { - Statistic - NumGlobalsConstanted("ds-opt", "Number of globals marked constant"); - Statistic - NumGlobalsIsolated("ds-opt", "Number of globals with references dropped"); + STATISTIC (NumGlobalsConstanted, "Number of globals marked constant"); + STATISTIC (NumGlobalsIsolated, "Number of globals with references dropped"); class DSOpt : public ModulePass { TDDataStructures *TD; Index: llvm-poolalloc/lib/DSA/DataStructureStats.cpp diff -u llvm-poolalloc/lib/DSA/DataStructureStats.cpp:1.25 llvm-poolalloc/lib/DSA/DataStructureStats.cpp:1.26 --- llvm-poolalloc/lib/DSA/DataStructureStats.cpp:1.25 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/DataStructureStats.cpp Wed Jan 10 12:10:32 2007 @@ -23,19 +23,16 @@ using namespace llvm; namespace { - Statistic TotalNumCallees("totalcallees", - "Total number of callee functions at all indirect call sites"); - Statistic NumIndirectCalls("numindirect", - "Total number of indirect call sites in the program"); - Statistic NumPoolNodes("numpools", - "Number of allocation nodes that could be pool allocated"); + STATISTIC (TotalNumCallees, "Total number of callee functions at all indirect call sites"); + STATISTIC (NumIndirectCalls, "Total number of indirect call sites in the program"); + STATISTIC (NumPoolNodes, "Number of allocation nodes that could be pool allocated"); // Typed/Untyped memory accesses: If DSA can infer that the types the loads // and stores are accessing are correct (ie, the node has not been collapsed), // increment the appropriate counter. - Statistic NumTypedMemAccesses("numtypedmemaccesses", + STATISTIC (NumTypedMemAccesses, "Number of loads/stores which are fully typed"); - Statistic NumUntypedMemAccesses("numuntypedmemaccesses", + STATISTIC (NumUntypedMemAccesses, "Number of loads/stores which are untyped"); class DSGraphStats : public FunctionPass, public InstVisitor<DSGraphStats> { Index: llvm-poolalloc/lib/DSA/EquivClassGraphs.cpp diff -u llvm-poolalloc/lib/DSA/EquivClassGraphs.cpp:1.54 llvm-poolalloc/lib/DSA/EquivClassGraphs.cpp:1.55 --- llvm-poolalloc/lib/DSA/EquivClassGraphs.cpp:1.54 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/EquivClassGraphs.cpp Wed Jan 10 12:10:32 2007 @@ -31,9 +31,9 @@ namespace { RegisterPass<EquivClassGraphs> X("eqdatastructure", "Equivalence-class Bottom-up Data Structure Analysis"); - Statistic NumEquivBUInlines("equivdatastructures", + STATISTIC (NumEquivBUInlines, "Number of graphs inlined"); - Statistic NumFoldGraphInlines("Inline equiv-class graphs bottom up", + STATISTIC (NumFoldGraphInlines, "Number of graphs inlined"); } Index: llvm-poolalloc/lib/DSA/Local.cpp diff -u llvm-poolalloc/lib/DSA/Local.cpp:1.164 llvm-poolalloc/lib/DSA/Local.cpp:1.165 --- llvm-poolalloc/lib/DSA/Local.cpp:1.164 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/Local.cpp Wed Jan 10 12:10:32 2007 @@ -37,9 +37,9 @@ using namespace llvm; #ifdef LLVA_KERNEL -static Statistic CacheAllocs ("dsa", "Number of kmem_cache_alloc calls"); -static Statistic KMallocs ("dsa", "Number of kmalloc calls"); -static Statistic GlobalPools ("dsa", "Number of global pools"); +static STATISTIC (CacheAllocs , "Number of kmem_cache_alloc calls"); +static STATISTIC (KMallocs , "Number of kmalloc calls"); +static STATISTIC (GlobalPools , "Number of global pools"); #endif static RegisterPass<LocalDataStructures> Index: llvm-poolalloc/lib/DSA/Printer.cpp diff -u llvm-poolalloc/lib/DSA/Printer.cpp:1.92 llvm-poolalloc/lib/DSA/Printer.cpp:1.93 --- llvm-poolalloc/lib/DSA/Printer.cpp:1.92 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/Printer.cpp Wed Jan 10 12:10:32 2007 @@ -33,8 +33,8 @@ namespace { cl::opt<bool> OnlyPrintMain("only-print-main-ds", cl::ReallyHidden); cl::opt<bool> DontPrintAnything("dont-print-ds", cl::ReallyHidden); - Statistic MaxGraphSize ("dsa", "Maximum graph size"); - Statistic NumFoldedNodes ("dsa", "Number of folded nodes (in final graph)"); + STATISTIC (MaxGraphSize , "Maximum graph size"); + STATISTIC (NumFoldedNodes , "Number of folded nodes (in final graph)"); } void DSNode::dump() const { print(cerr, 0); } Index: llvm-poolalloc/lib/DSA/TopDownClosure.cpp diff -u llvm-poolalloc/lib/DSA/TopDownClosure.cpp:1.96 llvm-poolalloc/lib/DSA/TopDownClosure.cpp:1.97 --- llvm-poolalloc/lib/DSA/TopDownClosure.cpp:1.96 Wed Dec 13 23:51:06 2006 +++ llvm-poolalloc/lib/DSA/TopDownClosure.cpp Wed Jan 10 12:10:32 2007 @@ -35,7 +35,7 @@ RegisterPass<TDDataStructures> // Register the pass Y("tddatastructure", "Top-down Data Structure Analysis"); - Statistic NumTDInlines("tddatastructures", "Number of graphs inlined"); + STATISTIC (NumTDInlines, "Number of graphs inlined"); } void TDDataStructures::markReachableFunctionsExternallyAccessible(DSNode *N, _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits