Merge pull request #140 from sx-aurora-dev/feature/merge-upstream-20220117

Feature/merge upstream 20220117

Author: kaz7

.github/workflows/issue-subscriber.yml

@@ -10,26 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'llvm/llvm-project'
     steps:
+    - name: Setup Automation Script
+      run:  |
+        curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/github-automation.py
+        chmod a+x github-automation.py
+        pip install PyGithub
+
     - name: Update watchers
-      uses: actions/github-script@v5
-      with:
-        github-token: ${{ secrets.ISSUE_MENTION_SECRET }}
-        script: |
-            const teamname = "issue-subscribers-" + context.payload.label.name.replace(/ /g, "-").replace(":","-").replace("/","-");
-            const comment = "@llvm/" + teamname;
-            try {
-              // This will throw an exception if the team does not exist and no
-              // comment will be created.
-              team = await github.rest.teams.getByName({
-                org: context.repo.owner,
-                team_slug: teamname
-              });
-              github.rest.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: comment
-              });
-            } catch (e){
-              console.log(e);
-            }
+      run: |
+        ./github-automation.py \
+          --token ${{ secrets.ISSUE_SUBSCRIBER_TOKEN }} \
+          issue-subscriber \
+          --issue-number ${{ github.event.issue.number }} \
+          --label-name ${{ github.event.label.name }}

bolt/CMakeLists.txt

@@ -9,18 +9,33 @@ if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64")
   set(BOLT_ENABLE_RUNTIME ON)
 endif()
 
+set(BOLT_CLANG_EXE "" CACHE FILEPATH "Path to clang executable for the target \
+architecture for use in BOLT tests")
+set(BOLT_LLD_EXE "" CACHE FILEPATH "Path to lld executable for the target \
+architecture for use in BOLT tests")
+
 set(BOLT_INCLUDE_TESTS OFF)
 if (LLVM_INCLUDE_TESTS)
-  string(FIND "${LLVM_ENABLE_PROJECTS}" "clang" POSITION)
-  if (NOT ${POSITION} EQUAL -1)
-    string(FIND "${LLVM_ENABLE_PROJECTS}" "lld" POSITION)
-    if (NOT ${POSITION} EQUAL -1)
+  if ("clang" IN_LIST LLVM_ENABLE_PROJECTS OR BOLT_CLANG_EXE)
+    if ("clang" IN_LIST LLVM_ENABLE_PROJECTS AND BOLT_CLANG_EXE)
+      message(WARNING "BOLT_CLANG_EXE is set and clang project is enabled. \
+            BOLT_CLANG_EXE will be used for BOLT tests.")
+    endif()
+    if ("lld" IN_LIST LLVM_ENABLE_PROJECTS OR BOLT_LLD_EXE)
+      if ("lld" IN_LIST LLVM_ENABLE_PROJECTS AND BOLT_LLD_EXE)
+        message(WARNING "BOLT_LLD_EXE is set and lld project is enabled. \
+              BOLT_LLD_EXE will be used for BOLT tests.")
+      endif()
       set(BOLT_INCLUDE_TESTS ON)
     else()
-      message(WARNING "Not including BOLT tests since lld is disabled")
+      message(WARNING "Not including BOLT tests since lld is disabled. \
+            Enable lld in LLVM_ENABLE_PROJECTS or provide a path to lld binary \
+            in BOLT_LLD_EXE.")
     endif()
   else()
-    message(WARNING "Not including BOLT tests since clang is disabled")
+    message(WARNING "Not including BOLT tests since clang is disabled. \
+          Enable clang in LLVM_ENABLE_PROJECTS or provide a path to clang \
+          binary in BOLT_CLANG_EXE.")
   endif()
 endif()
 

bolt/README.md

@@ -37,7 +37,7 @@ encounter any issues.
 
 ### Docker Image
 
-You can build and use the docker image containing BOLT using our [docker file](./bolt/utils/docker/Dockerfile).
+You can build and use the docker image containing BOLT using our [docker file](utils/docker/Dockerfile).
 Alternatively, you can build BOLT manually using the steps below.
 
 ### Manual Build
