Merge pull request #153 from sx-aurora-dev/feature/merge-upstream-20220207

Feature/merge upstream 20220207

Author: kaz7

.github/workflows/issue-release-workflow.yml

@@ -0,0 +1,84 @@
+# This contains the workflow definitions that allow users to test backports
+# to the release branch using comments on issues.
+#
+# /cherry-pick <commit> <...>
+#
+# This comment will attempt to cherry-pick the given commits to the latest
+# release branch (release/Y.x) and if successful push the result to a branch
+# on github.
+#
+# /branch <owner>/<repo>/<branch>
+#
+# This comment will create a pull request from <branch> to the latest release
+# branch.
+
+name: Issue Release Workflow
+
+on:
+  issue_comment:
+    types:
+      - created
+      - edited
+
+env:
+  COMMENT_BODY: ${{ github.event.comment.body }}
+
+jobs:
+  backport-commits:
+    name: Backport Commits
+    runs-on: ubuntu-20.04
+    if: >-
+        (github.repository == 'llvm/llvm-project') &&
+        !startswith(github.event.comment.body, '<!--IGNORE-->') &&
+        contains(github.event.comment.body, '/cherry-pick')
+    steps:
+      - name: Fetch LLVM sources
+        uses: actions/checkout@v2
+        with:
+          repository: llvm/llvm-project
+          # GitHub stores the token used for checkout and uses it for pushes
+          # too, but we want to use a different token for pushing, so we need
+          # to disable persist-credentials here.
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Setup Environment
+        run: |
+          pip install -r ./llvm/utils/git/requirements.txt
+          ./llvm/utils/git/github-automation.py --token ${{ github.token }} setup-llvmbot-git
+
+      - name: Backport Commits
+        run: |
+          printf "$COMMENT_BODY" |
+          ./llvm/utils/git/github-automation.py \
+          --repo $GITHUB_REPOSITORY \
+          --token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
+          release-workflow \
+          --issue-number ${{ github.event.issue.number }} \
+          auto
+
+  create-pull-request:
+    name: Create Pull Request
+    runs-on: ubuntu-20.04
+    if: >-
+        (github.repository == 'llvm/llvm-project') &&
+        !startswith(github.event.comment.body, '<!--IGNORE-->') &&
+        contains(github.event.comment.body, '/branch')
+
+    steps:
+      - name: Fetch LLVM sources
+        uses: actions/checkout@v2
+
+      - name: Setup Environment
+        run:  |
+          pip install -r ./llvm/utils/git/requirements.txt
+
+      - name: Create Pull Request
+        run: |
+          printf "$COMMENT_BODY" |
+          ./llvm/utils/git/github-automation.py \
+          --repo $GITHUB_REPOSITORY \
+          --token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
+          release-workflow \
+          --issue-number ${{ github.event.issue.number }} \
+          auto

.github/workflows/issue-subscriber.yml

@@ -13,8 +13,9 @@ jobs:
     - name: Setup Automation Script
       run:  |
         curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/github-automation.py
+        curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/requirements.txt
         chmod a+x github-automation.py
-        pip install PyGithub
+        pip install -r requirements.txt
 
     - name: Update watchers
       run: |

bolt/docs/Heatmaps.md

@@ -23,11 +23,10 @@ $ perf record -e cycles:u -j any,u [-p PID|-a] -- sleep <interval>
 Note that at the moment running with LBR (`-j any,u` or `-b`) is
 a requirement.
 
-Once the run is complete, and `perf.data` is generated, run BOLT in
-a heatmap mode:
+Once the run is complete, and `perf.data` is generated, run llvm-bolt-heatmap:
 
 ```bash
-$ llvm-bolt heatmap -p perf.data <executable>
+$ llvm-bolt-heatmap -p perf.data <executable>
 ```
 
 By default the heatmap will be dumped to *stdout*. You can change it

bolt/include/bolt/Utils/CommandLineOpts.h

@@ -27,8 +27,7 @@ extern llvm::cl::OptionCategory BoltRelocCategory;
 extern llvm::cl::OptionCategory BoltOutputCategory;
 extern llvm::cl::OptionCategory AggregatorCategory;
 extern llvm::cl::OptionCategory BoltInstrCategory;
