From 083960d1d1faf544b3f6e993c49d06a532dff339 Mon Sep 17 00:00:00 2001
From: Andrea Di Biagio <Andrea_DiBiagio@sn.scee.net>
Date: Fri, 23 Mar 2018 17:53:02 +0000
Subject: [PATCH] [llvm-mca] update the ResourcePressureView after r328335.
 NFC.

This should have been part of r328335. I forgot to svn add these files.

llvm-svn: 328340
---
 llvm/tools/llvm-mca/ResourcePressureView.cpp | 14 +++++++-------
 llvm/tools/llvm-mca/ResourcePressureView.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/llvm/tools/llvm-mca/ResourcePressureView.cpp b/llvm/tools/llvm-mca/ResourcePressureView.cpp
index 330de2d..8456486 100644
--- a/llvm/tools/llvm-mca/ResourcePressureView.cpp
+++ b/llvm/tools/llvm-mca/ResourcePressureView.cpp
@@ -36,7 +36,7 @@ void ResourcePressureView::initialize() {
 
   NumResourceUnits = R2VIndex;
   ResourceUsage.resize(NumResourceUnits * (Source.size() + 1));
-  std::fill(ResourceUsage.begin(), ResourceUsage.end(), 0);
+  std::fill(ResourceUsage.begin(), ResourceUsage.end(), 0.0);
 }
 
 void ResourcePressureView::onInstructionEvent(const HWInstructionEvent &Event) {
@@ -45,7 +45,7 @@ void ResourcePressureView::onInstructionEvent(const HWInstructionEvent &Event) {
     return;
   const auto &IssueEvent = static_cast<const HWInstructionIssuedEvent &>(Event);
   unsigned SourceIdx = Event.Index % Source.size();
-  for (const std::pair<ResourceRef, unsigned> &Use : IssueEvent.UsedResources) {
+  for (const std::pair<ResourceRef, double> &Use : IssueEvent.UsedResources) {
     const ResourceRef &RR = Use.first;
     assert(Resource2VecIndex.find(RR.first) != Resource2VecIndex.end());
     unsigned R2VIndex = Resource2VecIndex[RR.first];
@@ -113,13 +113,13 @@ void ResourcePressureView::printResourcePressurePerIteration(
   TempStream << '\n';
 
   for (unsigned I = 0, E = NumResourceUnits; I < E; ++I) {
-    unsigned Usage = ResourceUsage[I + Source.size() * E];
+    double Usage = ResourceUsage[I + Source.size() * E];
     if (!Usage) {
       TempStream << " -     ";
       continue;
     }
 
-    double Pressure = (double)Usage / Executions;
+    double Pressure = Usage / Executions;
     TempStream << format("%.2f", Pressure);
     if (Pressure < 10.0)
       TempStream << "   ";
@@ -144,11 +144,11 @@ void ResourcePressureView::printResourcePressurePerInstruction(
 
   for (unsigned I = 0, E = Source.size(); I < E; ++I) {
     for (unsigned J = 0; J < NumResourceUnits; ++J) {
-      unsigned Usage = ResourceUsage[J + I * NumResourceUnits];
-      if (Usage == 0) {
+      double Usage = ResourceUsage[J + I * NumResourceUnits];
+      if (!Usage) {
         TempStream << " -     ";
       } else {
-        double Pressure = (double)Usage / Executions;
+        double Pressure = Usage / Executions;
         if (Pressure < 0.005) {
           TempStream << " -     ";
         } else {
diff --git a/llvm/tools/llvm-mca/ResourcePressureView.h b/llvm/tools/llvm-mca/ResourcePressureView.h
index ee03cd3..7eb5f83 100644
--- a/llvm/tools/llvm-mca/ResourcePressureView.h
+++ b/llvm/tools/llvm-mca/ResourcePressureView.h
@@ -81,7 +81,7 @@ class ResourcePressureView : public View {
   llvm::DenseMap<unsigned, unsigned> Resource2VecIndex;
 
   // Table of resources used by instructions.
-  std::vector<unsigned> ResourceUsage;
+  std::vector<double> ResourceUsage;
   unsigned NumResourceUnits;
 
   const llvm::MCInst &GetMCInstFromIndex(unsigned Index) const;
-- 
2.7.4