clang-format.

Author: rlavaee

llvm/include/llvm/CodeGen/InsertCodePrefetch.h

@@ -11,12 +11,14 @@
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/Support/UniqueBBID.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/UniqueBBID.h"
 
 namespace llvm {
 
-SmallString<128> getPrefetchTargetSymbolName(StringRef FunctionName, const UniqueBBID &BBID, unsigned SubblockIndex);
+SmallString<128> getPrefetchTargetSymbolName(StringRef FunctionName,
+                                             const UniqueBBID &BBID,
+                                             unsigned SubblockIndex);
 
 } // end namespace llvm
 

llvm/include/llvm/CodeGen/TargetInstrInfo.h

@@ -2389,7 +2389,6 @@ class LLVM_ABI TargetInstrInfo : public MCInstrInfo {
     return false;
   }
 
-
 private:
   mutable std::unique_ptr<MIRFormatter> Formatter;
   unsigned CallFrameSetupOpcode, CallFrameDestroyOpcode;

llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -39,6 +39,7 @@
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/CodeGen/GCMetadata.h"
 #include "llvm/CodeGen/GCMetadataPrinter.h"
+#include "llvm/CodeGen/InsertCodePrefetch.h"
 #include "llvm/CodeGen/LazyMachineBlockFrequencyInfo.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/CodeGen/MachineBlockHashInfo.h"
@@ -82,7 +83,6 @@
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/LLVMRemarkStreamer.h"
-#include "llvm/CodeGen/InsertCodePrefetch.h"
 #include "llvm/IR/Mangler.h"
 #include "llvm/IR/Metadata.h"
 #include "llvm/IR/Module.h"

llvm/lib/CodeGen/BasicBlockSectionsProfileReader.cpp

