[llvm-commits] [poolalloc] r114663 - in /poolalloc/trunk/lib/PoolAllocate: Heuristic.cpp Heuristic.h PointerCompress.cpp PoolAllocate.cpp

[John Criswell]

Author: criswell
Date: Thu Sep 23 12:14:45 2010
New Revision: 114663

URL: http://llvm.org/viewvc/llvm-project?rev=114663&view=rev
Log:
Moved the Heuristic.h file into the publicly accessible header file area.

Removed:
    poolalloc/trunk/lib/PoolAllocate/Heuristic.h
Modified:
    poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp
    poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp
    poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp

Modified: poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp?rev=114663&r1=114662&r2=114663&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/Heuristic.cpp Thu Sep 23 12:14:45 2010
@@ -16,9 +16,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Heuristic.h"
-
 #include "dsa/DSGraphTraits.h"
+#include "poolalloc/Heuristic.h"
 #include "poolalloc/PoolAllocate.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"

Removed: poolalloc/trunk/lib/PoolAllocate/Heuristic.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/Heuristic.h?rev=114662&view=auto
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/Heuristic.h (original)
+++ poolalloc/trunk/lib/PoolAllocate/Heuristic.h (removed)
@@ -1,107 +0,0 @@
-//===-- Heuristic.h - Interface to PA heuristics ----------------*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This header is the abstract interface used by the pool allocator to access
-// the various heuristics supported.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef POOLALLOCATION_HEURISTIC_H
-#define POOLALLOCATION_HEURISTIC_H
-
-#include <vector>
-#include <map>
-
-namespace llvm {
-  class Value;
-  class Function;
-  class Module;
-  class DSGraph;
-  class DSNode;
-  class PoolAllocate;
-  class TargetData;
-  class Type;
-
-namespace PA {
-  class Heuristic {
-  protected:
-    Module *M;
-    DSGraph *GG;
-    PoolAllocate *PA;
-
-    Heuristic() {}
-  public:
-    void Initialize(Module &m, DSGraph* gg, PoolAllocate &pa) {
-      M = &m; GG = gg; PA = &pa;
-    }
-    virtual ~Heuristic();
-
-    /// IsRealHeuristic - Return true if this is not a real pool allocation
-    /// heuristic.
-    virtual bool IsRealHeuristic() { return true; }
-
-    /// OnePool - This represents some number of nodes which are coallesced into
-    /// a pool.
-    struct OnePool {
-      // NodesInPool - The DS nodes to be allocated to this pool.  There may be
-      // multiple here if they are being coallesced into the same pool.
-      std::vector<const DSNode*> NodesInPool;
-
-      // PoolDesc - If the heuristic wants the nodes allocated to a specific
-      // pool descriptor, it can specify it here, otherwise a new pool is
-      // created.
-      Value *PoolDesc;
-
-      // PoolSize - If the pool is to be created, indicate the "recommended
-      // size" for the pool here.  This gets passed into poolinit.
-      unsigned PoolSize;
-      unsigned PoolAlignment;
-
-      OnePool() : PoolDesc(0), PoolSize(0), PoolAlignment(0) {}
-
-      OnePool(const DSNode *N) : PoolDesc(0), PoolSize(getRecommendedSize(N)), 
-                                 PoolAlignment(getRecommendedAlignment(N)) {
-        NodesInPool.push_back(N);
-      }
-      OnePool(const DSNode *N, Value *PD) : PoolDesc(PD), PoolSize(0),
-                                            PoolAlignment(0) {
-        NodesInPool.push_back(N);
-      }
-    };
-
-    /// AssignToPools - Partition NodesToPA into a set of disjoint pools,
-    /// returning the result in ResultPools.  If this is a function being pool
-    /// allocated, F will not be null.
-    virtual void AssignToPools(const std::vector<const DSNode*> &NodesToPA,
-                               Function *F, DSGraph* G,
-                               std::vector<OnePool> &ResultPools) = 0;
-
-    // Hacks for the OnlyOverhead heuristic.
-    virtual void HackFunctionBody(Function &F,
-                                  std::map<const DSNode*, Value*> &PDs) {}
-
-    /// getRecommendedSize - Return the recommended pool size for this DSNode.
-    ///
-    static unsigned getRecommendedSize(const DSNode *N);
-
-    /// getRecommendedAlignment - Return the recommended object alignment for
-    /// this DSNode.
-    ///
-    static unsigned getRecommendedAlignment(const DSNode *N);
-    static unsigned getRecommendedAlignment(const Type *Ty,
-                                            const TargetData &TD);
-    
-    /// create - This static ctor creates the heuristic, based on the command
-    /// line argument to choose the heuristic.
-    static Heuristic *create();
-  };
-}
-}
-
-#endif

Modified: poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp?rev=114663&r1=114662&r2=114663&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PointerCompress.cpp Thu Sep 23 12:14:45 2010
@@ -15,8 +15,8 @@
 
 #include "dsa/DataStructure.h"
 #include "dsa/DSGraph.h"
+#include "poolalloc/Heuristic.h"
 #include "poolalloc/PoolAllocate.h"
-#include "Heuristic.h"
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"

Modified: poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp?rev=114663&r1=114662&r2=114663&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp Thu Sep 23 12:14:45 2010
@@ -18,8 +18,8 @@
 
 #include "dsa/DataStructure.h"
 #include "dsa/DSGraph.h"
+#include "poolalloc/Heuristic.h"
 #include "poolalloc/PoolAllocate.h"
-#include "Heuristic.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"