diff --git a/tools/llvm-mca/Dispatch.cpp b/tools/llvm-mca/Dispatch.cpp
index 7a4a9d443e5..47f8dca2179 100644
--- a/tools/llvm-mca/Dispatch.cpp
+++ b/tools/llvm-mca/Dispatch.cpp
@@ -67,7 +67,8 @@ void RegisterFile::addRegisterFile(ArrayRef<MCRegisterCostEntry> Entries,
   // An empty set of register classes means: this register file contains all
   // the physical registers specified by the target.
   if (Entries.empty()) {
-    for (std::pair<WriteState *, IndexPlusCostPairTy> &Mapping : RegisterMappings)
+    for (std::pair<WriteState *, IndexPlusCostPairTy> &Mapping :
+         RegisterMappings)
       Mapping.second = std::make_pair(RegisterFileIndex, 1U);
     return;
   }
diff --git a/tools/llvm-mca/DispatchStatistics.h b/tools/llvm-mca/DispatchStatistics.h
index 941dcb255e0..3b735a16266 100644
--- a/tools/llvm-mca/DispatchStatistics.h
+++ b/tools/llvm-mca/DispatchStatistics.h
@@ -62,7 +62,8 @@ class DispatchStatistics : public View {
   void printDispatchStalls(llvm::raw_ostream &OS) const;
 
 public:
-  DispatchStatistics() : NumDispatched(0), NumCycles(0),
+  DispatchStatistics()
+      : NumDispatched(0), NumCycles(0),
         HWStalls(HWStallEvent::LastGenericEvent) {}
 
   void onInstructionEvent(const HWInstructionEvent &Event) override;
diff --git a/tools/llvm-mca/Scheduler.h b/tools/llvm-mca/Scheduler.h
index e05ae85b834..52957d9d0ef 100644
--- a/tools/llvm-mca/Scheduler.h
+++ b/tools/llvm-mca/Scheduler.h
@@ -466,7 +466,6 @@ public:
   bool canBeDispatched(unsigned Idx, const InstrDesc &Desc) const;
   void scheduleInstruction(unsigned Idx, Instruction &MCIS);
 
-
   /// Issue an instruction.
   void issueInstruction(unsigned Index, Instruction &IS);
 
diff --git a/tools/llvm-mca/llvm-mca.cpp b/tools/llvm-mca/llvm-mca.cpp
index 0e1d18ee09e..d0f942a6dde 100644
--- a/tools/llvm-mca/llvm-mca.cpp
+++ b/tools/llvm-mca/llvm-mca.cpp
@@ -38,10 +38,10 @@
 #include "llvm/MC/MCParser/MCTargetAsmParser.h"
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCStreamer.h"
-#include "llvm/Support/Host.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/FileSystem.h"
+#include "llvm/Support/Host.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/SourceMgr.h"
@@ -97,20 +97,18 @@ static cl::opt<bool>
                            cl::desc("Print register file statistics"),
                            cl::init(false));
 
-static cl::opt<bool>
-    PrintDispatchStats("dispatch-stats",
-                       cl::desc("Print dispatch statistics"),
-                       cl::init(false));
+static cl::opt<bool> PrintDispatchStats("dispatch-stats",
+                                        cl::desc("Print dispatch statistics"),
+                                        cl::init(false));
 
-static cl::opt<bool>
-    PrintSchedulerStats("scheduler-stats",
-                         cl::desc("Print scheduler statistics"),
-                         cl::init(false));
+static cl::opt<bool> PrintSchedulerStats("scheduler-stats",
+                                         cl::desc("Print scheduler statistics"),
+                                         cl::init(false));
 
 static cl::opt<bool>
     PrintRetireStats("retire-stats",
-                      cl::desc("Print retire control unit statistics"),
-                      cl::init(false));
+                     cl::desc("Print retire control unit statistics"),
+                     cl::init(false));
 
 static cl::opt<bool>
     PrintResourcePressureView("resource-pressure",