From: Lang Hames Date: Thu, 2 Oct 2014 04:17:36 +0000 (+0000) Subject: [PBQP] Add support for graph-level metadata to the PBQP graph. This will be used X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=48d779f48d34a16feabbc4c6b54218d8c1c42767 [PBQP] Add support for graph-level metadata to the PBQP graph. This will be used in the future to attach useful information about the PBQP graph (e.g. the associated MachineFunction, pointers to regalloc passes) to the graph itself, making that information accessible to the solver. This should also allow the PBQPBuilder interface to be simplified. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218848 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/CodeGen/PBQP/Graph.h b/include/llvm/CodeGen/PBQP/Graph.h index a55f0ea96c0..f4294e713e6 100644 --- a/include/llvm/CodeGen/PBQP/Graph.h +++ b/include/llvm/CodeGen/PBQP/Graph.h @@ -56,6 +56,7 @@ namespace PBQP { typedef typename CostAllocator::MatrixPtr MatrixPtr; typedef typename SolverT::NodeMetadata NodeMetadata; typedef typename SolverT::EdgeMetadata EdgeMetadata; + typedef typename SolverT::GraphMetadata GraphMetadata; private: @@ -172,6 +173,7 @@ namespace PBQP { // ----- MEMBERS ----- + GraphMetadata Metadata; CostAllocator CostAlloc; SolverT *Solver; @@ -331,6 +333,12 @@ namespace PBQP { /// \brief Construct an empty PBQP graph. Graph() : Solver(nullptr) { } + /// \brief Get a reference to the graph metadata. + GraphMetadata& getMetadata() { return Metadata; } + + /// \brief Get a const-reference to the graph metadata. + const GraphMetadata& getMetadata() const { return Metadata; } + /// \brief Lock this graph to the given solver instance in preparation /// for running the solver. This method will call solver.handleAddNode for /// each node in the graph, and handleAddEdge for each edge, to give the diff --git a/include/llvm/CodeGen/PBQP/RegAllocSolver.h b/include/llvm/CodeGen/PBQP/RegAllocSolver.h index 977c34843bb..4b6bf0e6c00 100644 --- a/include/llvm/CodeGen/PBQP/RegAllocSolver.h +++ b/include/llvm/CodeGen/PBQP/RegAllocSolver.h @@ -144,6 +144,7 @@ namespace PBQP { typedef RegAlloc::NodeMetadata NodeMetadata; struct EdgeMetadata { }; + struct GraphMetadata { }; typedef PBQP::Graph Graph;