commit 09771ad2ca429d54973163a9ad2c13b0c71fc7f5
author Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net> Fri Mar 16 22:21:52 2018 +0000
committer Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net> Fri Mar 16 22:21:52 2018 +0000
tree ffffe1cc8070332dc631a2d8853292b5d6d9a609
parent 281032584d3ca52a97cee0344c0218dd25727d55

[llvm-mca] Remove method getSchedModel() from the Backend.

llvm-svn: 327756

llvm/tools/llvm-mca/Backend.h

diff --git a/llvm/tools/llvm-mca/Backend.h b/llvm/tools/llvm-mca/Backend.h
index 13e65bb..77f0524 100644
--- a/llvm/tools/llvm-mca/Backend.h
+++ b/llvm/tools/llvm-mca/Backend.h
@@ -93,9 +93,6 @@
   unsigned getMaxUsedRegisterMappings() const {
     return DU->getMaxUsedRegisterMappings();
   }
-  const llvm::MCSchedModel &getSchedModel() const {
-    return STI.getSchedModel();
-  }
   void getBuffersUsage(std::vector<BufferUsageEntry> &Usage) const {
     return HWS->getBuffersUsage(Usage);
   }

llvm/tools/llvm-mca/BackendStatistics.h

diff --git a/llvm/tools/llvm-mca/BackendStatistics.h b/llvm/tools/llvm-mca/BackendStatistics.h
index b38ae45..28c3e0d 100644
--- a/llvm/tools/llvm-mca/BackendStatistics.h
+++ b/llvm/tools/llvm-mca/BackendStatistics.h
@@ -59,6 +59,7 @@
 
 #include "Backend.h"
 #include "View.h"
+#include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Support/raw_ostream.h"
 #include <map>
 
@@ -67,6 +68,7 @@
 class BackendStatistics : public View {
   // TODO: remove the dependency from Backend.
   const Backend &B;
+  const llvm::MCSubtargetInfo &STI;
 
   using Histogram = std::map<unsigned, unsigned>;
   Histogram DispatchGroupSizePerCycle;
@@ -107,8 +109,9 @@
                            const llvm::ArrayRef<BufferUsageEntry> &Usage) const;
 
 public:
-  BackendStatistics(const Backend &backend)
-      : B(backend), NumDispatched(0), NumIssued(0), NumRetired(0), NumCycles(0) {}
+  BackendStatistics(const Backend &backend, const llvm::MCSubtargetInfo &sti)
+      : B(backend), STI(sti), NumDispatched(0), NumIssued(0), NumRetired(0),
+        NumCycles(0) {}
 
   void onInstructionEvent(const HWInstructionEvent &Event) override;
 
@@ -128,7 +131,7 @@
 
     std::vector<BufferUsageEntry> Usage;
     B.getBuffersUsage(Usage);
-    printSchedulerUsage(OS, B.getSchedModel(), Usage);
+    printSchedulerUsage(OS, STI.getSchedModel(), Usage);
   }
 };
 

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

diff --git a/llvm/tools/llvm-mca/llvm-mca.cpp b/llvm/tools/llvm-mca/llvm-mca.cpp
index 8acfd46..baba405 100644
--- a/llvm/tools/llvm-mca/llvm-mca.cpp
+++ b/llvm/tools/llvm-mca/llvm-mca.cpp
@@ -330,7 +330,7 @@
 
   if (PrintModeVerbose) {
     std::unique_ptr<mca::BackendStatistics> BS =
-        llvm::make_unique<mca::BackendStatistics>(*B);
+        llvm::make_unique<mca::BackendStatistics>(*B, *STI);
     Printer->addView(std::move(BS));
   }