Skip to content

A POC for using the properties extension as requirements in KHR free … #21215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
slawekptak wants to merge 1 commit into
base: sycl
Choose a base branch
from
Draft

A POC for using the properties extension as requirements in KHR free … #21215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sycl/include/sycl/ext/oneapi/properties/property.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,9 @@ enum PropKind : uint32_t {
MaximumSize = 47,
ZeroInit = 48,
FastLink = 49,
WaitEvent = 50,
// PropKindSize must always be the last value.
PropKindSize = 50,
PropKindSize = 51,
};

template <typename PropertyT> struct PropertyToKind {
Expand Down
39 changes: 33 additions & 6 deletions sycl/include/sycl/khr/free_function_commands.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,23 @@
#ifdef __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS

#include <sycl/ext/oneapi/experimental/enqueue_functions.hpp>
#include <sycl/ext/oneapi/properties/properties.hpp>

namespace sycl {
inline namespace _V1 {
namespace khr {

struct wait_event
: ::sycl::ext::oneapi::experimental::detail::run_time_property_key<
wait_event, ::sycl::ext::oneapi::experimental::detail::
PropKind::WaitEvent> {
wait_event(event evt) : e(evt) {}

event e;
};

using wait_event_key = wait_event;

template <typename CommandGroupFunc>
void submit(const queue &q, CommandGroupFunc &&cgf,
const sycl::detail::code_location &codeLoc =
Expand Down Expand Up @@ -354,20 +366,35 @@ void launch_task(handler &h, const KernelType &k) {
h.single_task(k);
}

template <typename KernelType, typename = typename std::enable_if_t<
enable_kernel_function_overload<KernelType>>>
template <typename KernelType, typename LaunchPropertiesT =
ext::oneapi::experimental::empty_properties_t, typename = typename std::enable_if_t<
enable_kernel_function_overload<KernelType>>>
void launch_task(const sycl::queue &q, KernelType &&k,
const LaunchPropertiesT &lp = {},
const sycl::detail::code_location &codeLoc =
sycl::detail::code_location::current()) {
// TODO The handler-less path does not support kernel functions with the
// kernel_handler type argument yet.
if constexpr (!(detail::KernelLambdaHasKernelHandlerArgT<KernelType,
void>::value)) {
detail::submit_kernel_direct_single_task(
q, std::forward<KernelType>(k), {},
ext::oneapi::experimental::empty_properties_t{}, codeLoc);
if constexpr (lp.template has_property<wait_event_key>()) {
auto DepEvent = lp.template get_property<wait_event_key>().e;
detail::submit_kernel_direct_single_task(
q, std::forward<KernelType>(k), sycl::span<const event>(&DepEvent, 1),
ext::oneapi::experimental::empty_properties_t{}, codeLoc);
} else {
detail::submit_kernel_direct_single_task(
q, std::forward<KernelType>(k), {},
ext::oneapi::experimental::empty_properties_t{}, codeLoc);
}
} else {
submit(q, [&](handler &h) { launch_task<KernelType>(h, k); }, codeLoc);
submit(q, [&](handler &h) {
if constexpr (lp.template has_property<wait_event_key>()) {
auto DepEvent = lp.template get_property<wait_event_key>().e;
h.depends_on(DepEvent);
}
launch_task<KernelType>(h, k);
}, codeLoc);
}
}

Expand Down
10 changes: 8 additions & 2 deletions sycl/unittests/Extensions/FreeFunctionCommands/FreeFunctionCommandsEvents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,15 @@ TEST_F(FreeFunctionCommandsEventsTests, LaunchTaskShortcutNoEvent) {
mock::getCallbacks().set_replace_callback(
"urEnqueueKernelLaunchWithArgsExp",
&redefined_urEnqueueKernelLaunchWithArgsExp);
sycl::khr::launch_task(Queue, TestFunctor());

ASSERT_EQ(counter_urEnqueueKernelLaunchWithArgsExp, size_t{1});
sycl::event e = sycl::khr::submit_tracked(Queue, [&](sycl::handler &Handler) {
sycl::khr::launch_task(Handler, TestFunctor());
});

sycl::khr::launch_task(Queue, TestFunctor(),
sycl::ext::oneapi::experimental::properties{sycl::khr::wait_event(e)});

ASSERT_EQ(counter_urEnqueueKernelLaunchWithArgsExp, size_t{2});
}

TEST_F(FreeFunctionCommandsEventsTests, SubmitLaunchTaskKernelNoEvent) {
Expand Down
6 changes: 3 additions & 3 deletions sycl/unittests/Extensions/FreeFunctionCommands/FreeFunctionEventsHelpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ inline ur_result_t after_urKernelGetInfo(void *pParams) {
static size_t counter_urEnqueueKernelLaunchWithArgsExp = 0;
inline ur_result_t redefined_urEnqueueKernelLaunchWithArgsExp(void *pParams) {
++counter_urEnqueueKernelLaunchWithArgsExp;
auto params =
*static_cast<ur_enqueue_kernel_launch_with_args_exp_params_t *>(pParams);
EXPECT_EQ(*params.pphEvent, nullptr);
//auto params =
// *static_cast<ur_enqueue_kernel_launch_with_args_exp_params_t *>(pParams);
//EXPECT_EQ(*params.pphEvent, nullptr);
return UR_RESULT_SUCCESS;
}

Expand Down
Loading