Merge branch 'sycl' into przemek/image-support-queries

Author: przemektmalon

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

@@ -46,7 +46,10 @@ on:
         default: 3
       e2e_binaries_artifact:
         type: string
-        required: False
+        required: false
+      pack_release:
+        type: string
+        required: false
 
     outputs:
       build_conclusion:
@@ -100,6 +103,10 @@ on:
         options:
           - 3
 
+      pack_release:
+        type: string
+        required: false
+
 permissions: read-all
 
 jobs:
@@ -215,11 +222,26 @@ jobs:
         # TODO consider moving this to Dockerfile.
         export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
         LIT_OPTS="--allow-empty-runs" LIT_FILTER="e2e_test_requirements" cmake --build $GITHUB_WORKSPACE/build --target check-sycl
-    - name: Install
+    - name: Install sycl-toolchain
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
-      # TODO replace utility installation with a single CMake target
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain
+
+    - name: Pack toolchain release
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
+      run: tar -I '${{ steps.artifact_info.outputs.COMPRESS }}' -cf ${{ steps.artifact_info.outputs.ARCHIVE_NAME }} -C $GITHUB_WORKSPACE/build/install .
+    - name: Upload toolchain release
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: sycl_linux_release
+        path: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
+        retention-days: ${{ inputs.retention-days }}
+
+    - name: Install utilities
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
+      # TODO replace utility installation with a single CMake target
+      run: |
         cmake --build $GITHUB_WORKSPACE/build --target utils/FileCheck/install
         cmake --build $GITHUB_WORKSPACE/build --target utils/count/install
         cmake --build $GITHUB_WORKSPACE/build --target utils/not/install

clang/lib/Driver/ToolChains/Clang.cpp

@@ -5885,8 +5885,16 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
         CmdArgs.push_back("-ffine-grained-bitfield-accesses");
     }
 
