Skip to content

[ABI-Break][SYCL] Drop MAssertHappenedBuffer field in queue_impl #13191

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 1, 2024
Merged

[ABI-Break][SYCL] Drop MAssertHappenedBuffer field in queue_impl #13191

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
4 changes: 0 additions & 4 deletions sycl/include/sycl/queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2886,10 +2886,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
Rest...);
}

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
buffer<detail::AssertHappened, 1> &getAssertHappenedBuffer();
#endif

event memcpyToDeviceGlobal(void *DeviceGlobalPtr, const void *Src,
bool IsDeviceImageScope, size_t NumBytes,
size_t Offset,
Expand Down
20 changes: 0 additions & 20 deletions sycl/source/detail/queue_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@ class queue_impl {
const async_handler &AsyncHandler, const property_list &PropList)
: MDevice(Device), MContext(Context), MAsyncHandler(AsyncHandler),
MPropList(PropList), MHostQueue(MDevice->is_host()),
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
MAssertHappenedBuffer(range<1>{1}),
#endif
MIsInorder(has_property<property::queue::in_order>()),
MDiscardEvents(
has_property<ext::oneapi::property::queue::discard_events>()),
Expand Down Expand Up @@ -291,9 +288,6 @@ class queue_impl {
queue_impl(sycl::detail::pi::PiQueue PiQueue, const ContextImplPtr &Context,
const async_handler &AsyncHandler)
: MContext(Context), MAsyncHandler(AsyncHandler), MHostQueue(false),
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
MAssertHappenedBuffer(range<1>{1}),
#endif
MIsInorder(has_property<property::queue::in_order>()),
MDiscardEvents(
has_property<ext::oneapi::property::queue::discard_events>()),
Expand All @@ -316,9 +310,6 @@ class queue_impl {
const async_handler &AsyncHandler, const property_list &PropList)
: MContext(Context), MAsyncHandler(AsyncHandler), MPropList(PropList),
MHostQueue(false),
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
MAssertHappenedBuffer(range<1>{1}),
#endif
MIsInorder(has_property<property::queue::in_order>()),
MDiscardEvents(
has_property<ext::oneapi::property::queue::discard_events>()),
Expand Down Expand Up @@ -688,12 +679,6 @@ class queue_impl {
/// \return a native handle.
pi_native_handle getNative(int32_t &NativeHandleDesc) const;

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
buffer<AssertHappened, 1> &getAssertHappenedBuffer() {
return MAssertHappenedBuffer;
}
#endif

void registerStreamServiceEvent(const EventImplPtr &Event) {
std::lock_guard<std::mutex> Lock(MStreamsServiceEventsMutex);
MStreamsServiceEvents.push_back(Event);
Expand Down Expand Up @@ -934,11 +919,6 @@ class queue_impl {
/// need to emulate it with multiple native in-order queues.
bool MEmulateOOO = false;

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
// Buffer to store assert failure descriptor
buffer<AssertHappened, 1> MAssertHappenedBuffer;
#endif

// This event is employed for enhanced dependency tracking with in-order queue
// Access to the event should be guarded with MMutex
EventImplPtr MLastEventPtr;
Expand Down
6 changes: 0 additions & 6 deletions sycl/source/queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,6 @@ pi_native_handle queue::getNative(int32_t &NativeHandleDesc) const {
return impl->getNative(NativeHandleDesc);
}

#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
buffer<detail::AssertHappened, 1> &queue::getAssertHappenedBuffer() {
return impl->getAssertHappenedBuffer();
}
#endif

event queue::memcpyToDeviceGlobal(void *DeviceGlobalPtr, const void *Src,
bool IsDeviceImageScope, size_t NumBytes,
size_t Offset,
Expand Down
1 change: 0 additions & 1 deletion sycl/test/abi/sycl_symbols_linux.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3793,7 +3793,6 @@ _ZN4sycl3_V15queue18throw_asynchronousEv
_ZN4sycl3_V15queue20memcpyToDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE
_ZN4sycl3_V15queue20wait_and_throw_proxyERKNS0_6detail13code_locationE
_ZN4sycl3_V15queue22memcpyFromDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE
_ZN4sycl3_V15queue23getAssertHappenedBufferEv
_ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKNS0_6detail13code_locationE
_ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKSt6vectorINS0_5eventESaIS3_EERKNS0_6detail13code_locationE
_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEE
Expand Down
1 change: 0 additions & 1 deletion sycl/test/abi/sycl_symbols_windows.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,6 @@
?getAccData@UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAUAccHostDataT@234@XZ
?getAccessRange@AccessorBaseHost@detail@_V1@sycl@@QEAAAEAV?$range@$02@34@XZ
?getAccessRange@AccessorBaseHost@detail@_V1@sycl@@QEBAAEBV?$range@$02@34@XZ
?getAssertHappenedBuffer@queue@_V1@sycl@@AEAAAEAV?$buffer@UAssertHappened@detail@_V1@sycl@@$00V?$aligned_allocator@UAssertHappened@detail@_V1@sycl@@@234@X@23@XZ
?getBorderColor@detail@_V1@sycl@@YA?AV?$vec@M$03@23@W4image_channel_order@23@@Z
?getBufSizeForContext@SYCLMemObjT@detail@_V1@sycl@@SA_KAEBV?$shared_ptr@Vcontext_impl@detail@_V1@sycl@@@std@@_K@Z
?getChannelOrder@SampledImageAccessorBaseHost@detail@_V1@sycl@@QEBA?AW4image_channel_order@34@XZ
Expand Down