@@ -380,10 +380,10 @@ Error BasicBlockSectionsProfileReader::ReadV1Profile() {
       if (getAsUnsignedInteger(PrefetchTargetStr[2], 10, TargetSubblockIndex))
         return createProfileParseError(Twine("unsigned integer expected: '") +
                                        PrefetchTargetStr[2]);
-      FI->second.PrefetchHints.push_back(
-          PrefetchHint{SubblockID{*SiteBBID, static_cast<unsigned>(SiteSubblockIndex)},
-                       PrefetchTargetStr[0],
-                       SubblockID{*TargetBBID, static_cast<unsigned>(TargetSubblockIndex)}});
+      FI->second.PrefetchHints.push_back(PrefetchHint{
+          SubblockID{*SiteBBID, static_cast<unsigned>(SiteSubblockIndex)},
+          PrefetchTargetStr[0],
+          SubblockID{*TargetBBID, static_cast<unsigned>(TargetSubblockIndex)}});
       continue;
     }
     case 't': { // Prefetch target specifier.

llvm/lib/CodeGen/InsertCodePrefetch.cpp

@@ -35,14 +35,16 @@ using namespace llvm;
 #define DEBUG_TYPE "insert-code-prefetch"
 
 namespace llvm {
-SmallString<128> getPrefetchTargetSymbolName(StringRef FunctionName, const UniqueBBID &BBID, unsigned SubblockIndex) {
-          SmallString<128> R("__llvm_prefetch_target_");
-          R += FunctionName;
-          R += "_";
-          R += utostr(BBID.BaseID);
-          R += "_";
-          R += utostr(SubblockIndex);
-          return R;
+SmallString<128> getPrefetchTargetSymbolName(StringRef FunctionName,
+                                             const UniqueBBID &BBID,
+                                             unsigned SubblockIndex) {
+  SmallString<128> R("__llvm_prefetch_target_");
+  R += FunctionName;
+  R += "_";
+  R += utostr(BBID.BaseID);
+  R += "_";
+  R += utostr(SubblockIndex);
+  return R;
 }
 } // namespace llvm
 
@@ -105,16 +107,16 @@ bool InsertCodePrefetch::runOnMachineFunction(MachineFunction &MF) {
   SmallVector<PrefetchHint> PrefetchHints =
       getAnalysis<BasicBlockSectionsProfileReaderWrapperPass>()
           .getPrefetchHintsForFunction(MF.getName());
-  DenseMap<UniqueBBID, SmallVector<PrefetchHint>>
-      PrefetchHintsBySiteBBID;
+  DenseMap<UniqueBBID, SmallVector<PrefetchHint>> PrefetchHintsBySiteBBID;
   for (const auto &H : PrefetchHints)
     PrefetchHintsBySiteBBID[H.SiteID.BBID].push_back(H);
-  for (auto &[SiteBBID, H]: PrefetchHintsBySiteBBID) {
+  for (auto &[SiteBBID, H] : PrefetchHintsBySiteBBID) {
     llvm::sort(H, [](const PrefetchHint &H1, const PrefetchHint &H2) {
       return H1.SiteID.SubblockIndex < H2.SiteID.SubblockIndex;
     });
   }
-  auto PtrTy = PointerType::getUnqual(MF.getFunction().getParent()->getContext());
+  auto PtrTy =
+      PointerType::getUnqual(MF.getFunction().getParent()->getContext());
   const TargetInstrInfo *TII = MF.getSubtarget().getInstrInfo();
   for (auto &BB : MF) {
     auto It = PrefetchHintsBySiteBBID.find(*BB.getBBID());
@@ -123,15 +125,21 @@ bool InsertCodePrefetch::runOnMachineFunction(MachineFunction &MF) {
     const auto &PrefetchHints = It->second;
     unsigned NumCallsInBB = 0;
     auto InstrIt = BB.begin();
-    for(auto HintIt = PrefetchHints.begin() ; HintIt != PrefetchHints.end();) {
+    for (auto HintIt = PrefetchHints.begin(); HintIt != PrefetchHints.end();) {
       auto NextInstrIt = InstrIt == BB.end() ? BB.end() : std::next(InstrIt);
       while (NumCallsInBB >= HintIt->SiteID.SubblockIndex) {
-        auto *GV = MF.getFunction().getParent()->getOrInsertGlobal(getPrefetchTargetSymbolName(HintIt->TargetFunction, HintIt->TargetID.BBID, HintIt->TargetID.SubblockIndex), PtrTy);
+        auto *GV = MF.getFunction().getParent()->getOrInsertGlobal(
+            getPrefetchTargetSymbolName(HintIt->TargetFunction,
+                                        HintIt->TargetID.BBID,
+                                        HintIt->TargetID.SubblockIndex),
+            PtrTy);
         TII->insertCodePrefetchInstr(BB, NextInstrIt, GV);
         ++HintIt;
       }
-      if (InstrIt == BB.end()) break;
-      if (InstrIt->isCall()) ++NumCallsInBB;
+      if (InstrIt == BB.end())
+        break;
+      if (InstrIt->isCall())
+        ++NumCallsInBB;
       InstrIt = NextInstrIt;
     }
   }

llvm/lib/Target/X86/X86InstrInfo.cpp

@@ -10978,24 +10978,25 @@ void X86InstrInfo::getFrameIndexOperands(SmallVectorImpl<MachineOperand> &Ops,
   M.getFullAddress(Ops);
 }
 
-bool X86InstrInfo::insertCodePrefetchInstr(MachineBasicBlock &MBB,
-                                      MachineBasicBlock::iterator InsertBefore,
-                                      const GlobalValue *GV) const {
+bool X86InstrInfo::insertCodePrefetchInstr(
+    MachineBasicBlock &MBB, MachineBasicBlock::iterator InsertBefore,
+    const GlobalValue *GV) const {
   MachineFunction &MF = *MBB.getParent();
-  MachineInstr *PrefetchInstr = MF.CreateMachineInstr(get(X86::PREFETCHIT1),
-              InsertBefore == MBB.instr_end() ? MBB.findPrevDebugLoc(InsertBefore) : InsertBefore->getDebugLoc(),
-              true);
-          MachineInstrBuilder MIB(MF, PrefetchInstr);
-            MIB.addMemOperand(MF.getMachineMemOperand(
-                MachinePointerInfo(GV), MachineMemOperand::MOLoad, /*s=*/8,
-                /*base_alignment=*/llvm::Align(1)));
-          MIB.addReg(X86::RIP).addImm(1).addReg(X86::NoRegister);
-          MIB.addGlobalAddress(GV);
-          MIB.addReg(X86::NoRegister);
-          MBB.insert(InsertBefore, PrefetchInstr);
-          return true;
+  MachineInstr *PrefetchInstr = MF.CreateMachineInstr(
+      get(X86::PREFETCHIT1),
+      InsertBefore == MBB.instr_end() ? MBB.findPrevDebugLoc(InsertBefore)
+                                      : InsertBefore->getDebugLoc(),
+      true);
+  MachineInstrBuilder MIB(MF, PrefetchInstr);
+  MIB.addMemOperand(MF.getMachineMemOperand(MachinePointerInfo(GV),
+                                            MachineMemOperand::MOLoad, /*s=*/8,
+                                            /*base_alignment=*/llvm::Align(1)));
+  MIB.addReg(X86::RIP).addImm(1).addReg(X86::NoRegister);
+  MIB.addGlobalAddress(GV);
+  MIB.addReg(X86::NoRegister);
+  MBB.insert(InsertBefore, PrefetchInstr);
+  return true;
 }
 
-
 #define GET_INSTRINFO_HELPERS
 #include "X86GenInstrInfo.inc"

llvm/lib/Target/X86/X86InstrInfo.h

@@ -768,10 +768,9 @@ class X86InstrInfo final : public X86GenInstrInfo {
   /// fails to commute the operands, it will return \p Idx1.
   unsigned commuteOperandsForFold(MachineInstr &MI, unsigned Idx1) const;
 
-
   bool insertCodePrefetchInstr(MachineBasicBlock &MBB,
-                                      MachineBasicBlock::iterator InsertBefore,
-                                      const GlobalValue *GV) const override;
+                               MachineBasicBlock::iterator InsertBefore,
+                               const GlobalValue *GV) const override;
 };
 } // namespace llvm