Merge remote-tracking branch 'origin/sycl' into addc

Author: fineg74

.github/CODEOWNERS

@@ -34,25 +34,18 @@ sycl/doc/design/ @intel/llvm-reviewers-runtime
 sycl/doc/design/spirv-extensions/ @intel/dpcpp-spirv-doc-reviewers
 sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
 
-# Unified Runtime 
-sycl/plugins @intel/unified-runtime-reviewers
+# Unified Runtime
+sycl/cmake/modules/FetchUnifiedRuntime.cmake @intel/unified-runtime-reviewers
+sycl/include/sycl/detail/ur.hpp @intel/unified-runtime-reviewers
+sycl/source/detail/posix_ur.cpp @intel/unified-runtime-reviewers
+sycl/source/detail/ur.cpp @intel/unified-runtime-reviewers
+sycl/source/detail/windows_ur.cpp @intel/unified-runtime-reviewers
 sycl/test-e2e/Plugin/ @intel/unified-runtime-reviewers
 
 # Win Proxy Loader
 sycl/pi_win_proxy_loader @intel/llvm-reviewers-runtime
-sycl/plugins/common_win_pi_trace @intel/llvm-reviewers-runtime
 sycl/test-e2e/Plugin/dll-detach-order.cpp @intel/llvm-reviewers-runtime
 
-# CUDA and HIP plugins
-sycl/plugins/**/cuda/ @intel/llvm-reviewers-cuda
-sycl/plugins/**/hip/ @intel/llvm-reviewers-cuda
-
-# Transform Dialect in MLIR.
-/mlir/include/mlir/Dialect/Transform/* @ftynse @nicolasvasilache
-/mlir/lib/Dialect/Transform/* @ftynse @nicolasvasilache
-/mlir/**/*TransformOps* @ftynse @nicolasvasilache
-
-
 # CUDA specific runtime implementations
 sycl/include/sycl/ext/oneapi/experimental/cuda/ @intel/llvm-reviewers-cuda
 
@@ -155,7 +148,6 @@ sycl/include/syclcompat.hpp @intel/syclcompat-lib-reviewers
 sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc @intel/bindless-images-reviewers
 sycl/include/sycl/ext/oneapi/bindless* @intel/bindless-images-reviewers
 sycl/source/detail/bindless* @intel/bindless-images-reviewers
-sycl/plugins/unified_runtime/ur/adapters/**/image.* @intel/bindless-images-reviewers
 sycl/test/check_device_code/extensions/bindless_images.cpp @intel/bindless-images-reviewers
 sycl/test-e2e/bindless_images/ @intel/bindless-images-reviewers
 
@@ -166,6 +158,7 @@ sycl/test-e2e/DeviceCodeSplit/ @intel/dpcpp-tools-reviewers
 sycl/test-e2e/SeparateCompile/ @intel/dpcpp-tools-reviewers
 sycl/test-e2e/Printf/ @intel/dpcpp-tools-reviewers @intel/llvm-reviewers-runtime
 sycl/test-e2e/SpecConstants/ @intel/dpcpp-tools-reviewers
+sycl/test-e2e/NewOffloadDriver/ @intel/dpcpp-tools-reviewers
 
 # Sanitizer
 clang/lib/Driver/SanitizerArgs.cpp @intel/dpcpp-sanitizers-review

.github/workflows/docs.yml

@@ -111,7 +111,7 @@ jobs:
         run: |
           sudo apt-get update
           # swig and graphviz are lldb specific dependencies
-          sudo apt-get install -y cmake ninja-build swig graphviz
+          sudo apt-get install -y cmake ninja-build swig graphviz libhwloc-dev
       - name: Build LLVM docs
         if: steps.docs-changed-subprojects.outputs.llvm_any_changed == 'true'
         run: |

.github/workflows/release-documentation.yml

@@ -49,7 +49,8 @@ jobs:
               graphviz \
               python3-github \
               ninja-build \
-              texlive-font-utils
+              texlive-font-utils \
+              libhwloc-dev
           pip3 install --user -r ./llvm/docs/requirements.txt
 
       - name: Build Documentation

.github/workflows/release-doxygen.yml

@@ -52,7 +52,8 @@ jobs:
               graphviz \
               python3-github \
               ninja-build \
-              texlive-font-utils
+              texlive-font-utils \
+              libhwloc-dev
           pip3 install --user -r ./llvm/docs/requirements.txt
 
       - name: Build Doxygen

.github/workflows/sycl-docs.yml

@@ -25,7 +25,7 @@ jobs:
         path: repo
     - name: Install deps
       run: |
-        sudo apt-get install -y doxygen graphviz ssh ninja-build
+        sudo apt-get install -y doxygen graphviz ssh ninja-build libhwloc-dev
         sudo pip3 install -r repo/llvm/docs/requirements.txt
     - name: Build Docs
       run: |

.github/workflows/sycl-linux-matrix-e2e-on-nightly.yml

@@ -29,7 +29,7 @@ jobs:
             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: ext_oneapi_level_zero:gpu
+            target_devices: level_zero:gpu
             reset_gpu: true
 
           - name: Intel OCL GPU

.github/workflows/sycl-linux-precommit.yml

@@ -76,6 +76,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: NVIDIA/CUDA
+            runner: '["Linux", "cuda"]'
+            image: ghcr.io/intel/llvm/ubuntu2204_build:latest
+            image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
+            target_devices: ext_oneapi_cuda:gpu
           - name: AMD/HIP
             runner: '["Linux", "amdgpu"]'
             image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
