Add weights to graph edges. Choose between edges based on their weight.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50757 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvmc2/CompilationGraph.cpp b/tools/llvmc2/CompilationGraph.cpp
index 4b04d6f..310413b 100644
--- a/tools/llvmc2/CompilationGraph.cpp
+++ b/tools/llvmc2/CompilationGraph.cpp
@@ -33,35 +33,37 @@
namespace {
- // Go through the list C and find the edge that isEnabled(); if
- // there is no such edge, return the default edge; if there is no
- // default edge, throw an exception.
+ // Return the edge with the maximum weight.
template <class C>
const Edge* ChooseEdge(const C& EdgesContainer,
const std::string& NodeName = "root") {
- const Edge* DefaultEdge = 0;
+ const Edge* MaxEdge = 0;
+ unsigned MaxWeight = 0;
+ bool SingleMax = true;
for (typename C::const_iterator B = EdgesContainer.begin(),
E = EdgesContainer.end(); B != E; ++B) {
const Edge* E = B->getPtr();
-
- if (E->isDefault())
- if (!DefaultEdge)
- DefaultEdge = E;
- else
- throw std::runtime_error("Node " + NodeName
- + ": multiple default outward edges found!"
- " Most probably a specification error.");
- if (E->isEnabled())
- return E;
+ unsigned EW = E->Weight();
+ if (EW > MaxWeight) {
+ MaxEdge = E;
+ MaxWeight = EW;
+ SingleMax = true;
+ }
+ else if (EW == MaxWeight) {
+ SingleMax = false;
+ }
}
- if (DefaultEdge)
- return DefaultEdge;
- else
- throw std::runtime_error("Node " + NodeName
- + ": no default outward edge found!"
+ if (!SingleMax)
+ throw std::runtime_error("Node " + NodeName +
+ ": multiple maximal outward edges found!"
" Most probably a specification error.");
+ if (!MaxEdge)
+ throw std::runtime_error("Node " + NodeName +
+ ": no maximal outward edge found!"
+ " Most probably a specification error.");
+ return MaxEdge;
}
}
diff --git a/tools/llvmc2/CompilationGraph.h b/tools/llvmc2/CompilationGraph.h
index 4692e51..3dc8bc0 100644
--- a/tools/llvmc2/CompilationGraph.h
+++ b/tools/llvmc2/CompilationGraph.h
@@ -35,8 +35,7 @@
virtual ~Edge() {};
const std::string& ToolName() const { return ToolName_; }
- virtual bool isEnabled() const = 0;
- virtual bool isDefault() const = 0;
+ virtual unsigned Weight() const = 0;
private:
std::string ToolName_;
};
@@ -45,8 +44,7 @@
class SimpleEdge : public Edge {
public:
SimpleEdge(const std::string& T) : Edge(T) {}
- bool isEnabled() const { return false;}
- bool isDefault() const { return true;}
+ unsigned Weight() const { return 1; }
};
// A node of the compilation graph.