LLVM and SPIRV-LLVM-Translator pulldown (WW24)

bolt/README.md

@@ -180,7 +180,7 @@ Once you have `perf.fdata` ready, you can use it for optimizations with
 BOLT. Assuming your environment is setup to include the right path, execute
 `llvm-bolt`:
 ```
-$ llvm-bolt <executable> -o <executable>.bolt -data=perf.fdata -reorder-blocks=cache+ -reorder-functions=hfsort -split-functions=2 -split-all-cold -split-eh -dyno-stats
+$ llvm-bolt <executable> -o <executable>.bolt -data=perf.fdata -reorder-blocks=ext-tsp -reorder-functions=hfsort -split-functions=2 -split-all-cold -split-eh -dyno-stats
 ```
 
 If you do need an updated debug info, then add `-update-debug-sections` option

bolt/docs/OptimizingClang.md

@@ -64,7 +64,7 @@ Notice that we are passing `clang-7` to `perf2bolt` which is the real binary tha
 the generated profile:
 ```bash
 $ llvm-bolt $CPATH/clang-7 -o $CPATH/clang-7.bolt -b clang-7.yaml \
-    -reorder-blocks=cache+ -reorder-functions=hfsort+ -split-functions=3 \
+    -reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions=3 \
     -split-all-cold -dyno-stats -icf=1 -use-gnu-stack
 ```
 The output will look similar to the one below:

bolt/docs/doxygen.cfg.in

@@ -38,7 +38,7 @@ PROJECT_NAME           = "BOLT"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         =
+PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

bolt/include/bolt/Core/BinaryContext.h

@@ -82,6 +82,13 @@ inline raw_ostream &operator<<(raw_ostream &OS, const SegmentInfo &SegInfo) {
   return OS;
 }
 
