[llvm-commits] [gcc-plugin] r83277 - in /gcc-plugin/trunk: llvm-backend.cpp llvm-convert.cpp llvm-internal.h

[Duncan Sands]

Author: baldrick
Date: Sun Oct  4 07:50:51 2009
New Revision: 83277

URL: http://llvm.org/viewvc/llvm-project?rev=83277&view=rev
Log:
Now that basic block and statement statistics are no longer
being used to estimate the amount of memory that could be
recovered by garbage collection, move these statistics into
the only file where they are used.

Modified:
    gcc-plugin/trunk/llvm-backend.cpp
    gcc-plugin/trunk/llvm-convert.cpp
    gcc-plugin/trunk/llvm-internal.h

Modified: gcc-plugin/trunk/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-backend.cpp?rev=83277&r1=83276&r2=83277&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-backend.cpp (original)
+++ gcc-plugin/trunk/llvm-backend.cpp Sun Oct  4 07:50:51 2009
@@ -42,7 +42,6 @@
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/IPO.h"
-#include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -140,24 +139,6 @@
 
 
 //===----------------------------------------------------------------------===//
-//                                Statistics
-//===----------------------------------------------------------------------===//
-
-STATISTIC(NumBasicBlocks, "Number of basic blocks converted");
-STATISTIC(NumStatements,  "Number of gimple statements converted");
-
-/// NoteBasicBlock - Called once for each GCC basic block converted.
-void NoteBasicBlock(basic_block bb) {
-  ++NumBasicBlocks;
-}
-
-/// NoteStatement - Called once for each GCC gimple statement converted.
-void NoteStatement(gimple stmt) {
-  ++NumStatements;
-}
-
-
-//===----------------------------------------------------------------------===//
 //                   Matching LLVM Values with GCC DECL trees
 //===----------------------------------------------------------------------===//
 

Modified: gcc-plugin/trunk/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-convert.cpp?rev=83277&r1=83276&r2=83277&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-convert.cpp (original)
+++ gcc-plugin/trunk/llvm-convert.cpp Sun Oct  4 07:50:51 2009
@@ -43,6 +43,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetLowering.h"
 #include "llvm/Target/TargetMachine.h"
+#include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/DenseMap.h"
 
@@ -88,6 +89,9 @@
 
 static LLVMContext &Context = getGlobalContext();
 
+STATISTIC(NumBasicBlocks, "Number of basic blocks converted");
+STATISTIC(NumStatements,  "Number of gimple statements converted");
+
 /// dump - Print a gimple statement to standard error.
 void dump(gimple stmt) {
   print_gimple_stmt(stderr, stmt, 0, TDF_RAW);
@@ -923,7 +927,7 @@
 }
 
 void TreeToLLVM::EmitBasicBlock(basic_block bb) {
-  NoteBasicBlock(bb);
+  ++NumBasicBlocks;
 
   // Avoid outputting a pointless branch at the end of the entry block.
   if (bb != ENTRY_BLOCK_PTR)
@@ -959,7 +963,7 @@
   for (gimple_stmt_iterator gsi = gsi_start_bb(bb); !gsi_end_p(gsi);
        gsi_next(&gsi)) {
     gimple stmt = gsi_stmt(gsi);
-    NoteStatement(stmt);
+    ++NumStatements;
 
     switch (gimple_code(stmt)) {
     case GIMPLE_ASM:

Modified: gcc-plugin/trunk/llvm-internal.h
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-internal.h?rev=83277&r1=83276&r2=83277&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-internal.h (original)
+++ gcc-plugin/trunk/llvm-internal.h Sun Oct  4 07:50:51 2009
@@ -98,14 +98,6 @@
 /// annotate attribute to a vector to be emitted later.
 extern void AddAnnotateAttrsToGlobal(GlobalValue *GV, union tree_node* decl);
 
-// Statistics.
-
-/// NoteBasicBlock - Called once for each GCC basic block converted.
-extern void NoteBasicBlock(basic_block bb);
-
-/// NoteStatement - Called once for each GCC gimple statement converted.
-extern void NoteStatement(gimple stmt);
-
 // Mapping between GCC declarations and LLVM values.
 
 /// DECL_LLVM - Holds the LLVM expression for the value of a global variable or