Merge branch 'sycl' of https://github.com/intel/llvm into move-ur-files

Author: ianayl

.github/workflows/sycl-nightly.yml

@@ -257,7 +257,7 @@ jobs:
       runner: '["Windows", "build-e2e"]'
       cts_testing_mode: 'build-only'
       tests_selector: cts
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
       sycl_cts_artifact: sycl_cts_bin_win
 
@@ -278,7 +278,7 @@ jobs:
       cts_testing_mode: 'run-only'
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
       sycl_cts_artifact: sycl_cts_bin_win
 

.github/workflows/sycl-rel-nightly.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        ref: sycl-rel-6_0_0
+        ref: sycl-rel-6_1_0
     - run: git show --quiet | tee -a $GITHUB_STEP_SUMMARY
 
     - id: is_new_commit
@@ -40,7 +40,7 @@ jobs:
       build_artifact_suffix: default
       build_configure_extra_args: '--hip --cuda'
       build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
-      build_ref: sycl-rel-6_0_0
+      build_ref: sycl-rel-6_1_0
 
       # We upload the build for people to download/use, override its name and
       # prefer widespread gzip compression.
@@ -89,7 +89,7 @@ jobs:
       tests_selector: ${{ matrix.tests_selector }}
       extra_lit_opts: ${{ matrix.extra_lit_opts }}
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
-      repo_ref: sycl-rel-6_0_0
+      repo_ref: sycl-rel-6_1_0
       devops_ref: sycl
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -100,7 +100,7 @@ jobs:
     if: ${{ github.repository == 'intel/llvm' && needs.check_for_new_commits.outputs.is_new_commit != 'false' }}
     uses: ./.github/workflows/sycl-windows-build.yml
     with:
-      ref: sycl-rel-6_0_0
+      ref: sycl-rel-6_1_0
 
       # We upload both Linux/Windows build via Github's "Releases"
       # functionality, make sure Linux/Windows names follow the same pattern.
@@ -119,7 +119,7 @@ jobs:
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
       extra_lit_opts: --param gpu-intel-gen12=True
-      ref: sycl-rel-6_0_0
+      repo_ref: sycl-rel-6_1_0
       devops_ref: sycl
 
   cuda-aws-start:
@@ -129,7 +129,7 @@ jobs:
     secrets: inherit
     with:
       mode: start
-      ref: sycl-rel-6_0_0
+      ref: sycl-rel-6_1_0
 
   cuda-run-tests:
     needs: [ubuntu2204_build, cuda-aws-start]
@@ -141,7 +141,7 @@ jobs:
       image: ghcr.io/intel/llvm/ubuntu2204_build:latest
       image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
       target_devices: cuda:gpu
-      repo_ref: sycl-rel-6_0_0
+      repo_ref: sycl-rel-6_1_0
       devops_ref: sycl
 
       sycl_toolchain_artifact: sycl_linux_default
@@ -155,7 +155,7 @@ jobs:
     secrets: inherit
     with:
       mode: stop
-      ref: sycl-rel-6_0_0
+      ref: sycl-rel-6_1_0
 
   build-sycl-cts:
     needs: ubuntu2204_build
@@ -167,11 +167,13 @@ jobs:
       cts_testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
-      repo_ref: sycl-rel-6_0_0
+      repo_ref: sycl-rel-6_1_0
       devops_ref: sycl
+      tests_ref: ead7474b9cb2189ce48025550912ccad5a72bd30
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
+      sycl_cts_artifact: sycl_cts_bin_linux
 
   run-sycl-cts:
     needs: [ubuntu2204_build, build-sycl-cts]
@@ -202,4 +204,4 @@ jobs:
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-      sycl_cts_artifact: sycl_cts_bin
+      sycl_cts_artifact: sycl_cts_bin_linux

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

@@ -6,6 +6,7 @@ on:
       name:
         type: string
         required: True
+
       runner:
         type: string
         required: True
@@ -27,19 +28,17 @@ on:
           Extra options to be added to LIT_OPTS.
         type: string
         default: ''
-      ref:
+
+      repo_ref:
         type: string
         required: False
+        description: |
+          Commit SHA or branch to checkout the intel/llvm repo.
       devops_ref:
         type: string
         required: False
         description: |
-          By default we checkout the devops directory from "inputs.ref" branch.
-          devops_ref may be specified to checkout the devops dir from different
-          branch.
-          Note: it doesn't affect ./devops/actions/run-tests/* as these actions
-          call checkout again and therefore override the devops directory, so
-          configs/dependecies from input.ref are used.
+          Commit SHA or branch to checkout the devops directory.
       tests_ref:
         type: string
         required: False