+// AArch64-specific symbol markers used to delimit code/data in .text.
+enum class MarkerSymType : char {
+  NONE = 0,
+  CODE,
+  DATA,
+};
+
 enum class MemoryContentsType : char {
   UNKNOWN = 0,             /// Unknown contents.
   POSSIBLE_JUMP_TABLE,     /// Possibly a non-PIC jump table.
@@ -549,6 +556,9 @@ class BinaryContext {
 
   std::unique_ptr<MCDisassembler> DisAsm;
 
+  /// Symbolic disassembler.
+  std::unique_ptr<MCDisassembler> SymbolicDisAsm;
+
   std::unique_ptr<MCAsmBackend> MAB;
 
   /// Indicates if relocations are available for usage.
@@ -662,6 +672,11 @@ class BinaryContext {
            TheTriple->getArch() == llvm::Triple::x86_64;
   }
 
+  // AArch64-specific functions to check if symbol is used to delimit
+  // code/data in .text. Code is marked by $x, data by $d.
+  MarkerSymType getMarkerType(const SymbolRef &Symbol) const;
+  bool isMarker(const SymbolRef &Symbol) const;
+
   /// Iterate over all BinaryData.
   iterator_range<binary_data_const_iterator> getBinaryData() const {
     return make_range(BinaryDataMap.begin(), BinaryDataMap.end());
@@ -1187,18 +1202,20 @@ class BinaryContext {
                         uint64_t Offset = 0,
                         const BinaryFunction *Function = nullptr,
                         bool PrintMCInst = false, bool PrintMemData = false,
-                        bool PrintRelocations = false) const;
+                        bool PrintRelocations = false,
+                        StringRef Endl = "\n") const;
 
   /// Print a range of instructions.
   template <typename Itr>
   uint64_t
   printInstructions(raw_ostream &OS, Itr Begin, Itr End, uint64_t Offset = 0,
                     const BinaryFunction *Function = nullptr,
                     bool PrintMCInst = false, bool PrintMemData = false,
-                    bool PrintRelocations = false) const {
+                    bool PrintRelocations = false,
+                    StringRef Endl = "\n") const {
     while (Begin != End) {
       printInstruction(OS, *Begin, Offset, Function, PrintMCInst, PrintMemData,
-                       PrintRelocations);
+                       PrintRelocations, Endl);
       Offset += computeCodeSize(Begin, Begin + 1);
       ++Begin;
     }

bolt/include/bolt/Core/BinaryDomTree.h

@@ -0,0 +1,57 @@
+//==- bolt/Core/BinaryDomTree.h - Dominator Tree at low-level IR -*- C++ -*-==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the BinaryDomTree class, which represents a dominator tree
+// in the CFG of a binary function.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef BOLT_CORE_BINARY_DOMTREE_H
+#define BOLT_CORE_BINARY_DOMTREE_H
+
+#include "llvm/Support/GenericDomTreeConstruction.h"
+
+namespace llvm {
+namespace bolt {
+
+class BinaryBasicBlock;
+using BinaryDomTreeNode = DomTreeNodeBase<BinaryBasicBlock>;
+using BinaryDominatorTree = DomTreeBase<BinaryBasicBlock>;
+
+} // namespace bolt
+
+// BinaryDominatorTree GraphTraits specializations.
+template <>
+struct GraphTraits<bolt::BinaryDomTreeNode *>
+    : public DomTreeGraphTraitsBase<bolt::BinaryDomTreeNode,
+                                    bolt::BinaryDomTreeNode::iterator> {};
+
+template <>
+struct GraphTraits<const bolt::BinaryDomTreeNode *>
+    : public DomTreeGraphTraitsBase<const bolt::BinaryDomTreeNode,
+                                    bolt::BinaryDomTreeNode::const_iterator> {};
+
+template <>
+struct GraphTraits<bolt::BinaryDominatorTree *>
+    : public GraphTraits<bolt::BinaryDomTreeNode *> {
+  static NodeRef getEntryNode(bolt::BinaryDominatorTree *DT) {
+    return DT->getRootNode();
+  }
+
+  static nodes_iterator nodes_begin(bolt::BinaryDominatorTree *N) {
+    return df_begin(getEntryNode(N));
+  }
+
+  static nodes_iterator nodes_end(bolt::BinaryDominatorTree *N) {
+    return df_end(getEntryNode(N));
+  }
+};
+
+} // namespace llvm
+
+#endif

bolt/include/bolt/Core/BinaryFunction.h

@@ -667,9 +667,6 @@ class BinaryFunction {
                                            uint64_t Offset,
                                            uint64_t &TargetAddress);
 
-  DenseMap<const MCInst *, SmallVector<MCInst *, 4>>
-  computeLocalUDChain(const MCInst *CurInstr);
-
   BinaryFunction &operator=(const BinaryFunction &) = delete;
   BinaryFunction(const BinaryFunction &) = delete;
 
@@ -836,6 +833,15 @@ class BinaryFunction {
     return make_range(JumpTables.begin(), JumpTables.end());
   }
 
+  /// Return relocation associated with a given \p Offset in the function,
+  /// or nullptr if no such relocation exists.
+  const Relocation *getRelocationAt(uint64_t Offset) const {
+    assert(CurrentState == State::Empty &&
+           "Relocations unavailable in the current function state.");
+    auto RI = Relocations.find(Offset);
+    return (RI == Relocations.end()) ? nullptr : &RI->second;
+  }
+
   /// Returns the raw binary encoding of this function.
   ErrorOr<ArrayRef<uint8_t>> getData() const;
 
@@ -1951,11 +1957,6 @@ class BinaryFunction {
     return ColdLSDASymbol;
   }
 
-  /// True if the symbol is a mapping symbol used in AArch64 to delimit
-  /// data inside code section.
-  bool isDataMarker(const SymbolRef &Symbol, uint64_t SymbolSize) const;
-  bool isCodeMarker(const SymbolRef &Symbol, uint64_t SymbolSize) const;
-
   void setOutputDataAddress(uint64_t Address) { OutputDataOffset = Address; }
 
   uint64_t getOutputDataAddress() const { return OutputDataOffset; }

bolt/include/bolt/Core/BinaryLoop.h

@@ -15,18 +15,13 @@
 #ifndef BOLT_CORE_BINARY_LOOP_H
 #define BOLT_CORE_BINARY_LOOP_H
 
-#include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/Analysis/LoopInfoImpl.h"
-#include "llvm/Support/GenericDomTreeConstruction.h"
 
 namespace llvm {
 namespace bolt {
 
 class BinaryBasicBlock;
 
-using BinaryDomTreeNode = DomTreeNodeBase<BinaryBasicBlock>;
-using BinaryDominatorTree = DomTreeBase<BinaryBasicBlock>;
-
 class BinaryLoop : public LoopBase<BinaryBasicBlock, BinaryLoop> {
 public:
   BinaryLoop() : LoopBase<BinaryBasicBlock, BinaryLoop>() {}
@@ -62,35 +57,4 @@ class BinaryLoopInfo : public LoopInfoBase<BinaryBasicBlock, BinaryLoop> {
 } // namespace bolt
 } // namespace llvm
 
-namespace llvm {
-
-// BinaryDominatorTree GraphTraits specializations.
-template <>
-struct GraphTraits<bolt::BinaryDomTreeNode *>
-    : public DomTreeGraphTraitsBase<bolt::BinaryDomTreeNode,
-                                    bolt::BinaryDomTreeNode::iterator> {};
-
-template <>
-struct GraphTraits<const bolt::BinaryDomTreeNode *>
-    : public DomTreeGraphTraitsBase<const bolt::BinaryDomTreeNode,
-                                    bolt::BinaryDomTreeNode::const_iterator> {};
-
-template <>
-struct GraphTraits<bolt::BinaryDominatorTree *>
-    : public GraphTraits<bolt::BinaryDomTreeNode *> {
-  static NodeRef getEntryNode(bolt::BinaryDominatorTree *DT) {
-    return DT->getRootNode();
-  }
-
-  static nodes_iterator nodes_begin(bolt::BinaryDominatorTree *N) {
-    return df_begin(getEntryNode(N));
-  }
-
-  static nodes_iterator nodes_end(bolt::BinaryDominatorTree *N) {
-    return df_end(getEntryNode(N));
-  }
-};
-
-} // namespace llvm
-
 #endif