Index: llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp =================================================================== --- llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp +++ llvm/trunk/tools/llvm-exegesis/lib/Analysis.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "BenchmarkResult.h" #include "Analysis.h" +#include "BenchmarkResult.h" #include "llvm/Support/FormatVariadic.h" #include @@ -16,7 +16,7 @@ static const char kCsvSep = ','; -static void writeCsvEscaped(llvm::raw_ostream& OS, const std::string& S) { +static void writeCsvEscaped(llvm::raw_ostream &OS, const std::string &S) { if (std::find(S.begin(), S.end(), kCsvSep) == S.end()) { OS << S; } else { @@ -35,10 +35,12 @@ // Prints a row representing an instruction, along with scheduling info and // point coordinates (measurements). static void printInstructionRow(const InstructionBenchmark &Point, - const llvm::MCSubtargetInfo &STI, - const size_t ClusterId, llvm::raw_ostream &OS) { + const llvm::MCSubtargetInfo &STI, + const size_t ClusterId, llvm::raw_ostream &OS) { OS << ClusterId << kCsvSep; - writeCsvEscaped(OS, Point.AsmTmpl.Name); + writeCsvEscaped(OS, Point.Key.OpcodeName); + OS << kCsvSep; + writeCsvEscaped(OS, Point.Key.Config); // FIXME: Print the sched class once InstructionBenchmark separates key into // (mnemonic, mode, opaque). for (const auto &Measurement : Point.Measurements) { @@ -49,9 +51,10 @@ } static void printCluster(const std::vector &Points, - const llvm::MCSubtargetInfo &STI, const size_t ClusterId, - const InstructionBenchmarkClustering::Cluster &Cluster, - llvm::raw_ostream &OS) { + const llvm::MCSubtargetInfo &STI, + const size_t ClusterId, + const InstructionBenchmarkClustering::Cluster &Cluster, + llvm::raw_ostream &OS) { // Print all points. for (const auto &PointId : Cluster.PointIndices) { printInstructionRow(Points[PointId], STI, ClusterId, OS); @@ -65,7 +68,8 @@ return llvm::Error::success(); // Write the header. - OS << "cluster_id;key,sched_class"; + OS << "cluster_id" << kCsvSep << "opcode_name" << kCsvSep << "config" + << kCsvSep << "sched_class"; for (const auto &Measurement : Clustering.getPoints().front().Measurements) { OS << kCsvSep; writeCsvEscaped(OS, Measurement.Key); Index: llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h =================================================================== --- llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h +++ llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.h @@ -23,8 +23,14 @@ namespace exegesis { -struct AsmTemplate { - std::string Name; +struct InstructionBenchmarkKey { + // The LLVM opcode name. + std::string OpcodeName; + // The benchmark mode. + std::string Mode; + // An opaque configuration, that can be used to separate several benchmarks of + // the same instruction under different configurations. + std::string Config; }; struct BenchmarkMeasure { @@ -35,12 +41,13 @@ // The result of an instruction benchmark. struct InstructionBenchmark { - AsmTemplate AsmTmpl; + InstructionBenchmarkKey Key; std::string CpuName; std::string LLVMTriple; int NumRepetitions = 0; std::vector Measurements; std::string Error; + std::string Info; static InstructionBenchmark readYamlOrDie(llvm::StringRef Filename); static std::vector readYamlsOrDie(llvm::StringRef Filename); Index: llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.cpp =================================================================== --- llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.cpp +++ llvm/trunk/tools/llvm-exegesis/lib/BenchmarkResult.cpp @@ -34,20 +34,23 @@ static const bool flow = true; }; -template <> struct MappingTraits { - static void mapping(IO &Io, exegesis::AsmTemplate &Obj) { - Io.mapRequired("name", Obj.Name); +template <> struct MappingTraits { + static void mapping(IO &Io, exegesis::InstructionBenchmarkKey &Obj) { + Io.mapRequired("opcode_name", Obj.OpcodeName); + Io.mapRequired("mode", Obj.Mode); + Io.mapOptional("config", Obj.Config); } }; template <> struct MappingTraits { static void mapping(IO &Io, exegesis::InstructionBenchmark &Obj) { - Io.mapRequired("asm_template", Obj.AsmTmpl); + Io.mapRequired("key", Obj.Key); Io.mapRequired("cpu_name", Obj.CpuName); Io.mapRequired("llvm_triple", Obj.LLVMTriple); Io.mapRequired("num_repetitions", Obj.NumRepetitions); Io.mapRequired("measurements", Obj.Measurements); Io.mapRequired("error", Obj.Error); + Io.mapOptional("info", Obj.Info); } }; Index: llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp =================================================================== --- llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp +++ llvm/trunk/tools/llvm-exegesis/lib/BenchmarkRunner.cpp @@ -26,11 +26,8 @@ const InstructionFilter &Filter) const { InstructionBenchmark InstrBenchmark; - InstrBenchmark.AsmTmpl.Name = - llvm::Twine(getDisplayName()) - .concat(" ") - .concat(State.getInstrInfo().getName(Opcode)) - .str(); + InstrBenchmark.Key.OpcodeName = State.getInstrInfo().getName(Opcode); + InstrBenchmark.Key.Mode = getDisplayName(); InstrBenchmark.CpuName = State.getCpuName(); InstrBenchmark.LLVMTriple = State.getTriple(); InstrBenchmark.NumRepetitions = NumRepetitions; Index: llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp =================================================================== --- llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp +++ llvm/trunk/unittests/tools/llvm-exegesis/BenchmarkResultTest.cpp @@ -27,13 +27,16 @@ TEST(BenchmarkResultTest, WriteToAndReadFromDisk) { InstructionBenchmark ToDisk; - ToDisk.AsmTmpl.Name = "name"; + ToDisk.Key.OpcodeName = "name"; + ToDisk.Key.Mode = "mode"; + ToDisk.Key.Config = "config"; ToDisk.CpuName = "cpu_name"; ToDisk.LLVMTriple = "llvm_triple"; ToDisk.NumRepetitions = 1; ToDisk.Measurements.push_back(BenchmarkMeasure{"a", 1, "debug a"}); ToDisk.Measurements.push_back(BenchmarkMeasure{"b", 2, ""}); ToDisk.Error = "error"; + ToDisk.Info = "info"; llvm::SmallString<64> Filename; std::error_code EC; @@ -47,24 +50,30 @@ // One-element version. const auto FromDisk = InstructionBenchmark::readYamlOrDie(Filename); - EXPECT_EQ(FromDisk.AsmTmpl.Name, ToDisk.AsmTmpl.Name); + EXPECT_EQ(FromDisk.Key.OpcodeName, ToDisk.Key.OpcodeName); + EXPECT_EQ(FromDisk.Key.Mode, ToDisk.Key.Mode); + EXPECT_EQ(FromDisk.Key.Config, ToDisk.Key.Config); EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName); EXPECT_EQ(FromDisk.LLVMTriple, ToDisk.LLVMTriple); EXPECT_EQ(FromDisk.NumRepetitions, ToDisk.NumRepetitions); EXPECT_THAT(FromDisk.Measurements, ToDisk.Measurements); EXPECT_THAT(FromDisk.Error, ToDisk.Error); + EXPECT_EQ(FromDisk.Info, ToDisk.Info); } { // Vector version. const auto FromDiskVector = InstructionBenchmark::readYamlsOrDie(Filename); ASSERT_EQ(FromDiskVector.size(), size_t{1}); const auto FromDisk = FromDiskVector[0]; - EXPECT_EQ(FromDisk.AsmTmpl.Name, ToDisk.AsmTmpl.Name); + EXPECT_EQ(FromDisk.Key.OpcodeName, ToDisk.Key.OpcodeName); + EXPECT_EQ(FromDisk.Key.Mode, ToDisk.Key.Mode); + EXPECT_EQ(FromDisk.Key.Config, ToDisk.Key.Config); EXPECT_EQ(FromDisk.CpuName, ToDisk.CpuName); EXPECT_EQ(FromDisk.LLVMTriple, ToDisk.LLVMTriple); EXPECT_EQ(FromDisk.NumRepetitions, ToDisk.NumRepetitions); EXPECT_THAT(FromDisk.Measurements, ToDisk.Measurements); EXPECT_THAT(FromDisk.Error, ToDisk.Error); + EXPECT_EQ(FromDisk.Info, ToDisk.Info); } }