[Driver][SYCL][FPGA] Improve AOCX behaviors with -fsycl-link=image

.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

@@ -1,16 +1,14 @@
 name: SYCL E2E Matrix on Nightly build
 
 on:
-  workflow_call:
+  workflow_dispatch:
     inputs:
-      ref:
-        type: string
-        required: true
-      uniq:
-        description: Unique string to name dynamic runners in AWS
-        type: string
-        required: false
-        default: ${{ github.run_id }}-${{ github.run_attempt }}
+      env:
+        description: |
+          Suggested variables: for E2E tests - LIT_FILTER, LIT_FILTER_OUT.
+          LIT_OPTS won't work as we redefine it as part of this workflow.
+          Format: '{"VAR1":"VAL1","VAR2":"VAL2",...}'
+        default: '{"LIT_FILTER":""}'
 
 jobs:
   linux_e2e_on_nightly:
@@ -22,37 +20,50 @@ jobs:
           - name: AMD/HIP
             runner: '["Linux", "amdgpu"]'
             image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
-            extra_image_opts: --device=/dev/kfd
-            extra_cmake_args: -DHIP_PLATFORM="AMD" -DAMD_ARCH="gfx1031"
+            image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
             target_devices: ext_oneapi_hip:gpu
-            reset_gpu: false
 
-          - name: Intel
+          - name: Intel L0 GPU
             runner: '["Linux", "gen12"]'
             image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
-            extra_image_opts:
-            extra_cmake_args:
-            target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu
+            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+            target_devices: ext_oneapi_level_zero:gpu
             reset_gpu: true
 
+          - name: Intel OCL GPU
+            runner: '["Linux", "gen12"]'
+            image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
+            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+            target_devices: opencl:gpu
+            reset_gpu: true
+
+          - name: OCL CPU
+            runner: '["Linux", "x86-cpu"]'
+            image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
+            image_options: -u 1001
+            target_devices: opencl:cpu
+
           - name: ESIMD Emu
             runner: '["Linux", "x86-cpu"]'
             image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
-            extra_image_opts:
-            extra_cmake_args:
+            image_options: -u 1001
             target_devices: ext_intel_esimd_emulator:gpu
-            reset_gpu: false
-    uses: ./.github/workflows/linux_single_e2e.yml
+
+          - name: Self-hosted CUDA
+            runner: '["Linux", "cuda"]'
+            image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
+            image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
+            target_devices: ext_oneapi_cuda:gpu
+    uses: ./.github/workflows/sycl_linux_run_tests.yml
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix. runner }}
       image: ${{ matrix.image }}
-      image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN ${{ matrix.extra_image_opts }}
-      extra_cmake_args: ${{ matrix.extra_cmake_args }}
+      image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
-      ref: ${{ inputs.ref }}
       reset_gpu: ${{ matrix.reset_gpu }}
-      # TODO: should we do the merge?
+      env: ${{ inputs.env }}
+      ref: ${{ github.sha }}
       merge_ref: ''
 
   aws_start:
@@ -61,22 +72,20 @@ jobs:
     secrets: inherit
     with:
       mode: start
-      runs-on-list: '[{"runs-on":"aws-cuda_${{ inputs.uniq }}","aws-ami":"ami-01cb0573cb039ab24","aws-type":["g5.2xlarge","g5.4xlarge"],"aws-disk":"/dev/sda1:64","aws-spot":"false"}]'
+      runs-on-list: '[{"runs-on":"aws-cuda_${{ github.run_id }}-${{ github.run_attempt }}","aws-ami":"ami-01cb0573cb039ab24","aws-type":["g5.2xlarge","g5.4xlarge"],"aws-disk":"/dev/sda1:64","aws-spot":"false"}]'
 
   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 }}"]'
+      runner: '["aws-cuda_${{ github.run_id }}-${{ github.run_attempt }}"]'
       image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
-      image_options: --device=/dev/dri --privileged --cap-add SYS_ADMIN --gpus all
-      extra_cmake_args:
-      target_devices: all
-      ref: ${{ inputs.ref }}
-      reset_gpu: false
-      # TODO: should we do the merge?
+      image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
+      target_devices: ext_oneapi_cuda:gpu
+      env: ${{ inputs.env }}
+      ref: ${{ github.sha }}
       merge_ref: ''
 
   aws_stop:
@@ -87,4 +96,4 @@ jobs:
     secrets: inherit
     with:
       mode: stop
-      runs-on-list: '[{"runs-on":"aws-cuda_${{ inputs.uniq }}","aws-ami":"ami-01cb0573cb039ab24","aws-type":["g5.2xlarge","g5.4xlarge"],"aws-disk":"/dev/sda1:64","aws-spot":"false"}]'
+      runs-on-list: '[{"runs-on":"aws-cuda_${{ github.run_id }}-${{ github.run_attempt }}","aws-ami":"ami-01cb0573cb039ab24","aws-type":["g5.2xlarge","g5.4xlarge"],"aws-disk":"/dev/sda1:64","aws-spot":"false"}]'

.github/workflows/sycl_detect_changes.yml

@@ -49,16 +49,11 @@ jobs:
               - 'sycl/!(test-e2e|doc)/**'
             ci:
               - .github/workflows/**
-              - devops/*/**
               # devops/* contains config files, including drivers versions.
               # Allow them to be tested in pre-commit.
-            drivers_and_configs: &drivers_and_configs
-              - devops/*
-            test_build:
-              - *sycl
-              - *drivers_and_configs
-              # Temporary, until plugins are enabled in nightly image.
-              - sycl/**
+              - devops/*/**
+            drivers:
+              - devops/dependencies.json
 
       - name: Set output
         id: result
@@ -71,6 +66,6 @@ jobs:
               return '${{ steps.changes.outputs.changes }}';
             }
             // Treat everything as changed for huge PRs.
-            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci", "drivers_and_configs", "test_build"];
+            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci"];
 
       - run: echo '${{ steps.result.outputs.result }}'