Merge pull request #198 from triSYCL/sycl/unified/next

Update stable version from next branch

Author: keryell

.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/CODEOWNERS

@@ -18,6 +18,9 @@ opencl/ @intel/llvm-reviewers-runtime
 # OpenCL "offline" compiler
 opencl/opencl-aot/ @intel/dpcpp-tools-reviewers
 
+# libclc library
+libclc/ @intel/llvm-reviewers-cuda
+
 # Device library
 libdevice/ @intel/llvm-reviewers-runtime
 

.github/workflows/closed-issues.yml

@@ -10,4 +10,4 @@ jobs:
     steps:
       - uses: andymckay/[email protected]
         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 <[email protected]>",
-                to: "[email protected]",
+                from: 'LLVM Bugs <[email protected]>',
+                to: '[email protected]',
                 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/[email protected]
         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

@@ -52,6 +52,10 @@ on:
         type: string
         required: false
         default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
+      cuda_image:
+        type: string
+        required: false
+        default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
       lts_ref:
         type: string
         required: false
@@ -147,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 .

.github/workflows/sycl_nightly.yml

@@ -19,6 +19,16 @@ jobs:
       build_configure_extra_args: ''
       lts_config: "ocl_gen9;ocl_x64"
 
+  ubuntu2004_opaque_pointers_build_test:
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl_linux_build_and_test.yml
+    with:
+      build_cache_root: "/__w/"
+      build_cache_suffix: opaque_pointers
+      build_artifact_suffix: opaque_pointers
+      build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE"
+      lts_config: "ocl_gen9;ocl_x64"
+
   windows_default:
     name: Windows
     if: github.repository == 'intel/llvm'
@@ -60,13 +70,3 @@ jobs:
         tags: |
           ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
           ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
-  ubuntu2004_build_test_new_pm:
-    # Default Linux building and LIT testing using new Pass Manager by default
-    if: github.repository == 'intel/llvm'
-    uses: ./.github/workflows/sycl_linux_build_and_test.yml
-    with:
-      build_cache_root: "/__w/"
-      build_cache_suffix: new_pm
-      build_artifact_suffix: new_pm
-      build_configure_extra_args: '--hip --cuda --cmake-opt=-DLLVM_ENABLE_NEW_PASS_MANAGER=ON'
-      lts_config: "hip_amdgpu;ocl_x64"

.github/workflows/sycl_precommit.yml

@@ -41,4 +41,4 @@ jobs:
       build_cache_size: "8G"
       build_artifact_suffix: "default"
       build_cache_suffix: "default"
-      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu"
+      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda"

.github/workflows/sycl_update_gpu_driver.yml

@@ -0,0 +1,58 @@
+name: Update GPU driver
+
+on:
+  schedule:
+    - cron:  '0 3 * * 2'
+  workflow_dispatch:
+
+jobs:
+  update_driver_linux:
+    runs-on: ubuntu-latest
+    if: github.repository == 'intel/llvm'
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update dependencies file
+      run: |
+        version="$(python3 devops/scripts/update_drivers.py linux)"
+        echo 'NEW_DRIVER_VERSION='$version >> $GITHUB_ENV
+    - name: Create Pull Request
+      env:
+        BRANCH: ci/update_gpu_driver-linux-${{ env.NEW_DRIVER_VERSION }}
+        LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cd $GITHUB_WORKSPACE
+        # Set fake identity to fulfil git requirements
+        git config --global user.name "GitHub Actions"
+        git config --global user.email "[email protected]"
+        git checkout -B $BRANCH
+        git add -u
+        git commit -m "[GHA] Uplift GPU RT version for Linux CI" || exit 0   # exit if commit is empty
+        git push https://[email protected]/${{ github.repository }} ${BRANCH}
+        gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Linux CI" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION"
+
+  update_driver_linux_staging:
+    runs-on: ubuntu-latest
+    if: github.repository == 'intel/llvm'
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update dependencies file
+      run: |
+        version="$(python3 devops/scripts/update_drivers.py linux_staging)"
+        echo 'NEW_DRIVER_VERSION='$version >> $GITHUB_ENV
+    - name: Update sycl Branch
+      env:
+        BRANCH: ci/update_gpu_driver-linux_staging-${{ env.NEW_DRIVER_VERSION }}
+        LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cd $GITHUB_WORKSPACE
+        # Set fake identity to fulfil git requirements
+        git config --global user.name "GitHub Actions"
+        git config --global user.email "[email protected]"
+        git checkout -B $BRANCH
+        git add -u
+        git commit -m "[GHA] Uplift GPU RT version for Nightly Builds" || exit 0   # exit if commit is empty
+        git push https://[email protected]/${{ github.repository }} ${BRANCH}
+        gh pr create --head $BRANCH --title "[GHA] Uplift GPU RT version for Nightly Builds" --body "Uplift GPU RT version for Linux to $NEW_DRIVER_VERSION"
+

.github/workflows/sycl_windows_build_and_test.yml

@@ -38,7 +38,7 @@ jobs:
         IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
         IF NOT EXIST D:\github\_work\cache\sycl_${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
         python.exe src/buildbot/configure.py -o build ^
-          --ci-default ^
+          --ci-defaults ^
           --cmake-opt="-DCMAKE_C_COMPILER=cl" ^
           --cmake-opt="-DCMAKE_CXX_COMPILER=cl" ^
           --cmake-opt="-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^

README.md

@@ -1,4 +1,4 @@
-# SYCL for Vitis 2021.2: experimental melting pot with Intel oneAPI DPC++ SYCL and triSYCL for AMD/Xilinx FPGA
+# SYCL for Vitis 2022.1: experimental melting pot with Intel oneAPI DPC++ SYCL and triSYCL for AMD/Xilinx FPGA
 
 This project is about assessing the viability of unifying 2 of the
 current open-source implementations of the SYCL standard

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 -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 \
     -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/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; }
 
@@ -630,14 +634,12 @@ class BinaryBasicBlock {
 
   /// Test if BB is a predecessor of this block.
   bool isPredecessor(const BinaryBasicBlock *BB) const {
-    auto Itr = std::find(Predecessors.begin(), Predecessors.end(), BB);
-    return Itr != Predecessors.end();
+    return llvm::is_contained(Predecessors, BB);
   }
 
   /// Test if BB is a successor of this block.
   bool isSuccessor(const BinaryBasicBlock *BB) const {
-    auto Itr = std::find(Successors.begin(), Successors.end(), BB);
-    return Itr != Successors.end();
+    return llvm::is_contained(Successors, BB);
   }
 
   /// Test if this BB has a valid execution count.
@@ -787,6 +789,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;