-    if (!Args.hasFlag(options::OPT_fsycl_unnamed_lambda,
-                      options::OPT_fno_sycl_unnamed_lambda, true))
+    // '-fsycl-unnamed-lambda' is not supported with '-fsycl-host-compiler'
+    if (Args.hasArg(options::OPT_fsycl_host_compiler_EQ)) {
+      if (Args.hasFlag(options::OPT_fsycl_unnamed_lambda,
+                       options::OPT_fno_sycl_unnamed_lambda, false))
+        D.Diag(diag::err_drv_cannot_mix_options) << "-fsycl-host-compiler"
+                                                 << "-fsycl-unnamed-lambda";
+      else // '-fsycl-host-compiler' implies '-fno-sycl-unnamed-lambda'
+        CmdArgs.push_back("-fno-sycl-unnamed-lambda");
+    } else if (!Args.hasFlag(options::OPT_fsycl_unnamed_lambda,
+                             options::OPT_fno_sycl_unnamed_lambda, true))
       CmdArgs.push_back("-fno-sycl-unnamed-lambda");
 
     if (!Args.hasFlag(options::OPT_fsycl_esimd_force_stateless_mem,

clang/test/Driver/sycl-host-compiler-old-model.cpp

@@ -62,6 +62,16 @@
 // RUN:  | FileCheck -check-prefix=HOST_COMPILER_NOARG %s
 // HOST_COMPILER_NOARG: missing argument to '-fsycl-host-compiler='
 
+/// error for -fsycl-host-compiler and -fsycl-unnamed-lambda combination 
+// RUN: not %clangxx -fsycl --no-offload-new-driver -fsycl-host-compiler=g++ -fsycl-unnamed-lambda -c -### %s 2>&1 \
+// RUN:  | FileCheck -check-prefix=HOST_COMPILER_AND_UNNAMED_LAMBDA %s
+// HOST_COMPILER_AND_UNNAMED_LAMBDA: error: cannot specify '-fsycl-unnamed-lambda' along with '-fsycl-host-compiler'
+
+// -fsycl-host-compiler implies -fno-sycl-unnamed-lambda
+// RUN: %clangxx -### -fsycl --no-offload-new-driver -fsycl-host-compiler=g++ -c -### %s 2>&1 \
+// RUN:  | FileCheck -check-prefix=IMPLY-NO-SYCL-UNNAMED-LAMBDA %s
+// IMPLY-NO-SYCL-UNNAMED-LAMBDA: clang{{.*}} "-fno-sycl-unnamed-lambda"
+
 /// Warning should not be emitted when using -fsycl-host-compiler when linking
 // RUN: touch %t.o
 // RUN: %clangxx -fsycl --no-offload-new-driver -fsycl-host-compiler=g++ %t.o -### 2>&1 \

devops/scripts/benchmarks/options.py

@@ -40,7 +40,7 @@ class Options:
     build_compute_runtime: bool = False
     extra_ld_libraries: list[str] = field(default_factory=list)
     extra_env_vars: dict = field(default_factory=dict)
-    compute_runtime_tag: str = "25.09.32961.7"
+    compute_runtime_tag: str = "25.09.32961.8"
     build_igc: bool = False
     current_run_name: str = "This PR"
     preset: str = "Full"

devops/scripts/benchmarks/utils/compute_runtime.py

@@ -135,6 +135,8 @@ def build_igc(self, repo, commit):
         self.igc_install = os.path.join(options.workdir, "igc-install")
         configure_command = [
             "cmake",
+            "-DCMAKE_C_FLAGS=-Wno-error",
+            "-DCMAKE_CXX_FLAGS=-Wno-error",
             f"-B {self.igc_build}",
             f"-S {self.igc_repo}",
             f"-DCMAKE_INSTALL_PREFIX={self.igc_install}",

llvm/lib/SYCLNativeCPUUtils/CMakeLists.txt

@@ -35,15 +35,15 @@ endif()
 if(NATIVECPU_USE_OCK)
   if(NATIVECPU_OCK_USE_FETCHCONTENT)
     set(OCK_GIT_INTERNAL_REPO "https://github.com/uxlfoundation/oneapi-construction-kit.git")
-    # commit 652f9943b0bfcf61123a0f82b2bdd499738c5391
-    # Merge: c24c971bcb e0f02ae739
-    # Author: Colin Davidson <colin.davidson@codeplay.com>
-    # Date:   Fri Feb 28 15:59:50 2025 +0000
+    # commit ffef31717750d3f15bfd2f18d9cd7f4677fe9d3e
+    # Merge: 574307afde 0b00238554
+    # Author: Harald van Dijk <harald.vandijk@codeplay.com>
+    # Date:   Fri Apr 4 16:26:38 2025 +0100
     # 
-    #     Merge pull request #677 from coldav/colin/build_installed_llvm
+    #     Merge pull request #751 from hvdijk/llvm21-address-space
     #     
-    #     Change llvm over to a choice of install or cache, default PRs to install
-    set(OCK_GIT_INTERNAL_TAG 652f9943b0bfcf61123a0f82b2bdd499738c5391)
+    #     [LLVM 21] Take address space into account for legality.
+    set(OCK_GIT_INTERNAL_TAG ffef31717750d3f15bfd2f18d9cd7f4677fe9d3e)
 
     # Overwrite OCK_GIT_INTERNAL_REPO/OCK_GIT_INTERNAL_TAG if the corresponding options are set
     if(OCK_GIT_REPO)

sycl/include/sycl/handler.hpp

@@ -1192,11 +1192,8 @@ class __SYCL_EXPORT handler {
         typename detail::get_kernel_name_t<KernelName, KernelType>::name;
 
     // Range rounding can be disabled by the user.
-    // Range rounding is not done on the host device.
     // Range rounding is supported only for newer SYCL standards.
 #if !defined(__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__) &&                  \
-    !defined(DPCPP_HOST_DEVICE_OPENMP) &&                                      \
-    !defined(DPCPP_HOST_DEVICE_PERF_NATIVE) &&                                 \
     SYCL_LANGUAGE_VERSION >= 202012L
     auto [RoundedRange, HasRoundedRange] = getRoundedRange(UserRange);
     if (HasRoundedRange) {
@@ -1226,7 +1223,6 @@ class __SYCL_EXPORT handler {
 #endif
     } else
 #endif // !__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ &&
-       // !DPCPP_HOST_DEVICE_OPENMP && !DPCPP_HOST_DEVICE_PERF_NATIVE &&
        // SYCL_LANGUAGE_VERSION >= 202012L
     {
       (void)UserRange;

sycl/source/backend.cpp

@@ -299,7 +299,8 @@ make_kernel_bundle(ur_native_handle_t NativeHandle,
   // symbols (e.g. when kernel_bundle is supposed to be joined with another).
   auto KernelIDs = std::make_shared<std::vector<kernel_id>>();
   auto DevImgImpl = std::make_shared<device_image_impl>(
-      nullptr, TargetContext, Devices, State, KernelIDs, UrProgram);
+      nullptr, TargetContext, Devices, State, KernelIDs, UrProgram,
+      ImageOriginInterop);
   device_image_plain DevImg{DevImgImpl};
 
   return std::make_shared<kernel_bundle_impl>(TargetContext, Devices, DevImg);