Skip to content

Commit 76837a1

Browse files
[ABI-Break][SYCL] Drop MAssertHappenedBuffer field in queue_impl (#13191)
It's been unused since #12532 awaiting ABI breaking window for the final removal.
1 parent 2da97a5 commit 76837a1

File tree

5 files changed

+0
-32
lines changed

5 files changed

+0
-32
lines changed

sycl/include/sycl/queue.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2893,10 +2893,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
28932893
Rest...);
28942894
}
28952895

2896-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
2897-
buffer<detail::AssertHappened, 1> &getAssertHappenedBuffer();
2898-
#endif
2899-
29002896
event memcpyToDeviceGlobal(void *DeviceGlobalPtr, const void *Src,
29012897
bool IsDeviceImageScope, size_t NumBytes,
29022898
size_t Offset,

sycl/source/detail/queue_impl.hpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ class queue_impl {
107107
const async_handler &AsyncHandler, const property_list &PropList)
108108
: MDevice(Device), MContext(Context), MAsyncHandler(AsyncHandler),
109109
MPropList(PropList), MHostQueue(MDevice->is_host()),
110-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
111-
MAssertHappenedBuffer(range<1>{1}),
112-
#endif
113110
MIsInorder(has_property<property::queue::in_order>()),
114111
MDiscardEvents(
115112
has_property<ext::oneapi::property::queue::discard_events>()),
@@ -291,9 +288,6 @@ class queue_impl {
291288
queue_impl(sycl::detail::pi::PiQueue PiQueue, const ContextImplPtr &Context,
292289
const async_handler &AsyncHandler)
293290
: MContext(Context), MAsyncHandler(AsyncHandler), MHostQueue(false),
294-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
295-
MAssertHappenedBuffer(range<1>{1}),
296-
#endif
297291
MIsInorder(has_property<property::queue::in_order>()),
298292
MDiscardEvents(
299293
has_property<ext::oneapi::property::queue::discard_events>()),
@@ -316,9 +310,6 @@ class queue_impl {
316310
const async_handler &AsyncHandler, const property_list &PropList)
317311
: MContext(Context), MAsyncHandler(AsyncHandler), MPropList(PropList),
318312
MHostQueue(false),
319-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
320-
MAssertHappenedBuffer(range<1>{1}),
321-
#endif
322313
MIsInorder(has_property<property::queue::in_order>()),
323314
MDiscardEvents(
324315
has_property<ext::oneapi::property::queue::discard_events>()),
@@ -694,12 +685,6 @@ class queue_impl {
694685
/// \return a native handle.
695686
pi_native_handle getNative(int32_t &NativeHandleDesc) const;
696687

697-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
698-
buffer<AssertHappened, 1> &getAssertHappenedBuffer() {
699-
return MAssertHappenedBuffer;
700-
}
701-
#endif
702-
703688
void registerStreamServiceEvent(const EventImplPtr &Event) {
704689
std::lock_guard<std::mutex> Lock(MStreamsServiceEventsMutex);
705690
MStreamsServiceEvents.push_back(Event);
@@ -940,11 +925,6 @@ class queue_impl {
940925
/// need to emulate it with multiple native in-order queues.
941926
bool MEmulateOOO = false;
942927

943-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
944-
// Buffer to store assert failure descriptor
945-
buffer<AssertHappened, 1> MAssertHappenedBuffer;
946-
#endif
947-
948928
// This event is employed for enhanced dependency tracking with in-order queue
949929
// Access to the event should be guarded with MMutex
950930
EventImplPtr MLastEventPtr;

sycl/source/queue.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,6 @@ pi_native_handle queue::getNative(int32_t &NativeHandleDesc) const {
327327
return impl->getNative(NativeHandleDesc);
328328
}
329329

330-
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
331-
buffer<detail::AssertHappened, 1> &queue::getAssertHappenedBuffer() {
332-
return impl->getAssertHappenedBuffer();
333-
}
334-
#endif
335-
336330
event queue::memcpyToDeviceGlobal(void *DeviceGlobalPtr, const void *Src,
337331
bool IsDeviceImageScope, size_t NumBytes,
338332
size_t Offset,

sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3793,7 +3793,6 @@ _ZN4sycl3_V15queue18throw_asynchronousEv
37933793
_ZN4sycl3_V15queue20memcpyToDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE
37943794
_ZN4sycl3_V15queue20wait_and_throw_proxyERKNS0_6detail13code_locationE
37953795
_ZN4sycl3_V15queue22memcpyFromDeviceGlobalEPvPKvbmmRKSt6vectorINS0_5eventESaIS6_EE
3796-
_ZN4sycl3_V15queue23getAssertHappenedBufferEv
37973796
_ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKNS0_6detail13code_locationE
37983797
_ZN4sycl3_V15queue25ext_oneapi_submit_barrierERKSt6vectorINS0_5eventESaIS3_EERKNS0_6detail13code_locationE
37993798
_ZN4sycl3_V15queue27submit_impl_and_postprocessESt8functionIFvRNS0_7handlerEEERKNS0_6detail13code_locationERKS2_IFvbbRNS0_5eventEEE

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,6 @@
11591159
?getAccData@UnsampledImageAccessorBaseHost@detail@_V1@sycl@@QEAAAEAUAccHostDataT@234@XZ
11601160
?getAccessRange@AccessorBaseHost@detail@_V1@sycl@@QEAAAEAV?$range@$02@34@XZ
11611161
?getAccessRange@AccessorBaseHost@detail@_V1@sycl@@QEBAAEBV?$range@$02@34@XZ
1162-
?getAssertHappenedBuffer@queue@_V1@sycl@@AEAAAEAV?$buffer@UAssertHappened@detail@_V1@sycl@@$00V?$aligned_allocator@UAssertHappened@detail@_V1@sycl@@@234@X@23@XZ
11631162
?getBorderColor@detail@_V1@sycl@@YA?AV?$vec@M$03@23@W4image_channel_order@23@@Z
11641163
?getBufSizeForContext@SYCLMemObjT@detail@_V1@sycl@@SA_KAEBV?$shared_ptr@Vcontext_impl@detail@_V1@sycl@@@std@@_K@Z
11651164
?getChannelOrder@SampledImageAccessorBaseHost@detail@_V1@sycl@@QEBA?AW4image_channel_order@34@XZ

0 commit comments

Comments
 (0)