[llvm-exegesis] Fix PR39096.

[courbet]

Summary

The key is now the resource name, not the resource id.

[courbet]

Use NumMicroOps in analysis display for consistency with measurement keys.

[gchatelet]

Is there any documentation to update as well?

[courbet]

In D52607#1247840, @gchatelet wrote:

Is there any documentation to update as well?

No, I've used latency as an example.

test/tools/llvm-exegesis/X86/analysis-inconsistencies-uops-backwards.test

+# This tests backwards-compatibility of the yaml schema (see PR39082).
+# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clusters-output-file="" -analysis-numpoints=1 | FileCheck %s
+
+# CHECK: DOCTYPE
+
+---
+mode:            uops
+key:
+  instructions:
+    - 'VZEROALL'
+  config:          ''
+  register_initial_values:
+cpu_name:        haswell
+llvm_triple:     x86_64-unknown-linux-gnu
+num_repetitions: 10000
+measurements:
+  - { key: '3', value: 0.0015, per_snippet_value: 0.0015 }
+  - { key: '4', value: 0.0011, per_snippet_value: 0.0011 }
+  - { key: '5', value: 0.0006, per_snippet_value: 0.0006 }
+  - { key: '6', value: 0.0004, per_snippet_value: 0.0004 }
+  - { key: '7', value: 0.0002, per_snippet_value: 0.0002 }
+  - { key: '8', value: 1.0008, per_snippet_value: 1.0008 }
+  - { key: '9', value: 1.0022, per_snippet_value: 1.0022 }
+  - { key: '10', value: 0.0001, per_snippet_value: 0.0001 }
+error:           ''
+info:            ''
+assembled_snippet: C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C3
+...

test/tools/llvm-exegesis/X86/analysis-inconsistencies-uops.test

+# RUN: llvm-exegesis -mode=analysis -benchmarks-file=%s -analysis-inconsistencies-output-file=- -analysis-clusters-output-file="" -analysis-numpoints=1 | FileCheck %s
+
+# CHECK: DOCTYPE
+
+---
+mode:            uops
+key:
+  instructions:
+    - 'VZEROALL'
+  config:          ''
+  register_initial_values:
+cpu_name:        haswell
+llvm_triple:     x86_64-unknown-linux-gnu
+num_repetitions: 10000
+measurements:
+  - { key: HWPort0, value: 0.0015, per_snippet_value: 0.0015 }
+  - { key: HWPort1, value: 0.0011, per_snippet_value: 0.0011 }
+  - { key: HWPort2, value: 0.0006, per_snippet_value: 0.0006 }
+  - { key: HWPort3, value: 0.0004, per_snippet_value: 0.0004 }
+  - { key: HWPort4, value: 0.0002, per_snippet_value: 0.0002 }
+  - { key: HWPort5, value: 1.0008, per_snippet_value: 1.0008 }
+  - { key: HWPort6, value: 1.0022, per_snippet_value: 1.0022 }
+  - { key: HWPort7, value: 0.0001, per_snippet_value: 0.0001 }
+  - { key: NumMicroOps, value: 20.0073, per_snippet_value: 20.0073 }
+error:           ''
+info:            ''
+assembled_snippet: C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C5FC77C3
+...

tools/llvm-exegesis/lib/Analysis.cpp

if (ClusterId.isUndef()) {
     Representative.resize(Point.Measurements.size());
   }
   for (size_t I = 0, E = Point.Measurements.size(); I < E; ++I) {
     Representative[I].push(Point.Measurements[I]);
   }
   assert(ClusterId == Clustering.getClusterIdForPoint(PointId));
 }
 
+// Returns a ProxResIdx by id or name.
+static unsigned findProcResIdx(const llvm::MCSubtargetInfo &STI,
+                               const llvm::StringRef NameOrId) {
+  // Interpret the key as an ProcResIdx.
+  unsigned ProcResIdx = 0;
+  if (llvm::to_integer(NameOrId, ProcResIdx, 10))
+    return ProcResIdx;
+  // Interpret the key as a ProcRes name.
+  const auto &SchedModel = STI.getSchedModel();
+  for (int I = 0, E = SchedModel.getNumProcResourceKinds(); I < E; ++I) {
+    if (NameOrId == SchedModel.getProcResource(I)->Name)
+      return I;
+  }
+  return 0;
+}
+
 bool Analysis::SchedClassCluster::measurementsMatch(
     const llvm::MCSubtargetInfo &STI, const SchedClass &SC,
     const InstructionBenchmarkClustering &Clustering) const {
   const size_t NumMeasurements = Representative.size();
   std::vector<BenchmarkMeasure> ClusterCenterPoint(NumMeasurements);
   std::vector<BenchmarkMeasure> SchedClassPoint(NumMeasurements);
   // Latency case.
   assert(!Clustering.getPoints().empty());
for (unsigned I = 0; I < SC.SCDesc->NumWriteLatencyEntries; ++I) {
       const llvm::MCWriteLatencyEntry *const WLE =
           STI.getWriteLatencyEntry(SC.SCDesc, I);
       SchedClassPoint[0].PerInstructionValue =
           std::max<double>(SchedClassPoint[0].PerInstructionValue, WLE->Cycles);
     }
     ClusterCenterPoint[0].PerInstructionValue = Representative[0].avg();
   } else if (Mode == InstructionBenchmark::Uops) {
     for (int I = 0, E = Representative.size(); I < E; ++I) {
+      const auto Key = Representative[I].key();
+      uint16_t ProcResIdx = findProcResIdx(STI, Key);
+      if (ProcResIdx > 0) {
         // Find the pressure on ProcResIdx `Key`.
-      uint16_t ProcResIdx = 0;
-      if (!llvm::to_integer(Representative[I].key(), ProcResIdx, 10)) {
-        llvm::errs() << "expected ProcResIdx key, got "
-                     << Representative[I].key() << "\n";
-        return false;
-      }
         const auto ProcResPressureIt =
             std::find_if(SC.IdealizedProcResPressure.begin(),
                          SC.IdealizedProcResPressure.end(),
                          [ProcResIdx](const std::pair<uint16_t, float> &WPR) {
                            return WPR.first == ProcResIdx;
                          });
         SchedClassPoint[I].PerInstructionValue =
             ProcResPressureIt == SC.IdealizedProcResPressure.end()
                 ? 0.0
                 : ProcResPressureIt->second;
+      } else if (Key == "NumMicroOps") {
+        SchedClassPoint[I].PerInstructionValue = SC.SCDesc->NumMicroOps;
+      } else {
+        llvm::errs() << "expected `key` to be either a ProcResIdx or a ProcRes "
+                        "name, got "
+                     << Key << "\n";
+        return false;
+      }
       ClusterCenterPoint[I].PerInstructionValue = Representative[I].avg();
     }
   } else {
     llvm::errs() << "unimplemented measurement matching for mode " << Mode
                  << "\n";
     return false;
   }
   return Clustering.isNeighbour(ClusterCenterPoint, SchedClassPoint);