Skip to content

[SYCL][ABI-break] Make MGraph a member of interop_handle #20768

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
Dec 1, 2025
Merged

[SYCL][ABI-break] Make MGraph a member of interop_handle #20768

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
17 changes: 2 additions & 15 deletions sycl/include/sycl/interop_handle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,18 +215,9 @@ class interop_handle {
const std::shared_ptr<detail::queue_impl> &Queue,
const std::shared_ptr<detail::device_impl> &Device,
const std::shared_ptr<detail::context_impl> &Context,
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
[[maybe_unused]]
#endif
ur_exp_command_buffer_handle_t Graph = nullptr)
: MQueue(Queue), MDevice(Device), MContext(Context),
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
// CMPLRLLVM-66082 - MGraph should become a member of this class on the
// next ABI breaking window.
MGraph(Graph),
#endif
MMemObjs(std::move(MemObjs)) {
}
: MQueue(Queue), MDevice(Device), MContext(Context), MGraph(Graph),
MMemObjs(std::move(MemObjs)) {}

template <backend Backend, typename DataT, int Dims>
backend_return_t<Backend, buffer<DataT, Dims>>
Expand Down Expand Up @@ -254,11 +245,7 @@ class interop_handle {
std::shared_ptr<detail::queue_impl> MQueue;
std::shared_ptr<detail::device_impl> MDevice;
std::shared_ptr<detail::context_impl> MContext;
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
// CMPLRLLVM-66082 - MGraph should become a member of this class on the
// next ABI breaking window.
ur_exp_command_buffer_handle_t MGraph;
#endif

std::vector<ReqToMem> MMemObjs;
};
Expand Down
13 changes: 0 additions & 13 deletions sycl/source/detail/queue_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,19 +689,6 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
return ResEvent;
}

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// CMPLRLLVM-66082
// These methods are for accessing a member that should live in the
// sycl::interop_handle class and will be moved on next ABI breaking window.
ur_exp_command_buffer_handle_t getInteropGraph() const {
return MInteropGraph;
}

void setInteropGraph(ur_exp_command_buffer_handle_t Graph) {
MInteropGraph = Graph;
}
#endif

/// Returns the async_handler associated with the queue.
const async_handler &getAsynchHandler() const noexcept {
return MAsyncHandler;
Expand Down
13 changes: 0 additions & 13 deletions sycl/source/detail/scheduler/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3169,25 +3169,12 @@ ur_result_t ExecCGCommand::enqueueImpCommandBuffer() {
CommandBufferNativeCommandData CustomOpData{
std::move(IH), HostTask->MHostTask->MInteropTask};

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// CMPLRLLVM-66082
// The native command-buffer should be a member of the sycl::interop_handle
// class, but it is in an ABI breaking change to add it. So member lives in
// the queue as a intermediate workaround.
MQueue->setInteropGraph(InteropCommandBuffer);
#endif

Adapter.call<UrApiKind::urCommandBufferAppendNativeCommandExp>(
MCommandBuffer, CommandBufferInteropFreeFunc, &CustomOpData,
ChildCommandBuffer, MSyncPointDeps.size(),
MSyncPointDeps.empty() ? nullptr : MSyncPointDeps.data(),
&OutSyncPoint);

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// See CMPLRLLVM-66082
MQueue->setInteropGraph(nullptr);
#endif

if (ChildCommandBuffer) {
ur_result_t Res =
Adapter
Expand Down
12 changes: 0 additions & 12 deletions sycl/source/interop_handle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,7 @@ backend interop_handle::get_backend() const noexcept {
}

bool interop_handle::ext_codeplay_has_graph() const noexcept {
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
// CMPLRLLVM-66082 - MGraph should become a member of this class on the
// next ABI breaking window.
return MGraph != nullptr;
#else
return MQueue->getInteropGraph() != nullptr;
#endif
}

ur_native_handle_t
Expand Down Expand Up @@ -66,13 +60,7 @@ interop_handle::getNativeQueue(int32_t &NativeHandleDesc) const {
}

ur_native_handle_t interop_handle::getNativeGraph() const {
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
// CMPLRLLVM-66082 - MGraph should become a member of this class on the
// next ABI breaking window.
auto Graph = MGraph;
#else
auto Graph = MQueue->getInteropGraph();
#endif

if (!Graph) {
throw exception(
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/cuda_explicit_usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} -o %t.out %cuda_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %cuda_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-nvidia, cuda_dev_kit

#include <cuda.h>
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/cuda_multiple_native_commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} -o %t.out %cuda_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %cuda_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-nvidia, cuda_dev_kit
// REQUIRES: aspect-usm_shared_allocations

Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/cuda_record_async_malloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} -o %t.out %cuda_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %cuda_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-nvidia, cuda_dev_kit

#include <cuda.h>
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/cuda_record_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} -o %t.out %cuda_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %cuda_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-nvidia, cuda_dev_kit

#include <cuda.h>
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/cuda_record_usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} -o %t.out %cuda_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %cuda_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-nvidia, cuda_dev_kit

#include <cuda.h>
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/hip_explicit_usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out %hip_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out %hip_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-amd

#define __HIP_PLATFORM_AMD__
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/hip_record_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out %hip_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out %hip_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-amd

#define __HIP_PLATFORM_AMD__
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/hip_record_usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out %hip_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out %hip_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-amd

#define __HIP_PLATFORM_AMD__
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/invalid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-nvidia

// Test that interop_handle::ext_codeplay_get_native_graph() throws if no
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/level-zero_usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} %level_zero_options -fpreview-breaking-changes -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: level_zero, level_zero_dev_kit

// UNSUPPORTED: level_zero_v2_adapter
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/level-zero_usm_D2H_copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} %level_zero_options -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} %level_zero_options -fpreview-breaking-changes -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: level_zero, level_zero_dev_kit

// Tests that the optimization to use the L0 Copy Engine for memory commands
Expand Down
2 changes: 0 additions & 2 deletions sycl/test-e2e/Graph/NativeCommand/opencl_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %{build} -o %t.out %threads_lib %opencl_lib
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %threads_lib %opencl_lib %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: opencl, opencl_icd

#include <sycl/backend.hpp>
Expand Down
Loading