Fix merge conficts

Signed-off-by: Arvind Sudarsanam <[email protected]>

Author: asudarsa

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @pvchupin
+* @bader
 
 # Front-end compiler
 clang/ @intel/dpcpp-cfe-reviewers
@@ -70,3 +70,6 @@ llvm/include/llvm/SYCLLowerIR/LowerInvokeSimd.h @kbobrovs @v-klochkov @rolandsch
 .github/workflows/ @intel/dpcpp-devops-reviewers
 buildbot/ @intel/dpcpp-devops-reviewers
 devops/ @intel/dpcpp-devops-reviewers
+
+# Kernel fusion JIT compiler
+sycl-fusion/ @victor-eds @Naghasan @sommerlukas

.github/workflows/gh_pages.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get install -y doxygen graphviz ssh ninja-build
-        sudo pip3 install 'sphinx==4.1.2' 'myst-parser==0.15.1' 'recommonmark==0.7.1'
+        sudo pip3 install 'sphinx==4.2.0' 'myst-parser==0.15.1' 'recommonmark==0.7.1'
     - name: Build Docs
       run: |
         mkdir -p $GITHUB_WORKSPACE/build

.github/workflows/sycl_containers.yaml

@@ -94,6 +94,8 @@ jobs:
           build-args: |
             compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
             igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
+            cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
+            level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
             tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
             fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
             cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
@@ -128,10 +130,115 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }}
             ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
-          build-args: |
-            compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.compute_runtime.github_tag}}
-            igc_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.igc.github_tag}}
-            tbb_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.tbb.github_tag}}
-            fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.fpgaemu.github_tag}}
-            cpu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.oclcpu.github_tag}}
+          # build-args:empty , so we automatically take the "latest" tags as
+          # unstable
 
