Merge branch 'sycl' into llvmspirv_pulldown

Author: Chenyang-L

.github/CODEOWNERS

@@ -43,8 +43,9 @@ sycl/plugins/unified_runtime/ @intel/dpcpp-l0-pi-reviewers
 # ESIMD CPU emulator plug-in
 sycl/plugins/esimd_emulator/ @intel/dpcpp-esimd-reviewers
 
-# CUDA plugin
+# CUDA and HIP plugins
 sycl/plugins/**/cuda/ @intel/llvm-reviewers-cuda
+sycl/plugins/**/hip/ @intel/llvm-reviewers-cuda
 
 # XPTI instrumentation utilities
 xpti/ @intel/llvm-reviewers-runtime

.github/workflows/linux_matrix_e2e_on_nightly.yml

@@ -42,7 +42,7 @@ jobs:
             extra_cmake_args:
             target_devices: ext_intel_esimd_emulator:gpu
             reset_gpu: false
-    uses: ./.github/workflows/linux_single_e2e.yml
+    uses: ./.github/workflows/sycl_linux_run_tests.yml
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix. runner }}
@@ -66,7 +66,7 @@ jobs:
   linux_e2e_on_nightly_aws:
     name: '[AWS][CUDA] E2E on Nightly'
     needs: [aws_start]
-    uses: ./.github/workflows/linux_single_e2e.yml
+    uses: ./.github/workflows/sycl_linux_run_tests.yml
     with:
       name: CUDA
       runner: '["aws-cuda_${{ inputs.uniq }}"]'

.github/workflows/sycl_linux_build_and_test.yml

@@ -25,10 +25,6 @@ on:
         type: string
         required: false
         default: "default"
-      build_cache_size:
-        type: string
-        required: false
-        default: 8G
       build_configure_extra_args:
         type: string
         required: false
@@ -39,12 +35,6 @@ on:
       artifact_archive_name:
         type: string
         default: llvm_sycl.tar.zst
-      artifact_compress_command:
-        type: string
-        default: zstd -9
-      artifact_decompress_command:
-        type: string
-        default: zstd
       lts_matrix:
         type: string
         required: false
@@ -53,14 +43,6 @@ on:
         type: string
         required: false
         default: "[]"
-      lts_cmake_extra_args:
-        type: string
-        required: false
-        default: ""
-      lts_ref:
-        type: string
-        required: false
-        default: 'intel'
       cts_matrix:
         type: string
         required: false
@@ -69,10 +51,6 @@ on:
         type: string
         required: false
         default: ""
-      cts_ref:
-        type: string
-        required: false
-        default: 'SYCL-2020'
       changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
@@ -89,6 +67,50 @@ on:
         type: string
         default: 3
 
+  workflow_dispatch:
+    inputs:
+      changes:
+        description: 'Filter matches for the changed files in the PR'
+        type: choice
+        options:
+          - "[]"
+          - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
+      build_image:
+        type: choice
+        options:
+          - "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
+      cc:
+        type: choice
+        options:
+          - gcc
+      cxx:
+        type: choice
+        options:
+          - g++
+      build_configure_extra_args:
+        type: choice
+        options:
+          - "--hip --cuda --enable-esimd-emulator"
+      # Cache properties need to match CC/CXX/CMake opts. Any additional choices
+      # would need extra care.
+      build_cache_root:
+        type: choice
+        options:
+          - "/__w/"
+      build_cache_suffix:
+        type: choice
+        options:
+          - "default"
+
+      build_artifact_suffix:
+        type: choice
+        options:
+          - "default"
+      retention-days:
+        type: choice
+        options:
+          - 3
+
 jobs:
   build:
     name: Build + LIT
@@ -98,10 +120,31 @@ jobs:
       options: -u 1001:1001
     outputs:
       build_conclusion: ${{ steps.build.conclusion }}
+      artifact_archive_name: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
+      artifact_decompress_command: ${{ steps.artifact_info.outputs.DECOMPRESS }}
     env:
       CCACHE_DIR: ${{ inputs.build_cache_root }}/build_cache_${{ inputs.build_cache_suffix }}
-      CCACHE_MAXSIZE: ${{ inputs.build_cache_size }}
+      CCACHE_MAXSIZE: 8G
     steps:
