[llvm-exegesis] Revert accidentally commited code.
llvm-svn: 332231
diff --git a/llvm/tools/llvm-exegesis/lib/Clustering.cpp b/llvm/tools/llvm-exegesis/lib/Clustering.cpp
index b3f42a3..c8646c7 100644
--- a/llvm/tools/llvm-exegesis/lib/Clustering.cpp
+++ b/llvm/tools/llvm-exegesis/lib/Clustering.cpp
@@ -19,7 +19,7 @@
// (B) - Number of points : ~thousands (points are measurements of an MCInst)
// (C) - Number of clusters: ~tens.
// (D) - The number of clusters is not known /a priory/.
-// (E) - The amoint of noise is relatively small.
+// (E) - The amount of noise is relatively small.
// The problem is rather small. In terms of algorithms, (D) disqualifies
// k-means and makes algorithms such as DBSCAN[1] or OPTICS[2] more applicable.
//
@@ -57,18 +57,17 @@
} // namespace
-InstructionBenchmarkClustering::InstructionBenchmarkClustering(
- const std::vector<InstructionBenchmark> &Points)
- : Points_(Points), NoiseCluster_(ClusterId::noise()),
- ErrorCluster_(ClusterId::error()) {}
+InstructionBenchmarkClustering::InstructionBenchmarkClustering()
+ : NoiseCluster_(ClusterId::noise()), ErrorCluster_(ClusterId::error()) {}
-llvm::Error InstructionBenchmarkClustering::validateAndSetup() {
- ClusterIdForPoint_.resize(Points_.size());
+llvm::Error InstructionBenchmarkClustering::validateAndSetup(
+ const std::vector<InstructionBenchmark> &Points) {
+ ClusterIdForPoint_.resize(Points.size());
// Mark erroneous measurements out.
// All points must have the same number of dimensions, in the same order.
const std::vector<BenchmarkMeasure> *LastMeasurement = nullptr;
- for (size_t P = 0, NumPoints = Points_.size(); P < NumPoints; ++P) {
- const auto &Point = Points_[P];
+ for (size_t P = 0, NumPoints = Points.size(); P < NumPoints; ++P) {
+ const auto &Point = Points[P];
if (!Point.Error.empty()) {
ClusterIdForPoint_[P] = ClusterId::error();
ErrorCluster_.PointIndices.push_back(P);
@@ -97,12 +96,13 @@
return llvm::Error::success();
}
-void InstructionBenchmarkClustering::dbScan(const size_t MinPts,
- const double EpsilonSquared) {
- for (size_t P = 0, NumPoints = Points_.size(); P < NumPoints; ++P) {
+void InstructionBenchmarkClustering::dbScan(
+ const std::vector<InstructionBenchmark> &Points, const size_t MinPts,
+ const double EpsilonSquared) {
+ for (size_t P = 0, NumPoints = Points.size(); P < NumPoints; ++P) {
if (!ClusterIdForPoint_[P].isUndef())
continue; // Previously processed in inner loop.
- const auto Neighbors = rangeQuery(Points_, P, EpsilonSquared);
+ const auto Neighbors = rangeQuery(Points, P, EpsilonSquared);
if (Neighbors.size() + 1 < MinPts) { // Density check.
// The region around P is not dense enough to create a new cluster, mark
// as noise for now.
@@ -136,7 +136,7 @@
ClusterIdForPoint_[Q] = CurrentCluster.Id;
CurrentCluster.PointIndices.push_back(Q);
// And extend to the neighbors of Q if the region is dense enough.
- const auto Neighbors = rangeQuery(Points_, Q, EpsilonSquared);
+ const auto Neighbors = rangeQuery(Points, Q, EpsilonSquared);
if (Neighbors.size() + 1 >= MinPts) {
ToProcess.insert(Neighbors.begin(), Neighbors.end());
}
@@ -144,7 +144,7 @@
}
// Add noisy points to noise cluster.
- for (size_t P = 0, NumPoints = Points_.size(); P < NumPoints; ++P) {
+ for (size_t P = 0, NumPoints = Points.size(); P < NumPoints; ++P) {
if (ClusterIdForPoint_[P].isNoise()) {
NoiseCluster_.PointIndices.push_back(P);
}
@@ -155,15 +155,15 @@
InstructionBenchmarkClustering::create(
const std::vector<InstructionBenchmark> &Points, const size_t MinPts,
const double Epsilon) {
- InstructionBenchmarkClustering Clustering(Points);
- if (auto Error = Clustering.validateAndSetup()) {
- return Error;
+ InstructionBenchmarkClustering Clustering;
+ if (auto Error = Clustering.validateAndSetup(Points)) {
+ return std::move(Error);
}
if (Clustering.ErrorCluster_.PointIndices.size() == Points.size()) {
return Clustering; // Nothing to cluster.
}
- Clustering.dbScan(MinPts, Epsilon * Epsilon);
+ Clustering.dbScan(Points, MinPts, Epsilon * Epsilon);
return Clustering;
}