[SYCL] Create kernel bundle when non-native specialization constants …

…are unset (#4358) The kernel bundle carrying the device memory used for specialization constants on systems that do not support specialization constants natively was only initialized if a specialization constant was either written to or read from prior to kernel execution. These changes either forces the creation of a kernel bundle if the kernel has a specialization constant argument and a kernel bundle does not exist already. Signed-off-by: Steffen Larsen <[email protected]>
intel · Aug 19, 2021 · 3d96e1d · 3d96e1d
1 parent 4cb8561
commit 3d96e1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/sycl/include/CL/sycl/handler.hpp b/sycl/include/CL/sycl/handler.hpp
@@ -551,6 +551,13 @@ class __SYCL_EXPORT handler {
       // arguments.
       MArgs = std::move(MAssociatedAccesors);
     }
+
+    // If the kernel lambda is callable with a kernel_handler argument, manifest
+    // the associated kernel handler.
+    if (detail::isKernelLambdaCallableWithKernelHandler<KernelType,
+                                                        LambdaArgType>()) {
+      getOrInsertHandlerKernelBundle(/*Insert=*/true);
+    }
   }
 
   /// Checks whether it is possible to copy the source shape to the destination

diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp
@@ -1754,15 +1754,10 @@ pi_result ExecCGCommand::SetKernelParamsAndLaunch(
             "device",
             PI_INVALID_OPERATION);
       }
-      if (DeviceImageImpl != nullptr) {
-        RT::PiMem SpecConstsBuffer =
-            DeviceImageImpl->get_spec_const_buffer_ref();
-        Plugin.call<PiApiKind::piextKernelSetArgMemObj>(Kernel, NextTrueIndex,
-                                                        &SpecConstsBuffer);
-      } else {
-        Plugin.call<PiApiKind::piextKernelSetArgMemObj>(Kernel, NextTrueIndex,
-                                                        nullptr);
-      }
+      assert(DeviceImageImpl != nullptr);
+      RT::PiMem SpecConstsBuffer = DeviceImageImpl->get_spec_const_buffer_ref();
+      Plugin.call<PiApiKind::piextKernelSetArgMemObj>(Kernel, NextTrueIndex,
+                                                      &SpecConstsBuffer);
       break;
     }
     }