Merge branch 'sycl' into switch-to-coop

Author: MrSidims

.github/CODEOWNERS

@@ -165,6 +165,7 @@ 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
+sycl/test-e2e/LLVMIntrinsicLowering/ @intel/dpcpp-spirv-reviewers
 
 # Sanitizer
 clang/lib/Driver/SanitizerArgs.cpp @intel/dpcpp-sanitizers-review

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

@@ -169,7 +169,6 @@ jobs:
           --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
           --cmake-opt="-DNATIVECPU_USE_OCK=Off" \
-          --cmake-opt="-DSYCL_PI_TESTS=OFF" \
           --cmake-opt="-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV"
     - name: Compile
       id: build

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

@@ -284,7 +284,11 @@ jobs:
           echo "opts=$CMAKE_EXTRA_ARGS" >> $GITHUB_OUTPUT
         else
           if [ "${{ contains(inputs.target_devices, 'ext_oneapi_hip')  }}" == "true" ]; then
-            echo 'opts=-DHIP_PLATFORM="AMD" -DAMD_ARCH="gfx1031"' >> $GITHUB_OUTPUT
+            if [ "${{ runner.name }}" == "cp-amd-runner" ]; then
+              echo 'opts=-DHIP_PLATFORM="AMD" -DAMD_ARCH="gfx1030"' >> $GITHUB_OUTPUT
+            else
+              echo 'opts=-DHIP_PLATFORM="AMD" -DAMD_ARCH="gfx1031"' >> $GITHUB_OUTPUT
+            fi
           else
             echo 'opts=' >> $GITHUB_OUTPUT
           fi

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

@@ -52,7 +52,6 @@ jobs:
           --ci-defaults $ARGS \
           --cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache \
           --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-          --cmake-opt="-DLLVM_INSTALL_UTILS=ON" \
-          --cmake-opt="-DSYCL_PI_TESTS=OFF"
+          --cmake-opt="-DLLVM_INSTALL_UTILS=ON"
     - name: Compile
       run: cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -1889,8 +1889,8 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
         DeviceName = DevArg;
       StringRef BackendOptName = SYCL::gen::getGenGRFFlag("auto");
       if (IsGen)
-        PerDeviceArgs.push_back(
-            {DeviceName, Args.MakeArgString(BackendOptName)});
+        PerDeviceArgs.push_back({Args.MakeArgString(DeviceName),
+                                 Args.MakeArgString(BackendOptName)});
       else if (IsJIT)
         BeArgs.push_back(Args.MakeArgString(RegAllocModeOptName + DeviceName +
                                             ":" + BackendOptName));

devops/cts_exclude_filter_L0_GPU

@@ -1,7 +1,2 @@
-# These two take too much time
-kernel_bundle
-marray
-# fix: https://github.com/KhronosGroup/SYCL-CTS/pull/964
-accessor_legacy
 # CMPLRLLVM-61839
 multi_ptr

devops/cts_exclude_filter_OCL_CPU

@@ -1,11 +1,6 @@
-# These two take too much time
-kernel_bundle
-marray
 # https://github.com/intel/llvm/issues/13477
 math_builtin_api
 # https://github.com/intel/llvm/issues/13574
 hierarchical
-# fix: https://github.com/KhronosGroup/SYCL-CTS/pull/964
-accessor_legacy
 # CMPLRLLVM-61839
 multi_ptr

sycl/cmake/modules/UnifiedRuntimeTag.cmake

@@ -1,7 +1,7 @@
-# commit c94dbc8fa25f62b812a3db707b78f1c217b33bc3
-# Merge: 9ae8e65b 5bc8c925
+# commit cd92e72bbc4ebddef63c63c0f7e66a410f4b9552
+# Merge: 9a209aa5 b1222f08
 # Author: Callum Fare <[email protected]>
-# Date:   Fri Nov 8 17:14:06 2024 +0000
-#     Merge pull request #2302 from callumfare/callum/revert_ur_2100
-#     Revert #2100 "Raise MSVC warning level from /W3 to /W4"
-set(UNIFIED_RUNTIME_TAG c94dbc8fa25f62b812a3db707b78f1c217b33bc3)
+# Date:   Wed Nov 13 09:57:16 2024 +0000
+#     Merge pull request #2254 from PietroGhg/pietro/events_rr
+#     [NATIVECPU] Implement events on Native CPU
+set(UNIFIED_RUNTIME_TAG cd92e72bbc4ebddef63c63c0f7e66a410f4b9552)

sycl/include/sycl/accessor.hpp

@@ -22,7 +22,6 @@
 #include <sycl/detail/owner_less_base.hpp>            // for OwnerLessBase
 #include <sycl/detail/property_helper.hpp>            // for PropWithDataKind
 #include <sycl/detail/property_list_base.hpp>         // for PropertyListBase
-#include <sycl/detail/type_list.hpp>                  // for is_contained
 #include <sycl/detail/type_traits.hpp>                // for const_if_const_AS
 #include <sycl/exception.hpp>                         // for make_error_code
 #include <sycl/ext/oneapi/accessor_property_list.hpp> // for accessor_prope...

sycl/include/sycl/builtins_utils_scalar.hpp

@@ -12,7 +12,6 @@
 #include <sycl/aliases.hpp>
 #include <sycl/detail/defines_elementary.hpp>
 #include <sycl/detail/generic_type_traits.hpp>
-#include <sycl/detail/type_list.hpp>
 #include <sycl/detail/type_traits.hpp>
 #include <sycl/half_type.hpp>
 #include <sycl/multi_ptr.hpp>