[llvm] r332231 - [llvm-exegesis] Revert accidentally commited code.
Clement Courbet via llvm-commits
llvm-commits at lists.llvm.org
Mon May 14 04:35:38 PDT 2018
Author: courbet
Date: Mon May 14 04:35:37 2018
New Revision: 332231
URL: http://llvm.org/viewvc/llvm-project?rev=332231&view=rev
Log:
[llvm-exegesis] Revert accidentally commited code.
Removed:
llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp
llvm/trunk/tools/llvm-exegesis/lib/Analysis.h
Modified:
llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
llvm/trunk/tools/llvm-exegesis/lib/Clustering.cpp
llvm/trunk/tools/llvm-exegesis/lib/Clustering.h
llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp
llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp
Removed: llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp?rev=332230&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp (removed)
@@ -1,48 +0,0 @@
-
-#include "Analysis.h"
-#include "llvm/Support/Format.h"
-
-namespace exegesis {
-
-namespace {
-
-// Prints a row representing an instruction, along with scheduling info and
-// point coordinates (measurements).
-void renderInstructionRow(const InstructionBenchmark &Point,
- const size_t NameLen, llvm::raw_ostream &OS) {
- OS << llvm::format("%*s", NameLen, Point.AsmTmpl.Name.c_str());
- for (const auto &Measurement : Point.Measurements) {
- OS << llvm::format(" %*.2f", Measurement.Key.size(), Measurement.Value);
- }
- OS << "\n";
-}
-
-void printCluster(const std::vector<InstructionBenchmark> &Points,
- const llvm::MCSubtargetInfo &STI,
- const size_t ClusterId,
- const InstructionBenchmarkClustering::Cluster &Cluster,
- llvm::raw_ostream &OS) {
- // TODO:
- // GetSchedClass(Points[PointIdB]); });
-
- // Print all points.
- for (const auto &PointId : Cluster.PointIndices) {
- renderInstructionRow(Points[PointId], NameLen, OS);
- }
-}
-
-} // namespace
-
-llvm::Error
-printAnalysisClusters(const InstructionBenchmarkClustering &Clustering,
- const llvm::MCSubtargetInfo &STI, llvm::raw_ostream &OS) {
- OS << "cluster_id,key,";
- for (size_t I = 0, E = Clustering.getValidClusters().size(); I < E; ++I) {
- printCluster(Clustering.getPoints(), STI, I, Clustering.getValidClusters()[I], OS);
- OS << "\n\n";
- }
-
- return llvm::Error::success();
-}
-
-} // namespace exegesis
Removed: llvm/trunk/tools/llvm-exegesis/lib/Analysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Analysis.h?rev=332230&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Analysis.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Analysis.h (removed)
@@ -1,41 +0,0 @@
-//===-- Analysis.h ----------------------------------------------*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Analysis output for benchmark results.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TOOLS_LLVM_EXEGESIS_ANALYSIS_H
-#define LLVM_TOOLS_LLVM_EXEGESIS_ANALYSIS_H
-
-#include "BenchmarkResult.h"
-#include "Clustering.h"
-#include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/raw_ostream.h"
-#include <vector>
-
-namespace exegesis {
-
-// All the points in a scheduling class should be in the same cluster.
-// Print any scheduling class for which this is not the case.
-llvm::Error
-printSchedClassInconsistencies(const InstructionBenchmarkClustering &Clustering,
- const llvm::MCSubtargetInfo &STI,
- llvm::raw_ostream &OS);
-
-// Prints all instructions for each cluster.
-llvm::Error
-printAnalysisClusters(const InstructionBenchmarkClustering &Clustering,
- const llvm::MCSubtargetInfo &STI, llvm::raw_ostream &OS);
-
-} // namespace exegesis
-
-#endif // LLVM_TOOLS_LLVM_EXEGESIS_CLUSTERING_H
Modified: llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt?rev=332231&r1=332230&r2=332231&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt Mon May 14 04:35:37 2018
@@ -1,6 +1,5 @@
add_library(LLVMExegesis
STATIC
- Analysis.cpp
BenchmarkResult.cpp
BenchmarkRunner.cpp
Clustering.cpp
Modified: llvm/trunk/tools/llvm-exegesis/lib/Clustering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Clustering.cpp?rev=332231&r1=332230&r2=332231&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Clustering.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Clustering.cpp Mon May 14 04:35:37 2018
@@ -19,7 +19,7 @@ namespace exegesis {
// (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 @@ std::vector<size_t> rangeQuery(const std
} // 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 @@ llvm::Error InstructionBenchmarkClusteri
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 @@ void InstructionBenchmarkClustering::dbS
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 @@ void InstructionBenchmarkClustering::dbS
}
// 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 @@ llvm::Expected<InstructionBenchmarkClust
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;
}
Modified: llvm/trunk/tools/llvm-exegesis/lib/Clustering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Clustering.h?rev=332231&r1=332230&r2=332231&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Clustering.h (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Clustering.h Mon May 14 04:35:37 2018
@@ -72,8 +72,6 @@ public:
return ClusterIdForPoint_[P];
}
- const std::vector<InstructionBenchmark> &getPoints() const { return Points_; }
-
const Cluster &getCluster(ClusterId Id) const {
assert(!Id.isUndef() && "unlabeled cluster");
if (Id.isNoise()) {
@@ -88,11 +86,10 @@ public:
const std::vector<Cluster> &getValidClusters() const { return Clusters_; }
private:
- InstructionBenchmarkClustering(const std::vector<InstructionBenchmark> &Points);
- llvm::Error validateAndSetup();
- void dbScan(size_t MinPts,
+ InstructionBenchmarkClustering();
+ llvm::Error validateAndSetup(const std::vector<InstructionBenchmark> &Points);
+ void dbScan(const std::vector<InstructionBenchmark> &Points, size_t MinPts,
double EpsilonSquared);
- const std::vector<InstructionBenchmark> &Points_;
int NumDimensions_ = 0;
// ClusterForPoint_[P] is the cluster id for Points[P].
std::vector<ClusterId> ClusterIdForPoint_;
Modified: llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp?rev=332231&r1=332230&r2=332231&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp Mon May 14 04:35:37 2018
@@ -12,10 +12,8 @@
///
//===----------------------------------------------------------------------===//
-#include "lib/Analysis.h"
#include "lib/BenchmarkResult.h"
#include "lib/BenchmarkRunner.h"
-#include "lib/Clustering.h"
#include "lib/Latency.h"
#include "lib/LlvmState.h"
#include "lib/PerfHelper.h"
@@ -25,11 +23,8 @@
#include "llvm/ADT/Twine.h"
#include "llvm/MC/MCInstBuilder.h"
#include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCSubtargetInfo.h"
#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Format.h"
#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/TargetSelect.h"
#include <algorithm>
#include <random>
@@ -44,41 +39,26 @@ static llvm::cl::opt<std::string>
OpcodeName("opcode-name", llvm::cl::desc("opcode to measure, by name"),
llvm::cl::init(""));
-static llvm::cl::opt<std::string>
- BenchmarkFile("benchmarks-file", llvm::cl::desc(""), llvm::cl::init("-"));
-
-enum class BenchmarkModeE { Latency, Uops, Analysis };
-static llvm::cl::opt<BenchmarkModeE> BenchmarkMode(
- "benchmark-mode", llvm::cl::desc("the benchmark mode to run"),
- llvm::cl::values(
- clEnumValN(BenchmarkModeE::Latency, "latency", "Instruction Latency"),
- clEnumValN(BenchmarkModeE::Uops, "uops", "Uop Decomposition"),
- clEnumValN(BenchmarkModeE::Analysis, "analysis", "Analysis")));
+enum class BenchmarkModeE { Latency, Uops };
+static llvm::cl::opt<BenchmarkModeE>
+ BenchmarkMode("benchmark-mode", llvm::cl::desc("the benchmark mode to run"),
+ llvm::cl::values(clEnumValN(BenchmarkModeE::Latency,
+ "latency", "Instruction Latency"),
+ clEnumValN(BenchmarkModeE::Uops, "uops",
+ "Uop Decomposition")));
static llvm::cl::opt<unsigned>
NumRepetitions("num-repetitions",
llvm::cl::desc("number of time to repeat the asm snippet"),
llvm::cl::init(10000));
-static llvm::cl::opt<unsigned> AnalysisNumPoints(
- "analysis-numpoints",
- llvm::cl::desc("minimum number of points in an analysis cluster"),
- llvm::cl::init(3));
-
-static llvm::cl::opt<float>
- AnalysisEpsilon("analysis-epsilon",
- llvm::cl::desc("dbscan epsilon for analysis clustering"),
- llvm::cl::init(0.1));
-
namespace exegesis {
-void benchmarkMain() {
- if (exegesis::pfm::pfmInitialize())
- llvm::report_fatal_error("cannot initialize libpfm");
-
- if (OpcodeName.empty() == (OpcodeIndex == 0))
+void main() {
+ if (OpcodeName.empty() == (OpcodeIndex == 0)) {
llvm::report_fatal_error(
"please provide one and only one of 'opcode-index' or 'opcode-name'");
+ }
llvm::InitializeNativeTarget();
llvm::InitializeNativeTargetAsmPrinter();
@@ -114,43 +94,10 @@ void benchmarkMain() {
case BenchmarkModeE::Uops:
Runner = llvm::make_unique<UopsBenchmarkRunner>();
break;
- case BenchmarkModeE::Analysis:
- llvm_unreachable("not a benchmark");
}
Runner->run(State, Opcode, NumRepetitions > 0 ? NumRepetitions : 1, Filter)
- .writeYamlOrDie(BenchmarkFile);
- exegesis::pfm::pfmTerminate();
-}
-
-void analysisMain() {
- // Read benchmarks.
- const std::vector<InstructionBenchmark> Points =
- InstructionBenchmark::readYamlsOrDie(BenchmarkFile);
- llvm::outs() << "Parsed " << Points.size() << " benchmark points\n";
- if (Points.empty()) {
- llvm::errs() << "no benchmarks to analyze\n";
- return;
- }
- // TODO: Merge points from several runs (latency and uops).
-
- // FIXME: Check that all points have the same triple/cpu.
- llvm::InitializeAllTargets();
- std::string Error;
- const auto *TheTarget =
- llvm::TargetRegistry::lookupTarget(Points[0].LLVMTriple, Error);
- if (!TheTarget) {
- llvm::errs() << "unknown target '" << Points[0].LLVMTriple << "'\n";
- return;
- }
- std::unique_ptr<llvm::MCSubtargetInfo> STI(TheTarget->createMCSubtargetInfo(
- Points[0].LLVMTriple, Points[0].CpuName, ""));
-
- const auto Clustering = llvm::cantFail(InstructionBenchmarkClustering::create(
- Points, AnalysisNumPoints, AnalysisEpsilon));
- if (auto Err = printAnalysisClusters(Clustering, *STI, llvm::outs())) {
- llvm::report_fatal_error(std::move(Err));
- }
+ .writeYamlOrDie("-");
}
} // namespace exegesis
@@ -158,10 +105,13 @@ void analysisMain() {
int main(int Argc, char **Argv) {
llvm::cl::ParseCommandLineOptions(Argc, Argv, "");
- if (BenchmarkMode == BenchmarkModeE::Analysis) {
- exegesis::analysisMain();
- } else {
- exegesis::benchmarkMain();
+ if (exegesis::pfm::pfmInitialize()) {
+ llvm::errs() << "cannot initialize libpfm\n";
+ return EXIT_FAILURE;
}
+
+ exegesis::main();
+
+ exegesis::pfm::pfmTerminate();
return EXIT_SUCCESS;
}
Modified: llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp?rev=332231&r1=332230&r2=332231&view=diff
==============================================================================
--- llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp (original)
+++ llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp Mon May 14 04:35:37 2018
@@ -57,7 +57,7 @@ TEST(BenchmarkResultTest, WriteToAndRead
{
// Vector version.
const auto FromDiskVector = InstructionBenchmark::readYamlsOrDie(Filename);
- ASSERT_EQ(FromDiskVector.size(), size_t{1});
+ ASSERT_EQ(FromDiskVector.size(), 1);
const auto FromDisk = FromDiskVector[0];
EXPECT_EQ(FromDisk.AsmTmpl.Name, ToDisk.AsmTmpl.Name);
EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName);
More information about the llvm-commits
mailing list