+  base_image_ubuntu2204:
+    if: github.repository == 'intel/llvm'
+    name: Base Ubuntu 22.04 Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ubuntu2204_base
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/ubuntu2204_base:${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2204_base:latest
+  build_image_ubuntu2204:
+    if: github.repository == 'intel/llvm'
+    name: Build Ubuntu Docker image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ubuntu2204_build
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/ubuntu2204_build:${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2204_build:latest
+
+  # This job produces a Docker container with the latest versions of Intel
+  # drivers, that can be found on GitHub.
+  drivers_image_ubuntu2204:
+    if: github.repository == 'intel/llvm'
+    name: Intel Drivers Ubuntu 22.04 Docker image
+    runs-on: ubuntu-latest
+    needs: base_image_ubuntu2204
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Get dependencies configuration
+        id: deps
+        run: |
+          DEPS=`cat devops/dependencies.json`
+          DEPS="${DEPS//$'\r'/''}"
+          DEPS="${DEPS//$'\n'/' '}"
+          echo $DEPS
+          echo "deps=$DEPS" >>$GITHUB_OUTPUT
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ubuntu2204_intel_drivers
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:latest-${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:latest
+          build-args: |
+            compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
+            igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
+            cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
+            level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
+            tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
+            fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
+            cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
+  # This job produces a Docker container with the latest versions of Intel
+  # drivers, that can be found on GitHub.
+  drivers_image_ubuntu2204_unstable:
+    if: github.repository == 'intel/llvm'
+    name: Intel Drivers (unstable) Ubuntu 22.04 Docker image
+    runs-on: ubuntu-latest
+    needs: base_image_ubuntu2204
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Get dependencies configuration
+        id: deps
+        run: |
+          DEPS=`cat devops/dependencies.json`
+          DEPS="${DEPS//$'\r'/''}"
+          DEPS="${DEPS//$'\n'/' '}"
+          echo $DEPS
+          echo "deps=$DEPS" >>$GITHUB_OUTPUT
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ubuntu2204_intel_drivers
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable-${{ github.sha }}
+            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable
+          # build-args:empty, so we automatically take the "latest" tags as
+          # unstable

.github/workflows/sycl_linux_build_and_test.yml

@@ -195,7 +195,9 @@ jobs:
 
   llvm_test_suite:
     needs: [build, aws-start]
-    if: ${{ !failure() && inputs.lts_matrix != '[]' }}
+    # Continue if build was successful. If aws-start is not successful all
+    # AWS tasks will fail, but all non-AWS tasks should continue.
+    if: ${{ always() && needs.build.result == 'success' && inputs.lts_matrix != '[]' }}
     strategy:
       fail-fast: false
       max-parallel: ${{ inputs.max_parallel }}
@@ -242,7 +244,7 @@ jobs:
         check_sycl_all: ${{ matrix.check_sycl_all }}
         results_name_suffix: ${{ matrix.config }}_${{ inputs.build_artifact_suffix }}
         cmake_args: '${{ matrix.cmake_args }} ${{ inputs.lts_cmake_extra_args }}'
-  
+
   khronos_sycl_cts:
     needs: build
     if: ${{ inputs.cts_matrix != '' }}
@@ -293,6 +295,8 @@ jobs:
   aws-stop:
     name: Stop AWS
     needs: [ aws-start, llvm_test_suite ]
+    # Always attempt to shutdown AWS instance, even if AWS start was not
+    # successful.
     if: ${{ always() && inputs.lts_aws_matrix != '[]' }}
     runs-on: ubuntu-latest
     environment: aws

.github/workflows/sycl_nightly.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
       - 'devops/containers/ubuntu2004_preinstalled.Dockerfile'
+      - 'devops/containers/ubuntu2204_preinstalled.Dockerfile'
       - '.github/workflows/sycl_nightly.yml'
 
 jobs:
@@ -26,6 +27,17 @@ jobs:
       build_artifact_suffix: default
       build_configure_extra_args: ''
 
+  ubuntu2204_build_test:
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl_linux_build_and_test.yml
+    needs: test_matrix
+    secrets: inherit
+    with:
+      build_cache_root: "/__w/"
+      build_artifact_suffix: default
+      build_configure_extra_args: ''
+      build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
+
   ubuntu2004_opaque_pointers_build_test:
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
@@ -37,6 +49,18 @@ jobs:
       build_artifact_suffix: opaque_pointers
       build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE"
 
+  ubuntu2204_opaque_pointers_build_test:
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl_linux_build_and_test.yml
+    needs: test_matrix
+    secrets: inherit
+    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"
+      build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
+
   windows_default:
     name: Windows
     if: github.repository == 'intel/llvm'
@@ -78,3 +102,40 @@ jobs:
         tags: |
           ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
           ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
+
+  ubuntu2204_docker_build_push:
+    if: github.repository == 'intel/llvm'
+    runs-on: ubuntu-latest
+    needs: ubuntu2204_build_test
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+      with:
+        name: sycl_linux_default
+        path: devops/
+    - name: Build and Push Container (with drivers)
+      uses: ./devops/actions/build_container
+      with:
+        push: ${{ github.event_name != 'pull_request' }}
+        file: ubuntu2204_preinstalled
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        build-args: |
+          base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
+          base_tag=latest
+        tags: |
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:${{ github.sha }}
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:latest
+    - name: Build and Push Container (no drivers)
+      uses: ./devops/actions/build_container
+      with:
+        push: ${{ github.event_name != 'pull_request' }}
+        file: ubuntu2204_preinstalled
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        build-args: |
+          base_image=ghcr.io/intel/llvm/ubuntu2204_base
+          base_tag=latest
+        tags: |
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers-${{ github.sha }}
+          ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers

.github/workflows/sycl_post_commit.yml

@@ -65,11 +65,11 @@ jobs:
     - name: Configure
       run: |
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository "deb http://apt.llvm.org/focal/   llvm-toolchain-focal-13 main"
+        sudo add-apt-repository "deb http://apt.llvm.org/focal/   llvm-toolchain-focal-15 main"
         sudo apt-get update
-        sudo apt-get install -y clang-13
-        export CC="clang-13"
-        export CXX="clang++-13"
+        sudo apt-get install -y clang-15
+        export CC="clang-15"
+        export CXX="clang++-15"
         mkdir -p $GITHUB_WORKSPACE/build
         cd $GITHUB_WORKSPACE/build
         python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \

.github/workflows/sycl_precommit.yml

@@ -9,6 +9,9 @@ on:
     - '.github/ISSUE_TEMPLATE/**'
     - '.github/CODEOWNERS'
     - '.github/workflows/sycl_update_gpu_driver.yml'
+    - '.github/workflows/sycl_containers.yaml'
+    - '.github/workflows/sycl_nightly.yml'
+    - '.github/workflows/sycl_post_commit.yml'
     - '.github/workflows/sycl_windows_build_and_test.yml'
     - '.github/workflows/sycl_macos_build_and_test.yml'
     - 'devops/containers/**'
@@ -45,7 +48,7 @@ jobs:
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       ref: ${{ github.event.pull_request.head.sha }}
-      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda"
+      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda;cuda_aws"
 
   linux_default:
     name: Linux

.github/workflows/sycl_windows_build_and_test.yml

@@ -7,6 +7,9 @@ on:
         type: string
         required: false
         default: "default"
+      build_ref:
+        type: string
+        required: false
 
 jobs:
   build:
@@ -26,6 +29,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         path: src
+        ref: ${{ inputs.build_ref || github.ref }}
         fetch-depth: 1
     - name: Register cleanup after job is finished
       uses: ./src/devops/actions/cleanup