Skip to content

Commit a9317cc

Browse files
committed
[SYCL][ABI-Break] Drop legacy overload of queue::mem_advice
We made a mistake several years ago by introducing `pi_mem_advice` argument into a public interface in intel#1239. This mistake was caught a year later and addressed in intel#4100, but unfortunately instead of removing this incorrect overload, it was deprecated. Even deprectation was done improperly, because this method is *not* deprecated in SYCL 2020 - it *doesn't exists* in SYCL 2020. This PR removes the method completely, even though our messaging was wrong. The assumption is that there are no actual users who went and used undocumented non-public `pi_mem_advice` in their codebases.
1 parent d814b4a commit a9317cc

File tree

4 files changed

+0
-21
lines changed

4 files changed

+0
-21
lines changed

sycl/include/sycl/queue.hpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <sycl/detail/info_desc_helpers.hpp> // for is_queue_info_...
2424
#include <sycl/detail/kernel_desc.hpp> // for KernelInfo
2525
#include <sycl/detail/owner_less_base.hpp> // for OwnerLessBase
26-
#include <sycl/detail/pi.h> // for pi_mem_advice
2726
#include <sycl/device.hpp> // for device
2827
#include <sycl/device_selector.hpp> // for device_selector
2928
#include <sycl/event.hpp> // for event
@@ -687,18 +686,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
687686
return this->memcpy(Dest, Src, Count * sizeof(T), DepEvents);
688687
}
689688

690-
/// Provides additional information to the underlying runtime about how
691-
/// different allocations are used.
692-
///
693-
/// \param Ptr is a USM pointer to the allocation.
694-
/// \param Length is a number of bytes in the allocation.
695-
/// \param Advice is a device-defined advice for the specified allocation.
696-
/// \return an event representing advice operation.
697-
__SYCL2020_DEPRECATED("use the overload with int Advice instead")
698-
event mem_advise(
699-
const void *Ptr, size_t Length, pi_mem_advice Advice,
700-
const detail::code_location &CodeLoc = detail::code_location::current());
701-
702689
/// Provides additional information to the underlying runtime about how
703690
/// different allocations are used.
704691
///

sycl/source/queue.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,6 @@ event queue::memcpy(void *Dest, const void *Src, size_t Count,
140140
/*CallerNeedsEvent=*/true, CodeLoc);
141141
}
142142

143-
event queue::mem_advise(const void *Ptr, size_t Length, pi_mem_advice Advice,
144-
const detail::code_location &CodeLoc) {
145-
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
146-
return mem_advise(Ptr, Length, int(Advice));
147-
}
148-
149143
event queue::mem_advise(const void *Ptr, size_t Length, int Advice,
150144
const detail::code_location &CodeLoc) {
151145
detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);

sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3124,7 +3124,6 @@ _ZN4sycl3_V15eventC1Ev
31243124
_ZN4sycl3_V15eventC2EP9_cl_eventRKNS0_7contextE
31253125
_ZN4sycl3_V15eventC2ESt10shared_ptrINS0_6detail10event_implEE
31263126
_ZN4sycl3_V15eventC2Ev
3127-
_ZN4sycl3_V15queue10mem_adviseEPKvm14_pi_mem_adviceRKNS0_6detail13code_locationE
31283127
_ZN4sycl3_V15queue10mem_adviseEPKvmiNS0_5eventERKNS0_6detail13code_locationE
31293128
_ZN4sycl3_V15queue10mem_adviseEPKvmiRKNS0_6detail13code_locationE
31303129
_ZN4sycl3_V15queue10mem_adviseEPKvmiRKSt6vectorINS0_5eventESaIS5_EERKNS0_6detail13code_locationE

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4151,7 +4151,6 @@
41514151
?mem_advise@queue@_V1@sycl@@QEAA?AVevent@23@PEBX_KHAEBUcode_location@detail@23@@Z
41524152
?mem_advise@queue@_V1@sycl@@QEAA?AVevent@23@PEBX_KHAEBV?$vector@Vevent@_V1@sycl@@V?$allocator@Vevent@_V1@sycl@@@std@@@std@@AEBUcode_location@detail@23@@Z
41534153
?mem_advise@queue@_V1@sycl@@QEAA?AVevent@23@PEBX_KHV423@AEBUcode_location@detail@23@@Z
4154-
?mem_advise@queue@_V1@sycl@@QEAA?AVevent@23@PEBX_KW4_pi_mem_advice@@AEBUcode_location@detail@23@@Z
41554154
?memcpy@experimental@oneapi@ext@_V1@sycl@@YAXVqueue@45@PEAXPEBX_KAEBUcode_location@detail@45@@Z
41564155
?memcpy@handler@_V1@sycl@@QEAAXPEAXPEBX_K@Z
41574156
?memcpy@queue@_V1@sycl@@QEAA?AVevent@23@PEAXPEBX_KAEBUcode_location@detail@23@@Z

0 commit comments

Comments
 (0)