Merge remote-tracking branch 'intel/sycl' into cpu-range-reduction-performance

Author: steffenlarsen

.git-blame-ignore-revs

@@ -43,3 +43,6 @@ d8f0e6caa91e230a486c948ab643174e40bdf215
 
 # Use C++11 default member initializers in LLDB. NFC.
 9494c510af56d9c8593ab69017dcaa232210b235
+
+# [libc++][NFC] clang-format <__config>
+ac251726f84d5b7e6533a2e3712920184435b61b

.github/workflows/closed-issues.yml

@@ -10,4 +10,4 @@ jobs:
     steps:
       - uses: andymckay/labeler@1.0.4
         with:
-          remove-labels: "awaiting-review"
+          remove-labels: 'awaiting-review'

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

@@ -4,7 +4,7 @@
 # /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
+# release branch (release/Y.x) and if successful, push the result to a branch
 # on github.
 #
 # /branch <owner>/<repo>/<branch>
@@ -31,9 +31,9 @@ jobs:
     name: Backport Commits
     runs-on: ubuntu-20.04
     if: >-
-        (github.repository == 'llvm/llvm-project') &&
-        !startswith(github.event.comment.body, '<!--IGNORE-->') &&
-        contains(github.event.action == 'opened' && github.event.issue.body || github.event.comment.body, '/cherry-pick')
+      (github.repository == 'llvm/llvm-project') &&
+      !startswith(github.event.comment.body, '<!--IGNORE-->') &&
+      contains(github.event.action == 'opened' && github.event.issue.body || github.event.comment.body, '/cherry-pick')
     steps:
       - name: Fetch LLVM sources
         uses: actions/checkout@v2
@@ -64,16 +64,16 @@ jobs:
     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')
+      (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:  |
+        run: |
           pip install -r ./llvm/utils/git/requirements.txt
 
       - name: Create Pull Request

.github/workflows/issue-subscriber.yml

@@ -10,20 +10,20 @@ 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
-        curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/requirements.txt
-        chmod a+x github-automation.py
-        pip install -r requirements.txt
+      - 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 -r requirements.txt
 
-    - name: Update watchers
-      # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
-      env:
-        LABEL_NAME: ${{ github.event.label.name }}
-      run: |
-        ./github-automation.py \
-          --token '${{ secrets.ISSUE_SUBSCRIBER_TOKEN }}' \
-          issue-subscriber \
-          --issue-number '${{ github.event.issue.number }}' \
-          --label-name "$LABEL_NAME"
+      - name: Update watchers
+        # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
+        env:
+          LABEL_NAME: ${{ github.event.label.name }}
+        run: |
+          ./github-automation.py \
+            --token '${{ secrets.ISSUE_SUBSCRIBER_TOKEN }}' \
+            issue-subscriber \
+            --issue-number '${{ github.event.issue.number }}' \
+            --label-name "$LABEL_NAME"

.github/workflows/llvm-bugs.yml

@@ -19,39 +19,39 @@ jobs:
           MAILGUN_API_KEY: ${{ secrets.LLVM_BUGS_KEY }}
         with:
           script: |
-            const Mailgun = require("mailgun.js");
+            const Mailgun = require('mailgun.js');
             const formData = require('form-data');
-            const mailgun = new Mailgun(formData);
 
-            const DOMAIN = "email.llvm.org";
+            const mailgun = new Mailgun(formData);
+            const DOMAIN = 'email.llvm.org';
 
-            const mg = mailgun.client({username: 'api', key: process.env.MAILGUN_API_KEY});
+            const mg = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY });
 
             github.rest.issues.get({
               issue_number: context.issue.number,
               owner: context.repo.owner,
-              repo: context.repo.repo,
+              repo: context.repo.repo
             })