@@ -104,7 +103,7 @@ jobs:
       with:
         sparse-checkout: |
           devops/actions
-        ref: ${{ inputs.devops_ref|| inputs.ref || github.sha }}
+        ref: ${{ inputs.devops_ref|| inputs.repo_ref || github.sha }}
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
       with:
         arch: amd64
@@ -122,7 +121,7 @@ jobs:
       if: inputs.tests_selector == 'e2e'
       with:
         path: llvm
-        ref: ${{ inputs.ref || github.sha }}
+        ref: ${{ inputs.repo_ref || github.sha }}
         cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
     - name: Download compiler toolchain
       uses: actions/download-artifact@v4

clang/lib/Sema/SemaExpr.cpp

@@ -7124,18 +7124,6 @@ ExprResult Sema::BuildResolvedCallExpr(Expr *Fn, NamedDecl *NDecl,
       return ExprError();
   }
 
-  // Diagnose function pointers in SYCL.
-  if (!FDecl && !getLangOpts().SYCLAllowFuncPtr && getLangOpts().SYCLIsDevice &&
-      !isUnevaluatedContext()) {
-    bool MaybeConstantExpr = false;
-    Expr *NonDirectCallee = TheCall->getCallee();
-    if (!NonDirectCallee->isValueDependent())
-      MaybeConstantExpr = NonDirectCallee->isCXX11ConstantExpr(getASTContext());
-    if (!MaybeConstantExpr)
-      SYCL().DiagIfDeviceCode(TheCall->getExprLoc(), diag::err_sycl_restrict)
-          << SemaSYCL::KernelCallFunctionPointer;
-  }
-
   return CheckForImmediateInvocation(MaybeBindToTemporary(TheCall), FDecl);
 }
 

clang/lib/Sema/SemaSYCL.cpp

@@ -693,6 +693,17 @@ class DiagDeviceFunction : public RecursiveASTVisitor<DiagDeviceFunction> {
         SemaSYCLRef.Diag(e->getExprLoc(), diag::err_builtin_target_unsupported)
             << Name << "SYCL device";
       }
+    } else if (!SemaSYCLRef.getLangOpts().SYCLAllowFuncPtr &&
+               !e->isTypeDependent() &&
+               !isa<CXXPseudoDestructorExpr>(e->getCallee())) {
+      bool MaybeConstantExpr = false;
+      Expr *NonDirectCallee = e->getCallee();
+      if (!NonDirectCallee->isValueDependent())
+        MaybeConstantExpr =
+            NonDirectCallee->isCXX11ConstantExpr(SemaSYCLRef.getASTContext());
+      if (!MaybeConstantExpr)
+        SemaSYCLRef.Diag(e->getExprLoc(), diag::err_sycl_restrict)
+            << SemaSYCL::KernelCallFunctionPointer;
     }
     return true;
   }

clang/test/SemaSYCL/constexpr-function-pointer.cpp

@@ -1,13 +1,10 @@
 // RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify -sycl-std=2020 -std=c++17 %s
-// RUN: %clang_cc1 -fsycl-is-host -fsyntax-only -verify=host -sycl-std=2020 -std=c++17 %s
 
 // This test checks that the compiler doesn't emit an error when indirect call
 // was made through a function pointer that is constant expression, and makes
 // sure that the error is emitted when a function pointer is not a constant
 // expression.
 
-// host-no-diagnostics
-
 void t() {}
 
 constexpr auto F = t;