-
-extern llvm::cl::SubCommand HeatmapCommand;
+extern llvm::cl::OptionCategory HeatmapCategory;
 
 extern llvm::cl::opt<unsigned> AlignText;
 extern llvm::cl::opt<bool> AggregateOnly;
@@ -38,7 +37,6 @@ extern llvm::cl::opt<bool> EnableBAT;
 extern llvm::cl::opt<bool> RemoveSymtab;
 extern llvm::cl::opt<unsigned> ExecutionCountThreshold;
 extern llvm::cl::opt<unsigned> HeatmapBlock;
-extern llvm::cl::opt<std::string> HeatmapFile;
 extern llvm::cl::opt<unsigned long long> HeatmapMaxAddress;
 extern llvm::cl::opt<unsigned long long> HeatmapMinAddress;
 extern llvm::cl::opt<bool> HotData;

bolt/lib/Passes/IndirectCallPromotion.cpp

@@ -962,7 +962,6 @@ size_t IndirectCallPromotion::canPromoteCallsite(
   }
 
   // Pick the top N targets.
-  uint64_t TotalCallsTopN = 0;
   uint64_t TotalMispredictsTopN = 0;
   size_t N = 0;
 
@@ -1015,7 +1014,6 @@ size_t IndirectCallPromotion::canPromoteCallsite(
       if (N + (Targets[I].JTIndices.empty() ? 1 : Targets[I].JTIndices.size()) >
           TrialN)
         break;
-      TotalCallsTopN += Targets[I].Branches;
       TotalMispredictsTopN += Targets[I].Mispreds;
       NumRemainingCalls -= Targets[I].Branches;
       N += Targets[I].JTIndices.empty() ? 1 : Targets[I].JTIndices.size();

bolt/lib/Passes/Inliner.cpp

@@ -526,10 +526,6 @@ void Inliner::runOnFunctions(BinaryContext &BC) {
   if (!opts::inliningEnabled())
     return;
 
-  uint64_t TotalSize = 0;
-  for (auto &BFI : BC.getBinaryFunctions())
-    TotalSize += BFI.second.getSize();
-
   bool InlinedOnce;
   unsigned NumIters = 0;
   do {

bolt/lib/Profile/DataAggregator.cpp

@@ -1348,11 +1348,11 @@ std::error_code DataAggregator::printLBRHeatMap() {
     exit(1);
   }
 
-  HM.print(opts::HeatmapFile);
-  if (opts::HeatmapFile == "-")
-    HM.printCDF(opts::HeatmapFile);
+  HM.print(opts::OutputFilename);
+  if (opts::OutputFilename == "-")
+    HM.printCDF(opts::OutputFilename);
   else
-    HM.printCDF(opts::HeatmapFile + ".csv");
+    HM.printCDF(opts::OutputFilename + ".csv");
 
   return std::error_code();
 }

bolt/lib/Rewrite/BinaryPassManager.cpp

@@ -408,7 +408,7 @@ void BinaryFunctionPassManager::runAllPasses(BinaryContext &BC) {
   Manager.registerPass(
       std::make_unique<DynoStatsPrintPass>(
           InitialDynoStats, "after all optimizations before SCTC and FOP"),
-      opts::PrintDynoStats | opts::DynoStatsAll);
+      opts::PrintDynoStats || opts::DynoStatsAll);
 
   // Add the StokeInfo pass, which extract functions for stoke optimization and
   // get the liveness information for them

bolt/lib/Target/X86/X86MCPlusBuilder.cpp

@@ -1873,13 +1873,9 @@ class X86MCPlusBuilder : public MCPlusBuilder {
       NewOpcode = Check.second;
       if (Check.first == NOCHECK)
         break;
-      if (Check.first == CHECK8 &&
-          ImmVal >= std::numeric_limits<int8_t>::min() &&
-          ImmVal <= std::numeric_limits<int8_t>::max())
+      if (Check.first == CHECK8 && isInt<8>(ImmVal))
         break;
-      if (Check.first == CHECK32 &&
-          ImmVal >= std::numeric_limits<int32_t>::min() &&
-          ImmVal <= std::numeric_limits<int32_t>::max())
+      if (Check.first == CHECK32 && isInt<32>(ImmVal))
         break;
     }
     if (NewOpcode == Inst.getOpcode())
@@ -3012,12 +3008,9 @@ class X86MCPlusBuilder : public MCPlusBuilder {
       NewOpcode = Check.second;
       if (Check.first == NOCHECK)
         break;
-      if (Check.first == CHECK8 && Imm >= std::numeric_limits<int8_t>::min() &&
-          Imm <= std::numeric_limits<int8_t>::max())
+      if (Check.first == CHECK8 && isInt<8>(Imm))
         break;
-      if (Check.first == CHECK32 &&
-          Imm >= std::numeric_limits<int32_t>::min() &&
-          Imm <= std::numeric_limits<int32_t>::max())
+      if (Check.first == CHECK32 && isInt<32>(Imm))
         break;
     }
     if (NewOpcode == Inst.getOpcode())

bolt/lib/Utils/CommandLineOpts.cpp

@@ -33,8 +33,7 @@ cl::OptionCategory BoltRelocCategory("BOLT options in relocation mode");
 cl::OptionCategory BoltOutputCategory("Output options");
 cl::OptionCategory AggregatorCategory("Data aggregation options");
 cl::OptionCategory BoltInstrCategory("BOLT instrumentation options");
-
-cl::SubCommand HeatmapCommand("heatmap", "generate heatmap");
+cl::OptionCategory HeatmapCategory("Heatmap options");
 
 cl::opt<unsigned>
 AlignText("align-text",
@@ -50,11 +49,9 @@ AggregateOnly("aggregate-only",
   cl::cat(AggregatorCategory));
 
 cl::opt<unsigned>
-BucketsPerLine("line-size",
-  cl::desc("number of entries per line (default 256)"),
-  cl::init(256),
-  cl::Optional,
-  cl::sub(HeatmapCommand));
+    BucketsPerLine("line-size",
+                   cl::desc("number of entries per line (default 256)"),
+                   cl::init(256), cl::Optional, cl::cat(HeatmapCategory));
 
 cl::opt<bool>
 DiffOnly("diff-only",
@@ -83,31 +80,19 @@ ExecutionCountThreshold("execution-count-threshold",
   cl::cat(BoltOptCategory));
 
 cl::opt<unsigned>
-HeatmapBlock("block-size",
-  cl::desc("size of a heat map block in bytes (default 64)"),
-  cl::init(64),
-  cl::sub(HeatmapCommand));
-
-cl::opt<std::string>
-HeatmapFile("o",
-  cl::init("-"),
-  cl::desc("heatmap output file (default stdout)"),
-  cl::Optional,
-  cl::sub(HeatmapCommand));
-
-cl::opt<unsigned long long>
-HeatmapMaxAddress("max-address",
-  cl::init(0xffffffff),
-  cl::desc("maximum address considered valid for heatmap (default 4GB)"),
-  cl::Optional,
-  cl::sub(HeatmapCommand));
-
-cl::opt<unsigned long long>
-HeatmapMinAddress("min-address",
-  cl::init(0x0),
-  cl::desc("minimum address considered valid for heatmap (default 0)"),
-  cl::Optional,
-  cl::sub(HeatmapCommand));
+    HeatmapBlock("block-size",
+                 cl::desc("size of a heat map block in bytes (default 64)"),
+                 cl::init(64), cl::cat(HeatmapCategory));
+
+cl::opt<unsigned long long> HeatmapMaxAddress(
+    "max-address", cl::init(0xffffffff),
+    cl::desc("maximum address considered valid for heatmap (default 4GB)"),
+    cl::Optional, cl::cat(HeatmapCategory));
+
+cl::opt<unsigned long long> HeatmapMinAddress(
+    "min-address", cl::init(0x0),
+    cl::desc("minimum address considered valid for heatmap (default 0)"),
+    cl::Optional, cl::cat(HeatmapCategory));
 
 cl::opt<bool>
 HotData("hot-data",