+    - name: Deduce artifact archive params
+      # To reduce number of inputs parameters that is limited for manual triggers.
+      id: artifact_info
+      run: |
+        NAME="${{inputs.artifact_archive_name}}"
+        if [ -z "$NAME" ]; then
+          NAME=llvm_sycl.tar.zst
+        fi
+        echo ARCHIVE_NAME="$NAME" >> $GITHUB_OUTPUT
+        if [ "${NAME}" != "${NAME%.tar.gz}" ]; then
+          echo COMPRESS="gzip" >> $GITHUB_OUTPUT
+          echo DECOMPRESS="gunzip" >> $GITHUB_OUTPUT
+        elif [ "${NAME}" != "${NAME%.tar.zst}" ]; then
+          echo COMPRESS="zstd -9" >> $GITHUB_OUTPUT
+          echo DECOMPRESS="zstd" >> $GITHUB_OUTPUT
+        else
+          echo "Unsupported extension"
+          exit 1
+        fi
     - uses: actions/checkout@v3
       with:
         sparse-checkout: |
@@ -196,19 +239,19 @@ jobs:
 
     - name: Pack toolchain
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
-      run: tar -I '${{ inputs.artifact_compress_command }}' -cf ${{ inputs.artifact_archive_name }} -C $GITHUB_WORKSPACE/build/install .
+      run: tar -I '${{ steps.artifact_info.outputs.COMPRESS }}' -cf ${{ steps.artifact_info.outputs.ARCHIVE_NAME }} -C $GITHUB_WORKSPACE/build/install .
     - name: Upload toolchain
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
       uses: actions/upload-artifact@v3
       with:
         name: sycl_linux_${{ inputs.build_artifact_suffix }}
-        path: ${{ inputs.artifact_archive_name }}
+        path: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
         retention-days: ${{ inputs.retention-days }}
 
   aws-start:
     name: Start AWS
     needs: build
-    if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_aws_matrix != '[]' }}
+    if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_aws_matrix != '[]' && inputs.lts_aws_matrix != '' }}
     uses: ./.github/workflows/aws.yml
     secrets: inherit
     with:
@@ -219,32 +262,34 @@ jobs:
     needs: [build, aws-start]
     # 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.outputs.build_conclusion == 'success' && inputs.lts_matrix != '[]' }}
+    if: ${{ always() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_matrix != '[]' && inputs.lts_matrix != '' }}
     strategy:
       fail-fast: false
       matrix:
         include: ${{ fromJSON(inputs.lts_matrix) }}
-    uses: ./.github/workflows/linux_single_e2e.yml
+    uses: ./.github/workflows/sycl_linux_run_tests.yml
     with:
+      tests_selector: e2e
+
       name: ${{ matrix.name }}
       runner: ${{ toJSON(matrix.runs-on) }}
       image: ${{ matrix.image }}
       image_options: ${{ matrix.container_options }}
-      extra_cmake_args: '${{ matrix.cmake_args }} ${{ inputs.lts_cmake_extra_args }}'
+      extra_cmake_args: ${{ matrix.cmake_args }}
       target_devices: ${{ matrix.targets }}
       ref: ${{ inputs.build_ref || github.sha }}
       merge_ref: ${{ inputs.merge_ref }}
       reset_gpu: ${{ contains(matrix.runs-on, 'gen12') && contains(matrix.runs-on, 'Linux') }}
 
       sycl_toolchain_artifact: sycl_linux_${{ inputs.build_artifact_suffix }}
-      sycl_toolchain_archive: ${{ inputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ inputs.artifact_decompress_command }}
+      sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
+      sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
 
       env: ${{ toJSON(matrix.env) }}
 
   khronos_sycl_cts:
     needs: build
-    if: ${{ inputs.cts_matrix != '[]' && inputs.check_sycl == 'true' }}
+    if: ${{ inputs.cts_matrix != '[]' && inputs.cts_matrix != '' && inputs.check_sycl == 'true' }}
     strategy:
       fail-fast: false
       matrix:
@@ -285,10 +330,9 @@ jobs:
     - uses: ./llvm/devops/actions/khronos_cts_test
       name: Run Khronos SYCL CTS
       with:
-        test_ref: ${{ inputs.cts_ref }}
         sycl_artifact: sycl_linux_${{ inputs.build_artifact_suffix }}
-        sycl_archive: ${{ inputs.artifact_archive_name }}
-        decompress_command: ${{ inputs.artifact_decompress_command }}
+        sycl_archive: ${{ needs.build.outputs.artifact_archive_name }}
+        decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
         sycl_device_filter: ${{ matrix.sycl_device_filter }}
         cmake_args: '${{ matrix.cmake_args }} ${{ inputs.cts_cmake_extra_args }}'
 
@@ -297,7 +341,7 @@ jobs:
     needs: [ aws-start, e2e-tests ]
     # Always attempt to shutdown AWS instance, even if AWS start was not
     # successful.
-    if: ${{ always() && inputs.lts_aws_matrix != '[]' }}
+    if: ${{ always() && inputs.lts_aws_matrix != '[]' && inputs.lts_aws_matrix != '' }}
     uses: ./.github/workflows/aws.yml
     secrets: inherit
     with: