Temp - Remove the no-handler macro

Author: slawekptak

sycl/include/sycl/ext/oneapi/experimental/enqueue_functions.hpp

@@ -259,7 +259,6 @@ template <typename KernelName = sycl::detail::auto_name, int Dimensions,
           typename KernelType, typename... ReductionsT>
 void nd_launch(queue Q, nd_range<Dimensions> Range, const KernelType &KernelObj,
                ReductionsT &&...Reductions) {
-#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
   // TODO The handler-less path does not support reductions and kernel function
   // properties yet.
   if constexpr (sizeof...(ReductionsT) == 0 &&
@@ -268,9 +267,7 @@ void nd_launch(queue Q, nd_range<Dimensions> Range, const KernelType &KernelObj,
                           const KernelType &>::value)) {
     detail::submit_kernel_direct<KernelName>(std::move(Q), empty_properties_t{},
                                              Range, KernelObj);
-  } else
-#endif
-  {
+  } else {
     submit(std::move(Q), [&](handler &CGH) {
       nd_launch<KernelName>(CGH, Range, KernelObj,
                             std::forward<ReductionsT>(Reductions)...);

sycl/include/sycl/khr/free_function_commands.hpp

@@ -157,17 +157,14 @@ template <typename KernelType, typename = typename std::enable_if_t<
 void launch_grouped(const queue &q, range<1> r, range<1> size, KernelType &&k,
                     const sycl::detail::code_location &codeLoc =
                         sycl::detail::code_location::current()) {
-#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
   // TODO The handler-less path does not support kernel function properties yet.
   if constexpr (!(ext::oneapi::experimental::detail::
                       HasKernelPropertiesGetMethod<
                           const KernelType &>::value)) {
     detail::submit_kernel_direct(
         q, ext::oneapi::experimental::empty_properties_t{},
         nd_range<1>(r, size), std::forward<KernelType>(k));
-  } else
-#endif
-  {
+  } else {
     submit(
         q, [&](handler &h) { launch_grouped<KernelType>(h, r, size, k); },
         codeLoc);
@@ -178,17 +175,14 @@ template <typename KernelType, typename = typename std::enable_if_t<
 void launch_grouped(const queue &q, range<2> r, range<2> size, KernelType &&k,
                     const sycl::detail::code_location &codeLoc =
                         sycl::detail::code_location::current()) {
-#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
   // TODO The handler-less path does not support kernel function properties yet.
   if constexpr (!(ext::oneapi::experimental::detail::
                       HasKernelPropertiesGetMethod<
                           const KernelType &>::value)) {
     detail::submit_kernel_direct(
         q, ext::oneapi::experimental::empty_properties_t{},
         nd_range<2>(r, size), std::forward<KernelType>(k));
-  } else
-#endif
-  {
+  } else {
     submit(
         q, [&](handler &h) { launch_grouped<KernelType>(h, r, size, k); },
         codeLoc);
@@ -199,17 +193,14 @@ template <typename KernelType, typename = typename std::enable_if_t<
 void launch_grouped(const queue &q, range<3> r, range<3> size, KernelType &&k,
                     const sycl::detail::code_location &codeLoc =
                         sycl::detail::code_location::current()) {
-#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
   // TODO The handler-less path does not support kernel function properties yet.
   if constexpr (!(ext::oneapi::experimental::detail::
                       HasKernelPropertiesGetMethod<
                           const KernelType &>::value)) {
     detail::submit_kernel_direct(
         q, ext::oneapi::experimental::empty_properties_t{},
         nd_range<3>(r, size), std::forward<KernelType>(k));
-  } else
-#endif
-  {
+  } else {
     submit(
         q, [&](handler &h) { launch_grouped<KernelType>(h, r, size, k); },
         codeLoc);

sycl/include/sycl/queue.hpp

@@ -3275,7 +3275,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
   parallel_for(nd_range<Dims> Range, RestT &&...Rest) {
     constexpr detail::code_location CodeLoc = getCodeLocation<KernelName>();
     detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
-#ifdef __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
+
     using KernelType = std::tuple_element_t<0, std::tuple<RestT...>>;
 
     // TODO The handler-less path does not support reductions and kernel
@@ -3287,9 +3287,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
       return detail::submit_kernel_direct<KernelName, true>(
           *this, ext::oneapi::experimental::empty_properties_t{}, Range,
           Rest...);
-    } else
-#endif
-    {
+    } else {
       return submit(
           [&](handler &CGH) {
             CGH.template parallel_for<KernelName>(Range, Rest...);

sycl/unittests/Extensions/FreeFunctionCommands/FreeFunctionCommandsEvents.cpp

@@ -227,7 +227,6 @@ TEST_F(FreeFunctionCommandsEventsTests, LaunchGroupedShortcutNoEvent) {
   ASSERT_EQ(counter_urEnqueueKernelLaunch, size_t{1});
 }
 
-#if __DPCPP_ENABLE_UNFINISHED_NO_CGH_SUBMIT
 TEST_F(FreeFunctionCommandsEventsTests,
        LaunchGroupedShortcutMoveKernelNoEvent) {
   mock::getCallbacks().set_replace_callback("urEnqueueKernelLaunch",
@@ -276,7 +275,6 @@ TEST_F(FreeFunctionCommandsEventsTests,
   ASSERT_EQ(TestMoveFunctor::MoveCtorCalls, 1);
   ASSERT_EQ(counter_urEnqueueKernelLaunch, size_t{2});
 }
-#endif
 
 TEST_F(FreeFunctionCommandsEventsTests, SubmitLaunchGroupedKernelNoEvent) {
   mock::getCallbacks().set_replace_callback("urEnqueueKernelLaunch",