@@ -77,7 +77,7 @@ Or if you rather use tcmalloc:
 
 ## Usage
 
-For a complete practical guide of using BOLT see [Optimizing Clang with BOLT](./bolt/docs/OptimizingClang.md).
+For a complete practical guide of using BOLT see [Optimizing Clang with BOLT](docs/OptimizingClang.md).
 
 ### Step 0
 

bolt/include/bolt/Core/DebugData.h

@@ -498,8 +498,6 @@ class DebugInfoBinaryPatcher : public SimpleBinaryPatcher {
     Patch(uint32_t O, DebugPatchKind K) : Offset(O), Kind(K) {}
     DebugPatchKind getKind() const { return Kind; }
 
-    virtual ~Patch(){};
-
     static bool classof(const Patch *Writer) {
       return Writer->getKind() == DebugPatchKind::PatchBaseClass;
     }
@@ -656,9 +654,42 @@ class DebugInfoBinaryPatcher : public SimpleBinaryPatcher {
   std::unordered_map<uint32_t, uint32_t> computeNewOffsets();
 
 private:
+  struct PatchDeleter {
+    void operator()(Patch *P) const {
+      Patch *Pp = reinterpret_cast<Patch *>(P);
+      switch (Pp->Kind) {
+      default:
+        llvm_unreachable(
+            "Not all delete instances handled for Patch derived classes");
+      case DebugPatchKind::PatchValue32:
+        delete reinterpret_cast<DebugPatch32 *>(P);
+        break;
+      case DebugPatchKind::PatchValue64to32:
+        delete reinterpret_cast<DebugPatch64to32 *>(P);
+        break;
+      case DebugPatchKind::PatchValue64:
+        delete reinterpret_cast<DebugPatch64 *>(P);
+        break;
+      case DebugPatchKind::PatchValueVariable:
+        delete reinterpret_cast<DebugPatchVariableSize *>(P);
+        break;
+      case DebugPatchKind::ReferencePatchValue:
+        delete reinterpret_cast<DebugPatchReference *>(P);
+        break;
+      case DebugPatchKind::DWARFUnitOffsetBaseLabel:
+        delete reinterpret_cast<DWARFUnitOffsetBaseLabel *>(P);
+        break;
+      case DebugPatchKind::DestinationReferenceLabel:
+        delete reinterpret_cast<DestinationReferenceLabel *>(P);
+        break;
+      }
+    }
+  };
+  using UniquePatchPtrType = std::unique_ptr<Patch, PatchDeleter>;
+
   uint64_t DWPUnitOffset{0};
   uint32_t ChangeInSize{0};
-  std::vector<std::unique_ptr<Patch>> DebugPatches;
+  std::vector<UniquePatchPtrType> DebugPatches;
   /// Mutex used for parallel processing of debug info.
   std::mutex WriterMutex;
   /// Stores fully resolved addresses of DIEs that are being referenced.

bolt/include/bolt/Passes/ReorderUtils.h

@@ -142,7 +142,7 @@ class ClusterPairCacheThreadSafe {
 private:
   size_t Size;
   std::vector<ValueType> Cache;
-  std::vector<bool> Valid;
+  BitVector Valid;
 
   size_t index(const Cluster *First, const Cluster *Second) const {
     return (First->id() * Size) + Second->id();

bolt/include/bolt/Passes/ShrinkWrapping.h

@@ -295,7 +295,7 @@ class ShrinkWrapping {
   /// of moving this Callee-Saved Reg
   DenseMap<unsigned, std::vector<uint32_t>> DeletedPushCFIs;
   DenseMap<unsigned, std::vector<uint32_t>> DeletedPopCFIs;
-  std::vector<bool> HasDeletedOffsetCFIs;
+  BitVector HasDeletedOffsetCFIs;
   SmallPtrSet<const MCCFIInstruction *, 16> UpdatedCFIs;
   std::vector<BitVector> UsesByReg;
   std::vector<int64_t> PushOffsetByReg;

bolt/include/bolt/Rewrite/RewriteInstance.h

@@ -279,9 +279,8 @@ class RewriteInstance {
 
   /// Return a list of all sections to include in the output binary.
   /// Populate \p NewSectionIndex with a map of input to output indices.
-  template <typename ELFT,
-            typename ELFShdrTy = typename object::ELFObjectFile<ELFT>::Elf_Shdr>
-  std::vector<ELFShdrTy>
+  template <typename ELFT>
+  std::vector<typename object::ELFObjectFile<ELFT>::Elf_Shdr>
   getOutputSections(object::ELFObjectFile<ELFT> *File,
                     std::vector<uint32_t> &NewSectionIndex);
 
@@ -293,13 +292,12 @@ class RewriteInstance {
   /// based on the input file symbol table passed in \p SymTabSection.
   /// \p IsDynSym is set to true for dynamic symbol table since we
   /// are updating it in-place with minimal modifications.
-  template <typename ELFT,
-            typename ELFShdrTy = typename object::ELFObjectFile<ELFT>::Elf_Shdr,
-            typename WriteFuncTy, typename StrTabFuncTy>
-  void updateELFSymbolTable(object::ELFObjectFile<ELFT> *File, bool IsDynSym,
-                            const ELFShdrTy &SymTabSection,
-                            const std::vector<uint32_t> &NewSectionIndex,
-                            WriteFuncTy Write, StrTabFuncTy AddToStrTab);
+  template <typename ELFT, typename WriteFuncTy, typename StrTabFuncTy>
+  void updateELFSymbolTable(
+      object::ELFObjectFile<ELFT> *File, bool IsDynSym,
+      const typename object::ELFObjectFile<ELFT>::Elf_Shdr &SymTabSection,
+      const std::vector<uint32_t> &NewSectionIndex, WriteFuncTy Write,
+      StrTabFuncTy AddToStrTab);
 
   /// Add a notes section containing the BOLT revision and command line options.
   void addBoltInfoSection();

bolt/lib/Core/DebugData.cpp

@@ -367,7 +367,7 @@ DebugAddrWriter *DebugLoclistWriter::AddrWriter = nullptr;
 void DebugInfoBinaryPatcher::addUnitBaseOffsetLabel(uint64_t Offset) {
   Offset -= DWPUnitOffset;
   std::lock_guard<std::mutex> Lock(WriterMutex);
-  DebugPatches.emplace_back(std::make_unique<DWARFUnitOffsetBaseLabel>(Offset));
+  DebugPatches.emplace_back(new DWARFUnitOffsetBaseLabel(Offset));
 }
 
 void DebugInfoBinaryPatcher::addDestinationReferenceLabel(uint64_t Offset) {
@@ -377,8 +377,7 @@ void DebugInfoBinaryPatcher::addDestinationReferenceLabel(uint64_t Offset) {
   if (!RetVal.second)
     return;
 
-  DebugPatches.emplace_back(
-      std::make_unique<DestinationReferenceLabel>(Offset));
+  DebugPatches.emplace_back(new DestinationReferenceLabel(Offset));
 }
 
 void DebugInfoBinaryPatcher::addReferenceToPatch(uint64_t Offset,
@@ -388,33 +387,32 @@ void DebugInfoBinaryPatcher::addReferenceToPatch(uint64_t Offset,
   Offset -= DWPUnitOffset;
   DestinationOffset -= DWPUnitOffset;
   std::lock_guard<std::mutex> Lock(WriterMutex);
-  DebugPatches.emplace_back(std::make_unique<DebugPatchReference>(
-      Offset, OldValueSize, DestinationOffset, Form));
+  DebugPatches.emplace_back(
+      new DebugPatchReference(Offset, OldValueSize, DestinationOffset, Form));
 }
 
 void DebugInfoBinaryPatcher::addUDataPatch(uint64_t Offset, uint64_t NewValue,
                                            uint32_t OldValueSize) {
   Offset -= DWPUnitOffset;
   std::lock_guard<std::mutex> Lock(WriterMutex);
   DebugPatches.emplace_back(
-      std::make_unique<DebugPatchVariableSize>(Offset, OldValueSize, NewValue));
+      new DebugPatchVariableSize(Offset, OldValueSize, NewValue));
 }
 
 void DebugInfoBinaryPatcher::addLE64Patch(uint64_t Offset, uint64_t NewValue) {
   Offset -= DWPUnitOffset;
   std::lock_guard<std::mutex> Lock(WriterMutex);
-  DebugPatches.emplace_back(std::make_unique<DebugPatch64>(Offset, NewValue));
+  DebugPatches.emplace_back(new DebugPatch64(Offset, NewValue));
 }
 
 void DebugInfoBinaryPatcher::addLE32Patch(uint64_t Offset, uint32_t NewValue,
                                           uint32_t OldValueSize) {
   Offset -= DWPUnitOffset;
   std::lock_guard<std::mutex> Lock(WriterMutex);
   if (OldValueSize == 4)
-    DebugPatches.emplace_back(std::make_unique<DebugPatch32>(Offset, NewValue));
+    DebugPatches.emplace_back(new DebugPatch32(Offset, NewValue));
   else
-    DebugPatches.emplace_back(
-        std::make_unique<DebugPatch64to32>(Offset, NewValue));
+    DebugPatches.emplace_back(new DebugPatch64to32(Offset, NewValue));
 }
 
 void SimpleBinaryPatcher::addBinaryPatch(uint64_t Offset,
@@ -477,15 +475,14 @@ std::string SimpleBinaryPatcher::patchBinary(StringRef BinaryContents) {
 std::unordered_map<uint32_t, uint32_t>
 DebugInfoBinaryPatcher::computeNewOffsets() {
   std::unordered_map<uint32_t, uint32_t> CUMap;
-  std::sort(
-      DebugPatches.begin(), DebugPatches.end(),
-      [](const std::unique_ptr<Patch> &V1, const std::unique_ptr<Patch> &V2) {
-        return V1.get()->Offset < V2.get()->Offset;
-      });
+  std::sort(DebugPatches.begin(), DebugPatches.end(),
+            [](const UniquePatchPtrType &V1, const UniquePatchPtrType &V2) {
+              return V1.get()->Offset < V2.get()->Offset;
+            });
 
   // Calculating changes in .debug_info size from Patches to build a map of old
   // to updated reference destination offsets.
-  for (std::unique_ptr<Patch> &PatchBase : DebugPatches) {
+  for (UniquePatchPtrType &PatchBase : DebugPatches) {
     Patch *P = PatchBase.get();
     switch (P->Kind) {
     default:
@@ -546,7 +543,7 @@ std::string DebugInfoBinaryPatcher::patchBinary(StringRef BinaryContents) {
 
   // Applying all the patches replacing current entry.
   // This might change the size of .debug_info section.
-  for (const std::unique_ptr<Patch> &PatchBase : DebugPatches) {
+  for (const UniquePatchPtrType &PatchBase : DebugPatches) {
     Patch *P = PatchBase.get();
     switch (P->Kind) {
     default:

bolt/lib/Passes/ReorderAlgorithm.cpp

@@ -477,7 +477,7 @@ void TSPReorderAlgorithm::reorderBasicBlocks(const BinaryFunction &BF,
   // Define final function layout based on layout that maximizes weight
   uint64_t Last = BestLast;
   uint64_t Set = BestSet;
-  std::vector<bool> Visited;
+  BitVector Visited;
   Visited.resize(N);
   Visited[Last] = true;
   Order.push_back(IndexToBB[Last]);

bolt/lib/Passes/ShrinkWrapping.cpp

@@ -1951,7 +1951,7 @@ void ShrinkWrapping::rebuildCFI() {
 }
 
 bool ShrinkWrapping::perform() {
-  HasDeletedOffsetCFIs = std::vector<bool>(BC.MRI->getNumRegs(), false);
+  HasDeletedOffsetCFIs = BitVector(BC.MRI->getNumRegs(), false);
   PushOffsetByReg = std::vector<int64_t>(BC.MRI->getNumRegs(), 0LL);
   PopOffsetByReg = std::vector<int64_t>(BC.MRI->getNumRegs(), 0LL);
   DomOrder = std::vector<MCPhysReg>(BC.MRI->getNumRegs(), 0);