-            .then(function(issue) {
+            .then((issue) => {
               const payload = {
                 author : issue.data.user.login,
                 issue  : issue.data.number,
                 title  : issue.data.title,
                 url    : issue.data.html_url,
-                labels : issue.data.labels.map(label => { return label.name }),
-                assignee : issue.data.assignees.map(assignee => { return assignee.login }),
+                labels : issue.data.labels.map((label) => label.name),
+                assignee : issue.data.assignees.map((assignee) => assignee.login),
                 body   : issue.data.body
               };
-            
+
               const data = {
-                from: "LLVM Bugs <llvm-bugs@email.llvm.org>",
-                to: "llvm-bugs@lists.llvm.org",
+                from: 'LLVM Bugs <llvm-bugs@email.llvm.org>',
+                to: 'llvm-bugs@lists.llvm.org',
                 subject: `[Bug ${issue.data.number}] ${issue.data.title}`,
-                template: "new-github-issue",
+                template: 'new-github-issue',
                 'o:tracking-clicks': 'no',
                 'h:X-Mailgun-Variables': JSON.stringify(payload)
               };
 
-              return mg.messages.create(DOMAIN, data)
+              return mg.messages.create(DOMAIN, data);
             })
-            .then(msg => console.log(msg));
+            .then((msg) => console.log(msg));

.github/workflows/new-issues.yml

@@ -10,5 +10,5 @@ jobs:
     steps:
       - uses: andymckay/labeler@1.0.4
         with:
-          add-labels: "new issue"
+          add-labels: 'new issue'
           ignore-if-labeled: true

.github/workflows/sycl_cleanup.yml

@@ -21,7 +21,7 @@ jobs:
             run_id: context.payload.workflow_run.id,
           });
           let matchArtifacts = allArtifacts.data.artifacts.filter((artifact) => {
-            return artifact.name.startsWith("sycl_linux_");
+            return artifact.name.match(/^sycl_(linux|windows)_/);
           });
           matchArtifacts.forEach(async (artifact) => {
             await github.rest.actions.deleteArtifact({

.github/workflows/sycl_linux_build_and_test.yml

@@ -151,8 +151,6 @@ jobs:
         cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
         cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
         cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
-        # TODO this should be resolved in CMakeLists.txt
-        cmake --build $GITHUB_WORKSPACE/build --target install-lld || echo "skipped"
 
     - name: Pack toolchain
       run: tar -cJf llvm_sycl.tar.xz -C $GITHUB_WORKSPACE/build/install .

bolt/include/bolt/Core/BinaryBasicBlock.h

@@ -150,11 +150,9 @@ class BinaryBasicBlock {
   BinaryBasicBlock &operator=(const BinaryBasicBlock &) = delete;
   BinaryBasicBlock &operator=(const BinaryBasicBlock &&) = delete;
 
-  explicit BinaryBasicBlock(BinaryFunction *Function, MCSymbol *Label,
-                            uint32_t Offset = INVALID_OFFSET)
+  explicit BinaryBasicBlock(BinaryFunction *Function, MCSymbol *Label)
       : Function(Function), Label(Label) {
     assert(Function && "Function must be non-null");
-    InputRange.first = Offset;
   }
 
   // Exclusively managed by BinaryFunction.
@@ -561,6 +559,12 @@ class BinaryBasicBlock {
   /// Set minimum alignment for the basic block.
   void setAlignment(uint32_t Align) { Alignment = Align; }
 
+  /// Set alignment of the block based on the alignment of its offset.
+  void setDerivedAlignment() {
+    const uint64_t DerivedAlignment = getOffset() & (1 + ~getOffset());
+    Alignment = std::min(DerivedAlignment, uint64_t(32));
+  }
+
   /// Return required alignment for the block.
   uint32_t getAlignment() const { return Alignment; }
 
@@ -787,6 +791,9 @@ class BinaryBasicBlock {
   /// at the split point.
   BinaryBasicBlock *splitAt(iterator II);
 
+  /// Set start offset of this basic block in the input binary.
+  void setOffset(uint32_t Offset) { InputRange.first = Offset; };
+
   /// Sets address of the basic block in the output.
   void setOutputStartAddress(uint64_t Address) {
     OutputAddressRange.first = Address;

bolt/include/bolt/Core/BinaryContext.h

@@ -239,7 +239,7 @@ class BinaryContext {
   Optional<DWARFUnit *> getDWOCU(uint64_t DWOId);
 
   /// Returns DWOContext if it exists.
-  DWARFContext *getDWOContext();
+  DWARFContext *getDWOContext() const;
 
   /// Get Number of DWOCUs in a map.
   uint32_t getNumDWOCUs() { return DWOCUs.size(); }
@@ -498,6 +498,14 @@ class BinaryContext {
   /// to function \p BF.
   std::string generateJumpTableName(const BinaryFunction &BF, uint64_t Address);
 
+  /// Free memory used by jump table offsets
+  void clearJumpTableOffsets() {
+    for (auto &JTI : JumpTables) {
+      JumpTable &JT = *JTI.second;
+      JumpTable::OffsetsType Temp;
+      Temp.swap(JT.OffsetEntries);
+    }
+  }
   /// Return true if the array of bytes represents a valid code padding.
   bool hasValidCodePadding(const BinaryFunction &BF);