@@ -85,15 +90,15 @@ jobs:
             runner: '["Linux", "gen12"]'
             image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
             image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu
+            target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
             reset_gpu: true
             install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
             extra_lit_opts: --param gpu-intel-gen12=True
           - name: E2E tests on Intel Arc A-Series Graphics
             runner: '["Linux", "arc"]'
             image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
             image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
+            target_devices: level_zero:gpu;opencl:gpu
             reset_gpu: true
             install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
             extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
@@ -102,7 +107,7 @@ jobs:
             runner: '["Linux", "arc"]'
             image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'latest' || 'devigc' }}
             image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: ext_oneapi_level_zero:gpu;opencl:gpu
+            target_devices: level_zero:gpu;opencl:gpu
             reset_gpu: true
             install_drivers: >-
               ${{ contains(needs.detect_changes.outputs.filters, 'drivers') ||

.github/workflows/sycl-linux-run-tests.yml

@@ -105,7 +105,7 @@ on:
           - 'opencl:cpu'
           - 'opencl:gpu'
           - 'opencl:fpga'
-          - 'ext_oneapi_level_zero:gpu'
+          - 'level_zero:gpu'
           - 'ext_oneapi_hip:gpu'
       tests_selector:
         type: choice
@@ -261,7 +261,7 @@ jobs:
         echo LD_LIBRARY_PATH=$PWD/toolchain/lib/:$LD_LIBRARY_PATH >> $GITHUB_ENV
     - run: which clang++ sycl-ls
     - run: sycl-ls --verbose
-    - run: SYCL_PI_TRACE=-1 sycl-ls
+    - run: SYCL_UR_TRACE=1 sycl-ls
     - run: |
           if [ -f /usr/local/lib/igc/IGCTAG.txt ]; then
             cat /usr/local/lib/igc/IGCTAG.txt
@@ -303,22 +303,34 @@ jobs:
     - name: List excluded SYCL CTS categories
       if: inputs.tests_selector == 'cts' && env.CTS_TESTS_TO_BUILD == ''
       run: |
-        cat $PWD/devops/cts_exclude_filter
+        if [ "${{ contains(inputs.target_devices, 'opencl:cpu')  }}" = "true" ]; then
+          cat $PWD/devops/cts_exclude_filter_OCL_CPU
+        fi
+        if [ "${{ contains(inputs.target_devices, 'level_zero:gpu')  }}" = "true" ]; then
+          cat $PWD/devops/cts_exclude_filter_L0_GPU
+        fi
     - name: Build SYCL CTS tests
       if: inputs.tests_selector == 'cts'
       env:
         CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }}
       run: |
         # Do not exclude any category if passing the CTS_TESTS_TO_BUILD variable.
-        cts_exclude_filter=$([ -n "$CTS_TESTS_TO_BUILD" ] && echo "" || echo "$PWD/devops/cts_exclude_filter")
+        cts_exclude_filter=""
+        if [ -z "$CTS_TESTS_TO_BUILD" ]; then
+          if [ "${{ contains(inputs.target_devices, 'opencl:cpu')  }}" = "true" ]; then
+            cts_exclude_filter=$PWD/devops/cts_exclude_filter_OCL_CPU
+          fi
+          if [ "${{ contains(inputs.target_devices, 'level_zero:gpu')  }}" = "true" ]; then
+            cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU
+          fi
+        fi
 
         cmake -GNinja -B./build-cts -S./khronos_sycl_cts -DCMAKE_CXX_COMPILER=$(which clang++) \
         -DSYCL_IMPLEMENTATION=DPCPP \
         -DSYCL_CTS_EXCLUDE_TEST_CATEGORIES="$cts_exclude_filter" \
         -DSYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS=OFF \
         -DSYCL_CTS_MEASURE_BUILD_TIMES=ON \
         -DDPCPP_INSTALL_DIR="$(dirname $(which clang++))/.." \
-        -DCMAKE_CXX_FLAGS="-Wno-missing-template-arg-list-after-template-kw" \
         $CMAKE_EXTRA_ARGS
         # Ignore errors so that if one category build fails others still have a
         # chance to finish and be executed at the run stage. Note that

.github/workflows/sycl-macos-build-and-test.yml

@@ -30,7 +30,7 @@ jobs:
       CCACHE_MAXSIZE: ${{ inputs.build_cache_size }}
     steps:
     - name: Install dependencies
-      run: brew install ccache ninja
+      run: brew install ccache ninja hwloc
     - uses: actions/checkout@v4
       with:
         ref: ${{ inputs.build_ref }}

.github/workflows/sycl-nightly.yml

@@ -37,11 +37,18 @@ jobs:
             target_devices: ext_oneapi_hip:gpu
             tests_selector: e2e
 
+          - name: NVIDIA/CUDA
+            runner: '["Linux", "cuda"]'
+            image: ghcr.io/intel/llvm/ubuntu2204_build:latest
+            image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
+            target_devices: ext_oneapi_cuda:gpu
+            tests_selector: e2e
+
           - name: Intel L0 GPU
             runner: '["Linux", "gen12"]'
             image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
             image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: ext_oneapi_level_zero:gpu
+            target_devices: level_zero:gpu
             reset_gpu: true
             tests_selector: e2e
             extra_lit_opts: --param gpu-intel-gen12=True
@@ -82,6 +89,13 @@ jobs:
             image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
             target_devices: opencl:cpu
             tests_selector: cts
+
+          - name: SYCL-CTS on L0 gen12
+            runner: '["Linux", "gen12"]'
+            image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
+            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+            target_devices: level_zero:gpu
+            tests_selector: cts
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}