From 94fafdfdedcf9230331a0c4ba9629888657e187d Mon Sep 17 00:00:00 2001 From: Andrea Di Biagio Date: Sat, 24 Mar 2018 16:05:36 +0000 Subject: [PATCH] [llvm-mca] run clang-format on all files. This also addresses Simon's review comment in D44839. llvm-svn: 328428 --- llvm/tools/llvm-mca/BackendPrinter.cpp | 1 - llvm/tools/llvm-mca/BackendPrinter.h | 2 -- llvm/tools/llvm-mca/BackendStatistics.h | 4 ++-- llvm/tools/llvm-mca/Dispatch.cpp | 5 ++--- llvm/tools/llvm-mca/HWEventListener.cpp | 1 - llvm/tools/llvm-mca/InstrBuilder.cpp | 8 ++++---- llvm/tools/llvm-mca/Instruction.h | 1 - llvm/tools/llvm-mca/LSUnit.cpp | 5 +++-- llvm/tools/llvm-mca/LSUnit.h | 1 - llvm/tools/llvm-mca/ResourcePressureView.cpp | 1 - llvm/tools/llvm-mca/ResourcePressureView.h | 1 - llvm/tools/llvm-mca/Scheduler.h | 6 +++--- llvm/tools/llvm-mca/SourceMgr.h | 1 - llvm/tools/llvm-mca/SummaryView.cpp | 1 - llvm/tools/llvm-mca/TimelineView.cpp | 1 - llvm/tools/llvm-mca/TimelineView.h | 1 - llvm/tools/llvm-mca/View.cpp | 1 - llvm/tools/llvm-mca/View.h | 3 +-- llvm/tools/llvm-mca/llvm-mca.cpp | 3 ++- 19 files changed, 17 insertions(+), 30 deletions(-) diff --git a/llvm/tools/llvm-mca/BackendPrinter.cpp b/llvm/tools/llvm-mca/BackendPrinter.cpp index 7772903..6fc78a5 100644 --- a/llvm/tools/llvm-mca/BackendPrinter.cpp +++ b/llvm/tools/llvm-mca/BackendPrinter.cpp @@ -24,5 +24,4 @@ void BackendPrinter::printReport(llvm::raw_ostream &OS) const { for (const auto &V : Views) V->printView(OS); } - } // namespace mca. diff --git a/llvm/tools/llvm-mca/BackendPrinter.h b/llvm/tools/llvm-mca/BackendPrinter.h index d8ab123..d159a95 100644 --- a/llvm/tools/llvm-mca/BackendPrinter.h +++ b/llvm/tools/llvm-mca/BackendPrinter.h @@ -26,7 +26,6 @@ namespace mca { - /// \brief A printer class that knows how to collects statistics on the /// code analyzed by the llvm-mca tool. /// @@ -48,7 +47,6 @@ public: void printReport(llvm::raw_ostream &OS) const; }; - } // namespace mca #endif diff --git a/llvm/tools/llvm-mca/BackendStatistics.h b/llvm/tools/llvm-mca/BackendStatistics.h index aff3bde..5dc0c88 100644 --- a/llvm/tools/llvm-mca/BackendStatistics.h +++ b/llvm/tools/llvm-mca/BackendStatistics.h @@ -130,8 +130,8 @@ class BackendStatistics : public View { public: BackendStatistics(const llvm::MCSubtargetInfo &sti) - : STI(sti), NumDispatched(0), NumIssued(0), NumRetired(0), - NumCycles(0), HWStalls(HWStallEvent::LastGenericEvent), + : STI(sti), NumDispatched(0), NumIssued(0), NumRetired(0), NumCycles(0), + HWStalls(HWStallEvent::LastGenericEvent), // TODO: The view currently assumes a single register file. This will // change in future. RegisterFiles(1) {} diff --git a/llvm/tools/llvm-mca/Dispatch.cpp b/llvm/tools/llvm-mca/Dispatch.cpp index c1e5d3e..c0f16f0 100644 --- a/llvm/tools/llvm-mca/Dispatch.cpp +++ b/llvm/tools/llvm-mca/Dispatch.cpp @@ -223,8 +223,8 @@ unsigned RetireControlUnit::reserveSlot(unsigned Index, unsigned NumMicroOps) { return TokenID; } -void DispatchUnit::notifyInstructionDispatched( - unsigned Index, ArrayRef UsedRegs) { +void DispatchUnit::notifyInstructionDispatched(unsigned Index, + ArrayRef UsedRegs) { DEBUG(dbgs() << "[E] Instruction Dispatched: " << Index << '\n'); Owner->notifyInstructionEvent(HWInstructionDispatchedEvent(Index, UsedRegs)); } @@ -389,5 +389,4 @@ void DispatchUnit::dump() const { RCU->dump(); } #endif - } // namespace mca diff --git a/llvm/tools/llvm-mca/HWEventListener.cpp b/llvm/tools/llvm-mca/HWEventListener.cpp index b385a36..f27a04a 100644 --- a/llvm/tools/llvm-mca/HWEventListener.cpp +++ b/llvm/tools/llvm-mca/HWEventListener.cpp @@ -18,5 +18,4 @@ namespace mca { // Anchor the vtable here. void HWEventListener::anchor() {} - } // namespace mca diff --git a/llvm/tools/llvm-mca/InstrBuilder.cpp b/llvm/tools/llvm-mca/InstrBuilder.cpp index ea54c36..23da05f 100644 --- a/llvm/tools/llvm-mca/InstrBuilder.cpp +++ b/llvm/tools/llvm-mca/InstrBuilder.cpp @@ -23,10 +23,10 @@ namespace mca { using namespace llvm; -static void -initializeUsedResources(InstrDesc &ID, const MCSchedClassDesc &SCDesc, - const MCSubtargetInfo &STI, - ArrayRef ProcResourceMasks) { +static void initializeUsedResources(InstrDesc &ID, + const MCSchedClassDesc &SCDesc, + const MCSubtargetInfo &STI, + ArrayRef ProcResourceMasks) { const MCSchedModel &SM = STI.getSchedModel(); // Populate resources consumed. diff --git a/llvm/tools/llvm-mca/Instruction.h b/llvm/tools/llvm-mca/Instruction.h index fb9551d..ccb7c64 100644 --- a/llvm/tools/llvm-mca/Instruction.h +++ b/llvm/tools/llvm-mca/Instruction.h @@ -309,7 +309,6 @@ public: void cycleEvent(); }; - } // namespace mca #endif diff --git a/llvm/tools/llvm-mca/LSUnit.cpp b/llvm/tools/llvm-mca/LSUnit.cpp index 115ef8f..c235830 100644 --- a/llvm/tools/llvm-mca/LSUnit.cpp +++ b/llvm/tools/llvm-mca/LSUnit.cpp @@ -12,8 +12,8 @@ /// //===----------------------------------------------------------------------===// -#include "Instruction.h" #include "LSUnit.h" +#include "Instruction.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" @@ -76,7 +76,8 @@ bool LSUnit::isReady(unsigned Index) const { assert((IsALoad || IsAStore) && "Instruction is not in queue!"); unsigned LoadBarrierIndex = LoadBarriers.empty() ? 0 : *LoadBarriers.begin(); - unsigned StoreBarrierIndex = StoreBarriers.empty() ? 0 : *StoreBarriers.begin(); + unsigned StoreBarrierIndex = + StoreBarriers.empty() ? 0 : *StoreBarriers.begin(); if (IsALoad && LoadBarrierIndex) { if (Index > LoadBarrierIndex) diff --git a/llvm/tools/llvm-mca/LSUnit.h b/llvm/tools/llvm-mca/LSUnit.h index 8bf933d..3cfde5a 100644 --- a/llvm/tools/llvm-mca/LSUnit.h +++ b/llvm/tools/llvm-mca/LSUnit.h @@ -144,7 +144,6 @@ public: bool isReady(unsigned Index) const; void onInstructionExecuted(unsigned Index); }; - } // namespace mca #endif diff --git a/llvm/tools/llvm-mca/ResourcePressureView.cpp b/llvm/tools/llvm-mca/ResourcePressureView.cpp index 8456486..1136124 100644 --- a/llvm/tools/llvm-mca/ResourcePressureView.cpp +++ b/llvm/tools/llvm-mca/ResourcePressureView.cpp @@ -170,5 +170,4 @@ void ResourcePressureView::printResourcePressurePerInstruction( Buffer = ""; } } - } // namespace mca diff --git a/llvm/tools/llvm-mca/ResourcePressureView.h b/llvm/tools/llvm-mca/ResourcePressureView.h index 7eb5f83..570cdc6 100644 --- a/llvm/tools/llvm-mca/ResourcePressureView.h +++ b/llvm/tools/llvm-mca/ResourcePressureView.h @@ -106,7 +106,6 @@ public: printResourcePressurePerInstruction(OS, Executions); } }; - } // namespace mca #endif diff --git a/llvm/tools/llvm-mca/Scheduler.h b/llvm/tools/llvm-mca/Scheduler.h index a3ef144..c690ad2 100644 --- a/llvm/tools/llvm-mca/Scheduler.h +++ b/llvm/tools/llvm-mca/Scheduler.h @@ -418,9 +418,9 @@ class Scheduler { std::map ReadyQueue; std::map IssuedQueue; - void notifyInstructionIssued( - unsigned Index, - llvm::ArrayRef> Used); + void + notifyInstructionIssued(unsigned Index, + llvm::ArrayRef> Used); void notifyInstructionExecuted(unsigned Index); void notifyInstructionReady(unsigned Index); void notifyResourceAvailable(const ResourceRef &RR); diff --git a/llvm/tools/llvm-mca/SourceMgr.h b/llvm/tools/llvm-mca/SourceMgr.h index 1712744..ec8abaf 100644 --- a/llvm/tools/llvm-mca/SourceMgr.h +++ b/llvm/tools/llvm-mca/SourceMgr.h @@ -59,7 +59,6 @@ public: bool isEmpty() const { return size() == 0; } }; - } // namespace mca #endif diff --git a/llvm/tools/llvm-mca/SummaryView.cpp b/llvm/tools/llvm-mca/SummaryView.cpp index f7d0900..511727b 100644 --- a/llvm/tools/llvm-mca/SummaryView.cpp +++ b/llvm/tools/llvm-mca/SummaryView.cpp @@ -38,5 +38,4 @@ void SummaryView::printView(raw_ostream &OS) const { TempStream.flush(); OS << Buffer; } - } // namespace mca. diff --git a/llvm/tools/llvm-mca/TimelineView.cpp b/llvm/tools/llvm-mca/TimelineView.cpp index c57cad7..9419fe4 100644 --- a/llvm/tools/llvm-mca/TimelineView.cpp +++ b/llvm/tools/llvm-mca/TimelineView.cpp @@ -233,5 +233,4 @@ void TimelineView::printTimeline(raw_ostream &OS) const { OS << Buffer; } } - } // namespace mca diff --git a/llvm/tools/llvm-mca/TimelineView.h b/llvm/tools/llvm-mca/TimelineView.h index 7d337b8..3ee4486 100644 --- a/llvm/tools/llvm-mca/TimelineView.h +++ b/llvm/tools/llvm-mca/TimelineView.h @@ -173,7 +173,6 @@ public: printAverageWaitTimes(OS); } }; - } // namespace mca #endif diff --git a/llvm/tools/llvm-mca/View.cpp b/llvm/tools/llvm-mca/View.cpp index 1b54e4e..390a7ae 100644 --- a/llvm/tools/llvm-mca/View.cpp +++ b/llvm/tools/llvm-mca/View.cpp @@ -17,5 +17,4 @@ namespace mca { void View::anchor() {} - } // namespace mca diff --git a/llvm/tools/llvm-mca/View.h b/llvm/tools/llvm-mca/View.h index e5d22866..9ba94a5 100644 --- a/llvm/tools/llvm-mca/View.h +++ b/llvm/tools/llvm-mca/View.h @@ -27,7 +27,6 @@ public: virtual ~View() = default; void anchor() override; }; - -} +} // namespace mca #endif diff --git a/llvm/tools/llvm-mca/llvm-mca.cpp b/llvm/tools/llvm-mca/llvm-mca.cpp index 2ddba76..b397a4c 100644 --- a/llvm/tools/llvm-mca/llvm-mca.cpp +++ b/llvm/tools/llvm-mca/llvm-mca.cpp @@ -342,7 +342,8 @@ int main(int argc, char **argv) { Printer->addView(llvm::make_unique(*STI)); if (PrintResourcePressureView) - Printer->addView(llvm::make_unique(*STI, *IP, *S)); + Printer->addView( + llvm::make_unique(*STI, *IP, *S)); if (PrintTimelineView) { Printer->addView(llvm::make_unique( -- 2.7.4