@@ -25,8 +22,6 @@ void bar1(const SomeFunc fptr) {
 
 template <auto f> void fooNTTP() { f(); }
 
-template <typename FTy> void templated(FTy f) { f(); } // #call-templated
-
 __attribute__((sycl_device)) void bar() {
   // OK
   constexpr auto f = t;
@@ -53,19 +48,4 @@ __attribute__((sycl_device)) void bar() {
   fff();
 
   fooNTTP<t>();
-
-  templated(t);
-  // expected-error@#call-templated {{SYCL kernel cannot call through a function pointer}}
-  // expected-note@-2 {{called by 'bar'}}
-}
-
-void from_host() {
-  const auto f1 = t;
-  f1();
-  auto f2 = t;
-  f2();
-
-  fooNTTP<t>();
-
-  templated(t);
 }

devops/dependencies.json

@@ -1,15 +1,15 @@
 {
   "linux": {
     "compute_runtime": {
-      "github_tag": "25.05.32567.17",
-      "version": "25.05.32567.17",
-      "url": "https://github.com/intel/compute-runtime/releases/tag/25.05.32567.17",
+      "github_tag": "25.09.32961.5",
+      "version": "25.09.32961.5",
+      "url": "https://github.com/intel/compute-runtime/releases/tag/25.09.32961.5",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "igc": {
-      "github_tag": "v2.5.6",
-      "version": "v2.5.6",
-      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/v2.5.6",
+      "github_tag": "v2.8.3",
+      "version": "v2.8.3",
+      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/v2.8.3",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "cm": {

llvm/include/llvm/SYCLLowerIR/DeviceConfigFile.td

@@ -88,6 +88,10 @@ def AspectExt_oneapi_atomic16 : Aspect<"ext_oneapi_atomic16">;
 def AspectExt_oneapi_virtual_functions : Aspect<"ext_oneapi_virtual_functions">;
 def AspectExt_intel_spill_memory_size : Aspect<"ext_intel_spill_memory_size">;
 def AspectExt_oneapi_bindless_images_gather : Aspect<"ext_oneapi_bindless_images_gather">;
+def AspectExt_intel_current_clock_throttle_reasons : Aspect<"ext_intel_current_clock_throttle_reasons">;
+def AspectExt_intel_fan_speed : Aspect<"ext_intel_fan_speed">;
+def AspectExt_intel_power_limits : Aspect<"ext_intel_power_limits">;
+
 // Deprecated aspects
 def AspectInt64_base_atomics : Aspect<"int64_base_atomics">;
 def AspectInt64_extended_atomics : Aspect<"int64_extended_atomics">;
@@ -154,7 +158,10 @@ def : TargetInfo<"__TestAspectList",
     AspectExt_intel_fpga_task_sequence,
     AspectExt_oneapi_atomic16,
     AspectExt_oneapi_virtual_functions,
-    AspectExt_intel_spill_memory_size],
+    AspectExt_intel_spill_memory_size,
+    AspectExt_intel_current_clock_throttle_reasons,
+    AspectExt_intel_fan_speed,
+    AspectExt_intel_power_limits],
     []>;
 // This definition serves the only purpose of testing whether the deprecated aspect list defined in here and in SYCL RT
 // match.

llvm/lib/SYCLLowerIR/LowerWGScope.cpp

@@ -938,24 +938,26 @@ Value *spirv::genPseudoLocalID(Instruction &Before, const Triple &TT) {
     IRBuilder<> Bld(Ctx);
     Bld.SetInsertPoint(&Before);
 
-#define CREATE_CALLEE(NAME, FN_NAME)                                           \
-  FunctionCallee FnCallee##NAME = M.getOrInsertFunction(FN_NAME, RetTy);       \
-  assert(FnCallee##NAME && "spirv intrinsic creation failed");                 \
-  auto NAME = Bld.CreateCall(FnCallee##NAME, {});
-
-    CREATE_CALLEE(LocalInvocationId_X, "_Z27__spirv_LocalInvocationId_xv");
-    CREATE_CALLEE(LocalInvocationId_Y, "_Z27__spirv_LocalInvocationId_yv");
-    CREATE_CALLEE(LocalInvocationId_Z, "_Z27__spirv_LocalInvocationId_zv");
-
-#undef CREATE_CALLEE
+    auto CreateCallee = [&](StringRef Name) {
+      FunctionCallee Callee = M.getOrInsertFunction(Name, RetTy);
+      assert(Callee.getCallee() && "spirv intrinsic creation failed");
+      return Bld.CreateCall(Callee, {});
+    };
+
+    Value *LocalInvocationIdX =
+        CreateCallee("_Z27__spirv_LocalInvocationId_xv");
+    Value *LocalInvocationIdY =
+        CreateCallee("_Z27__spirv_LocalInvocationId_yv");
+    Value *LocalInvocationIdZ =
+        CreateCallee("_Z27__spirv_LocalInvocationId_zv");
 
     // 1: returns
     //   __spirv_LocalInvocationId_x() |
     //   __spirv_LocalInvocationId_y() |
     //   __spirv_LocalInvocationId_z()
     //
-    return Bld.CreateOr(LocalInvocationId_X,
-                        Bld.CreateOr(LocalInvocationId_Y, LocalInvocationId_Z));
+    return Bld.CreateOr(LocalInvocationIdX,
+                        Bld.CreateOr(LocalInvocationIdY, LocalInvocationIdZ));
   } else {
     // extern "C" const __constant size_t __spirv_BuiltInLocalInvocationIndex;
     // Must correspond to the code in

llvm/lib/SYCLPostLink/CMakeLists.txt

@@ -14,6 +14,7 @@ add_llvm_component_library(LLVMSYCLPostLink
   LLVMDemangle
   LLVMTargetParser
   LLVMTransformUtils
+  LLVMSYCLLowerIR
 
   LINK_COMPONENTS
   Analysis