Move customization logic to InstrumentManager

Author: r-belenov

llvm/include/llvm/MCA/CustomBehaviour.h

@@ -130,9 +130,6 @@ class Instrument {
 
   virtual ~Instrument() = default;
 
-  virtual bool canCustomize() const { return false; }
-  virtual void customize(InstrDesc &) const {}
-
   StringRef getDesc() const { return Desc; }
   StringRef getData() const { return Data; }
 };
@@ -154,15 +151,8 @@ class LatencyInstrument : public Instrument {
       Latency = L;
   }
 
-  bool canCustomize() const override { return bool(Latency); }
-  void customize(InstrDesc &ID) const override {
-    if (Latency) {
-      // TODO Allow to customize a subset of ID.Writes
-      for (auto &W : ID.Writes)
-        W.Latency = *Latency;
-      ID.MaxLatency = *Latency;
-    }
-  }
+  bool hasValue() const { return bool(Latency); }
+  unsigned getLatency() { return *Latency; }
 };
 
 using UniqueInstrument = std::unique_ptr<Instrument>;
@@ -178,7 +168,7 @@ class LLVM_ABI InstrumentManager {
 
 public:
   InstrumentManager(const MCSubtargetInfo &STI, const MCInstrInfo &MCII,
-                    bool EnableInstruments = false)
+                    bool EnableInstruments = true)
       : STI(STI), MCII(MCII), EnableInstruments(EnableInstruments) {};
 
   virtual ~InstrumentManager() = default;

llvm/lib/MCA/CustomBehaviour.cpp

@@ -52,26 +52,36 @@ bool InstrumentManager::supportsInstrumentType(StringRef Type) const {
 bool InstrumentManager::canCustomize(
     const llvm::SmallVector<Instrument *> &IVec) const {
   for (const auto I : IVec) {
-    if (I->canCustomize())
-      return true;
+    if (I->getDesc() == LatencyInstrument::DESC_NAME) {
+      auto LatInst = static_cast<LatencyInstrument*>(I);
+      return LatInst->hasValue();
+    }
   }
   return false;
 }
 
 void InstrumentManager::customize(const llvm::SmallVector<Instrument *> &IVec,
                                   InstrDesc &ID) const {
   for (const auto I : IVec) {
-    if (I->canCustomize())
-      I->customize(ID);
+    if (I->getDesc() == LatencyInstrument::DESC_NAME) {
+      auto LatInst = static_cast<LatencyInstrument*>(I);
+      if (LatInst->hasValue()) {
+        auto Latency = LatInst->getLatency();
+        // TODO Allow to customize a subset of ID.Writes
+        for (auto &W : ID.Writes)
+          W.Latency = Latency;
+        ID.MaxLatency = Latency;
+      }
+    }
   }
 }
 
 UniqueInstrument InstrumentManager::createInstrument(llvm::StringRef Desc,
                                                      llvm::StringRef Data) {
-  if (!EnableInstruments)
-    return std::make_unique<Instrument>(Desc, Data);
-  if (Desc == LatencyInstrument::DESC_NAME)
-    return std::make_unique<LatencyInstrument>(Data);
+  if (EnableInstruments) {
+    if (Desc == LatencyInstrument::DESC_NAME)
+      return std::make_unique<LatencyInstrument>(Data);
+  }
   return std::make_unique<Instrument>(Desc, Data);
 }
 

llvm/tools/llvm-mca/llvm-mca.cpp

@@ -516,12 +516,12 @@ int main(int argc, char **argv) {
     if (!IM) {
       // If the target doesn't have its own IM implemented we use base class
       // with instruments enabled.
-      IM = std::make_unique<mca::InstrumentManager>(*STI, *MCII, true);
+      IM = std::make_unique<mca::InstrumentManager>(*STI, *MCII);
     }
   } else {
-    // If the -disable-cb flag is set then we use the default base class
-    // implementation (which does nothing).
-    IM = std::make_unique<mca::InstrumentManager>(*STI, *MCII);
+    // If the -disable-im flag is set then we use the default base class
+    // implementation and disable the instruments.
+    IM = std::make_unique<mca::InstrumentManager>(*STI, *MCII, /*EnableInstruments=*/false);
   }
 
   // Parse the input and create InstrumentRegion that llvm-mca