Skip to content

[SYCL] Prioritize set kernels over lookup #18157

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

Merged
merged 1 commit into from
Apr 23, 2025
Merged

[SYCL] Prioritize set kernels over lookup #18157

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
16 changes: 8 additions & 8 deletions sycl/source/detail/graph_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,18 +1474,18 @@ void exec_graph_impl::populateURKernelUpdateStructs(
ur_kernel_handle_t UrKernel = nullptr;
auto Kernel = ExecCG.MSyclKernel;
auto KernelBundleImplPtr = ExecCG.MKernelBundle;
std::shared_ptr<sycl::detail::kernel_impl> SyclKernelImpl = nullptr;
const sycl::detail::KernelArgMask *EliminatedArgMask = nullptr;

if (auto SyclKernelImpl = KernelBundleImplPtr
? KernelBundleImplPtr->tryGetKernel(
ExecCG.MKernelName, KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr}) {
UrKernel = SyclKernelImpl->getHandleRef();
EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
} else if (Kernel != nullptr) {
if (Kernel != nullptr) {
UrKernel = Kernel->getHandleRef();
EliminatedArgMask = Kernel->getKernelArgMask();
} else if (auto SyclKernelImpl =
KernelBundleImplPtr
? KernelBundleImplPtr->tryGetKernel(ExecCG.MKernelName,
KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr}) {
UrKernel = SyclKernelImpl->getHandleRef();
EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
} else {
ur_program_handle_t UrProgram = nullptr;
std::tie(UrKernel, std::ignore, EliminatedArgMask, UrProgram) =
Expand Down
14 changes: 7 additions & 7 deletions sycl/source/detail/helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ retrieveKernelBinary(const QueueImplPtr &Queue, const char *KernelName,
const RTDeviceBinaryImage *DeviceImage = nullptr;
ur_program_handle_t Program = nullptr;
auto KernelBundleImpl = KernelCG->getKernelBundle();
if (auto SyclKernelImpl =
KernelBundleImpl
? KernelBundleImpl->tryGetKernel(KernelName, KernelBundleImpl)
: std::shared_ptr<kernel_impl>{nullptr}) {
if (KernelCG->MSyclKernel != nullptr) {
DeviceImage = KernelCG->MSyclKernel->getDeviceImage()->get_bin_image_ref();
Program = KernelCG->MSyclKernel->getDeviceImage()->get_ur_program_ref();
} else if (auto SyclKernelImpl =
KernelBundleImpl ? KernelBundleImpl->tryGetKernel(
KernelName, KernelBundleImpl)
: std::shared_ptr<kernel_impl>{nullptr}) {
// Retrieve the device image from the kernel bundle.
DeviceImage = SyclKernelImpl->getDeviceImage()->get_bin_image_ref();
Program = SyclKernelImpl->getDeviceImage()->get_ur_program_ref();
} else if (KernelCG->MSyclKernel != nullptr) {
DeviceImage = KernelCG->MSyclKernel->getDeviceImage()->get_bin_image_ref();
Program = KernelCG->MSyclKernel->getDeviceImage()->get_ur_program_ref();
} else {
auto ContextImpl = Queue->getContextImplPtr();
auto DeviceImpl = Queue->getDeviceImplPtr();
Expand Down
54 changes: 27 additions & 27 deletions sycl/source/detail/scheduler/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1997,16 +1997,16 @@ void instrumentationAddExtraKernelMetadata(
std::mutex *KernelMutex = nullptr;
const KernelArgMask *EliminatedArgMask = nullptr;

if (auto SyclKernelImpl = KernelBundleImplPtr
? KernelBundleImplPtr->tryGetKernel(
KernelName, KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr}) {
EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
Program = SyclKernelImpl->getDeviceImage()->get_ur_program_ref();
} else if (nullptr != SyclKernel) {
if (nullptr != SyclKernel) {
Program = SyclKernel->getProgramRef();
if (!SyclKernel->isCreatedFromSource())
EliminatedArgMask = SyclKernel->getKernelArgMask();
} else if (auto SyclKernelImpl =
KernelBundleImplPtr ? KernelBundleImplPtr->tryGetKernel(
KernelName, KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr}) {
EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
Program = SyclKernelImpl->getDeviceImage()->get_ur_program_ref();
} else if (Queue) {
// NOTE: Queue can be null when kernel is directly enqueued to a command
// buffer
Expand Down Expand Up @@ -2521,17 +2521,17 @@ getCGKernelInfo(const CGExecKernel &CommandGroup, ContextImplPtr ContextImpl,
const KernelArgMask *EliminatedArgMask = nullptr;
auto &KernelBundleImplPtr = CommandGroup.MKernelBundle;

if (auto SyclKernelImpl =
KernelBundleImplPtr
? KernelBundleImplPtr->tryGetKernel(CommandGroup.MKernelName,
KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr}) {
if (auto Kernel = CommandGroup.MSyclKernel; Kernel != nullptr) {
UrKernel = Kernel->getHandleRef();
EliminatedArgMask = Kernel->getKernelArgMask();
} else if (auto SyclKernelImpl =
KernelBundleImplPtr
? KernelBundleImplPtr->tryGetKernel(
CommandGroup.MKernelName, KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr}) {
UrKernel = SyclKernelImpl->getHandleRef();
DeviceImageImpl = SyclKernelImpl->getDeviceImage();
EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
} else if (auto Kernel = CommandGroup.MSyclKernel; Kernel != nullptr) {
UrKernel = Kernel->getHandleRef();
EliminatedArgMask = Kernel->getKernelArgMask();
} else {
ur_program_handle_t UrProgram = nullptr;
std::tie(UrKernel, std::ignore, EliminatedArgMask, UrProgram) =
Expand Down Expand Up @@ -2678,18 +2678,7 @@ void enqueueImpKernel(
std::shared_ptr<kernel_impl> SyclKernelImpl;
std::shared_ptr<device_image_impl> DeviceImageImpl;

if ((SyclKernelImpl = KernelBundleImplPtr
? KernelBundleImplPtr->tryGetKernel(
KernelName, KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr})) {
Kernel = SyclKernelImpl->getHandleRef();
DeviceImageImpl = SyclKernelImpl->getDeviceImage();

Program = DeviceImageImpl->get_ur_program_ref();

EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
KernelMutex = SyclKernelImpl->getCacheMutex();
} else if (nullptr != MSyclKernel) {
if (nullptr != MSyclKernel) {
assert(MSyclKernel->get_info<info::kernel::context>() ==
Queue->get_context());
Kernel = MSyclKernel->getHandleRef();
Expand All @@ -2703,6 +2692,17 @@ void enqueueImpKernel(
// their duplication in such cases.
KernelMutex = &MSyclKernel->getNoncacheableEnqueueMutex();
EliminatedArgMask = MSyclKernel->getKernelArgMask();
} else if ((SyclKernelImpl = KernelBundleImplPtr
? KernelBundleImplPtr->tryGetKernel(
KernelName, KernelBundleImplPtr)
: std::shared_ptr<kernel_impl>{nullptr})) {
Kernel = SyclKernelImpl->getHandleRef();
DeviceImageImpl = SyclKernelImpl->getDeviceImage();

Program = DeviceImageImpl->get_ur_program_ref();

EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
KernelMutex = SyclKernelImpl->getCacheMutex();
} else {
std::tie(Kernel, KernelMutex, EliminatedArgMask, Program) =
detail::ProgramManager::getInstance().getOrCreateKernel(
Expand Down