Addressed minor comments

Author: r-belenov

llvm/include/llvm/MCA/CustomBehaviour.h

@@ -138,21 +138,19 @@ class LatencyInstrument : public Instrument {
   std::optional<unsigned> Latency;
 
 public:
-  static const llvm::StringRef DESC_NAME;
+  static const StringRef DESC_NAME;
   LatencyInstrument(StringRef Data) : Instrument(DESC_NAME, Data) {
     // Skip spaces and tabs.
-    unsigned Position = Data.find_first_not_of(" \t");
-    if (Position >= Data.size())
-      // We reached the end of the comment. Bail out.
+    Data = Data.trim();
+    if (Data.empty()) // Empty description. Bail out.
       return;
-    Data = Data.drop_front(Position);
     unsigned L = 0;
     if (!Data.getAsInteger(10, L))
       Latency = L;
   }
 
   bool hasValue() const { return bool(Latency); }
-  unsigned getLatency() { return *Latency; }
+  unsigned getLatency() const { return *Latency; }
 };
 
 using UniqueInstrument = std::unique_ptr<Instrument>;
@@ -200,10 +198,10 @@ class LLVM_ABI InstrumentManager {
                                    const SmallVector<Instrument *> &IVec) const;
 
   // Return true if instruments can modify instruction description
-  virtual bool canCustomize(const SmallVector<Instrument *> &IVec) const;
+  virtual bool canCustomize(const ArrayRef<Instrument *> IVec) const;
 
   // Customize instruction description
-  virtual void customize(const SmallVector<Instrument *> &IVec,
+  virtual void customize(const ArrayRef<Instrument *> IVec,
                          llvm::mca::InstrDesc &Desc) const;
 };
 

llvm/lib/MCA/CustomBehaviour.cpp

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

llvm/unittests/tools/llvm-mca/MCATestBase.cpp

@@ -60,7 +60,7 @@ void MCATestBase::SetUp() {
 Error MCATestBase::runBaselineMCA(
     json::Object &Result, ArrayRef<MCInst> Insts, ArrayRef<mca::View *> Views,
     const mca::PipelineOptions *PO,
-    SmallVector<std::pair<StringRef, StringRef>> Descs) {
+    ArrayRef<std::pair<StringRef, StringRef>> Descs) {
   mca::Context MCA(*MRI, *STI);
 
   // Enable instruments when descriptions are provided

llvm/unittests/tools/llvm-mca/MCATestBase.h

@@ -78,7 +78,7 @@ class MCATestBase : public ::testing::Test {
   runBaselineMCA(json::Object &Result, ArrayRef<MCInst> Insts,
                  ArrayRef<mca::View *> Views = {},
                  const mca::PipelineOptions *PO = nullptr,
-                 SmallVector<std::pair<StringRef, StringRef>> Descs = {});
+                 ArrayRef<std::pair<StringRef, StringRef>> Descs = {});
 };
 
 } // end namespace mca

llvm/unittests/tools/llvm-mca/X86/TestIncrementalMCA.cpp

@@ -246,7 +246,7 @@ TEST_F(X86TestBase, TestInstructionCustomization) {
   MCIs.push_back(InstructionToAdd);
   SmallVector<std::pair<StringRef, StringRef>> InstrDescs;
   auto LatStr = std::to_string(ExplicitLatency);
-  InstrDescs.push_back(std::make_pair(StringRef("LATENCY"), StringRef(LatStr)));
+  InstrDescs.push_back(std::make_pair("LATENCY", LatStr));
 
   // Run the baseline.
   json::Object BaselineResult;