Skip to content

[SYCL] Make image constructor notification pass reference optional #10419

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
steffenlarsen merged 2 commits into from
Jul 18, 2023
Merged

[SYCL] Make image constructor notification pass reference optional #10419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50a0568
[SYCL] Make image constructor notification pass reference optional
steffenlarsen Jul 17, 2023
b62f47b
Add Windows symbols
steffenlarsen Jul 17, 2023
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
11 changes: 6 additions & 5 deletions sycl/include/sycl/accessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,14 @@ void __SYCL_EXPORT constructorNotification(void *BufferObj, void *AccessorObj,
const code_location &CodeLoc);

void __SYCL_EXPORT unsampledImageConstructorNotification(
void *ImageObj, void *AccessorObj, std::optional<image_target> Target,
access::mode Mode, const void *Type, uint32_t ElemSize,
const code_location &CodeLoc);
void *ImageObj, void *AccessorObj,
const std::optional<image_target> &Target, access::mode Mode,
const void *Type, uint32_t ElemSize, const code_location &CodeLoc);

void __SYCL_EXPORT sampledImageConstructorNotification(
void *ImageObj, void *AccessorObj, std::optional<image_target> Target,
const void *Type, uint32_t ElemSize, const code_location &CodeLoc);
void *ImageObj, void *AccessorObj,
const std::optional<image_target> &Target, const void *Type,
uint32_t ElemSize, const code_location &CodeLoc);

template <typename T>
using IsPropertyListT = typename std::is_base_of<PropertyListBase, T>;
Expand Down
17 changes: 8 additions & 9 deletions sycl/source/detail/accessor_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ void constructorNotification(void *BufferObj, void *AccessorObj,
BufferObj, AccessorObj, (uint32_t)Target, (uint32_t)Mode, CodeLoc);
}

void unsampledImageConstructorNotification(void *ImageObj, void *AccessorObj,
std::optional<image_target> Target,
access::mode Mode, const void *Type,
uint32_t ElemSize,
const code_location &CodeLoc) {
void unsampledImageConstructorNotification(
void *ImageObj, void *AccessorObj,
const std::optional<image_target> &Target, access::mode Mode,
const void *Type, uint32_t ElemSize, const code_location &CodeLoc) {
if (Target)
XPTIRegistry::unsampledImageAccessorNotification(
ImageObj, AccessorObj, (uint32_t)*Target, (uint32_t)Mode, Type,
Expand All @@ -69,10 +68,10 @@ void unsampledImageConstructorNotification(void *ImageObj, void *AccessorObj,
ImageObj, AccessorObj, (uint32_t)Mode, Type, ElemSize, CodeLoc);
}

void sampledImageConstructorNotification(void *ImageObj, void *AccessorObj,
std::optional<image_target> Target,
const void *Type, uint32_t ElemSize,
const code_location &CodeLoc) {
void sampledImageConstructorNotification(
void *ImageObj, void *AccessorObj,
const std::optional<image_target> &Target, const void *Type,
uint32_t ElemSize, const code_location &CodeLoc) {
if (Target)
XPTIRegistry::sampledImageAccessorNotification(
ImageObj, AccessorObj, (uint32_t)*Target, Type, ElemSize, CodeLoc);
Expand Down
10 changes: 5 additions & 5 deletions sycl/test/abi/sycl_symbols_linux.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3851,9 +3851,9 @@ _ZN4sycl3_V16detail13MemoryManager20allocateMemSubBufferESt10shared_ptrINS1_12co
_ZN4sycl3_V16detail13MemoryManager21copy_to_device_globalEPKvbSt10shared_ptrINS1_10queue_implEEmmS4_RKSt6vectorIP9_pi_eventSaISA_EEPSA_
_ZN4sycl3_V16detail13MemoryManager23copy_from_device_globalEPKvbSt10shared_ptrINS1_10queue_implEEmmPvRKSt6vectorIP9_pi_eventSaISB_EEPSB_
_ZN4sycl3_V16detail13MemoryManager24allocateInteropMemObjectESt10shared_ptrINS1_12context_implEEPvRKS3_INS1_10event_implEERKS5_RKNS0_13property_listERP9_pi_event
_ZN4sycl3_V16detail13MemoryManager29ext_oneapi_copyD2D_cmd_bufferESt10shared_ptrINS1_12context_implEEP22_pi_ext_command_bufferPNS1_11SYCLMemObjIEPvjNS0_5rangeILi3EEESC_NS0_2idILi3EEEjSA_jSC_SC_SE_jSt6vectorIjSaIjEEPj
_ZN4sycl3_V16detail13MemoryManager29ext_oneapi_copyD2H_cmd_bufferESt10shared_ptrINS1_12context_implEEP22_pi_ext_command_bufferPNS1_11SYCLMemObjIEPvjNS0_5rangeILi3EEESC_NS0_2idILi3EEEjPcjSC_SE_jSt6vectorIjSaIjEEPj
_ZN4sycl3_V16detail13MemoryManager29ext_oneapi_copyH2D_cmd_bufferESt10shared_ptrINS1_12context_implEEP22_pi_ext_command_bufferPNS1_11SYCLMemObjIEPcjNS0_5rangeILi3EEENS0_2idILi3EEEjPvjSC_SC_SE_jSt6vectorIjSaIjEEPj
_ZN4sycl3_V16detail13MemoryManager29ext_oneapi_copyD2D_cmd_bufferESt10shared_ptrINS1_12context_implEEP22_pi_ext_command_bufferPNS1_11SYCLMemObjIEPvjNS0_5rangeILi3EEESC_NS0_2idILi3EEEjSA_jSC_SC_SE_jSt6vectorIjSaIjEEPj
_ZN4sycl3_V16detail13MemoryManager30ext_oneapi_copy_usm_cmd_bufferESt10shared_ptrINS1_12context_implEEPKvP22_pi_ext_command_buffermPvSt6vectorIjSaIjEEPj
_ZN4sycl3_V16detail13MemoryManager3mapEPNS1_11SYCLMemObjIEPvSt10shared_ptrINS1_10queue_implEENS0_6access4modeEjNS0_5rangeILi3EEESC_NS0_2idILi3EEEjSt6vectorIP9_pi_eventSaISH_EERSH_
_ZN4sycl3_V16detail13MemoryManager4copyEPNS1_11SYCLMemObjIEPvSt10shared_ptrINS1_10queue_implEEjNS0_5rangeILi3EEESA_NS0_2idILi3EEEjS5_S8_jSA_SA_SC_jSt6vectorIP9_pi_eventSaISF_EERSF_
Expand Down Expand Up @@ -3948,10 +3948,10 @@ _ZN4sycl3_V16detail30UnsampledImageAccessorBaseHostC1ENS0_5rangeILi3EEENS0_6acce
_ZN4sycl3_V16detail30UnsampledImageAccessorBaseHostC2ENS0_5rangeILi3EEENS0_6access4modeEPviiNS0_2idILi3EEENS0_18image_channel_typeENS0_19image_channel_orderERKNS0_13property_listE
_ZN4sycl3_V16detail33reduGetMaxNumConcurrentWorkGroupsESt10shared_ptrINS1_10queue_implEE
_ZN4sycl3_V16detail34addHostSampledImageAccessorAndWaitEPNS1_28SampledImageAccessorImplHostE
_ZN4sycl3_V16detail35sampledImageConstructorNotificationEPvS2_St8optionalINS0_12image_targetEEPKvjRKNS1_13code_locationE
_ZN4sycl3_V16detail35sampledImageConstructorNotificationEPvS2_RKSt8optionalINS0_12image_targetEEPKvjRKNS1_13code_locationE
_ZN4sycl3_V16detail36addHostUnsampledImageAccessorAndWaitEPNS1_30UnsampledImageAccessorImplHostE
_ZN4sycl3_V16detail36get_empty_interop_kernel_bundle_implERKNS0_7contextERKSt6vectorINS0_6deviceESaIS6_EE
_ZN4sycl3_V16detail37unsampledImageConstructorNotificationEPvS2_St8optionalINS0_12image_targetEENS0_6access4modeEPKvjRKNS1_13code_locationE
_ZN4sycl3_V16detail37unsampledImageConstructorNotificationEPvS2_RKSt8optionalINS0_12image_targetEENS0_6access4modeEPKvjRKNS1_13code_locationE
_ZN4sycl3_V16detail6OSUtil10getDirNameB5cxx11EPKc
_ZN4sycl3_V16detail6OSUtil11alignedFreeEPv
_ZN4sycl3_V16detail6OSUtil12alignedAllocEmm
Expand Down Expand Up @@ -4189,8 +4189,8 @@ _ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext5intel4info6device25gpu_eu_co
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext5intel4info6device25max_compute_queue_indicesEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext5intel4info6device4uuidEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext5intel4info6device9device_idEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext6oneapi12experimental4info6device13graph_supportEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext6oneapi12experimental4info6device12architectureEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext6oneapi12experimental4info6device13graph_supportEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext6oneapi12experimental4info6device15max_work_groupsILi1EEEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext6oneapi12experimental4info6device15max_work_groupsILi2EEEEENT_11return_typeEv
_ZNK4sycl3_V16detail11device_impl8get_infoINS0_3ext6oneapi12experimental4info6device15max_work_groupsILi3EEEEENT_11return_typeEv
Expand Down Expand Up @@ -4362,8 +4362,8 @@ _ZNK4sycl3_V16device8get_infoINS0_3ext5intel4info6device25gpu_eu_count_per_subsl
_ZNK4sycl3_V16device8get_infoINS0_3ext5intel4info6device25max_compute_queue_indicesEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext5intel4info6device4uuidEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext5intel4info6device9device_idEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext6oneapi12experimental4info6device13graph_supportEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext6oneapi12experimental4info6device12architectureEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext6oneapi12experimental4info6device13graph_supportEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext6oneapi12experimental4info6device15max_work_groupsILi1EEEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext6oneapi12experimental4info6device15max_work_groupsILi2EEEEENS0_6detail19is_device_info_descIT_E11return_typeEv
_ZNK4sycl3_V16device8get_infoINS0_3ext6oneapi12experimental4info6device15max_work_groupsILi3EEEEENS0_6detail19is_device_info_descIT_E11return_typeEv
Expand Down
4 changes: 2 additions & 2 deletions sycl/test/abi/sycl_symbols_windows.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@
?reset@filter_selector@oneapi@ext@_V1@sycl@@QEBAXXZ
?resize@AccessorImplHost@detail@_V1@sycl@@QEAAX_K@Z
?resize@buffer_impl@detail@_V1@sycl@@QEAAX_K@Z
?sampledImageConstructorNotification@detail@_V1@sycl@@YAXPEAX0V?$optional@W4image_target@_V1@sycl@@@std@@PEBXIAEBUcode_location@123@@Z
?sampledImageConstructorNotification@detail@_V1@sycl@@YAXPEAX0AEBV?$optional@W4image_target@_V1@sycl@@@std@@PEBXIAEBUcode_location@123@@Z
?sampledImageConstructorNotification@image_plain@detail@_V1@sycl@@IEAAXAEBUcode_location@234@PEAXPEBXIQEA_KW4image_format@34@AEBUimage_sampler@34@@Z
?sampledImageConstructorNotification@image_impl@detail@_V1@sycl@@QEAAXAEBUcode_location@234@PEAXPEBXIQEA_KW4image_format@34@AEBUimage_sampler@34@@Z
?sampledImageDestructorNotification@image_plain@detail@_V1@sycl@@IEAAXPEAX@Z
Expand Down Expand Up @@ -4941,7 +4941,7 @@
?throwIfActionIsCreated@handler@_V1@sycl@@AEAAXXZ
?throw_asynchronous@queue@_V1@sycl@@QEAAXXZ
?unmap@MemoryManager@detail@_V1@sycl@@SAXPEAVSYCLMemObjI@234@PEAXV?$shared_ptr@Vqueue_impl@detail@_V1@sycl@@@std@@1V?$vector@PEAU_pi_event@@V?$allocator@PEAU_pi_event@@@std@@@7@AEAPEAU_pi_event@@@Z
?unsampledImageConstructorNotification@detail@_V1@sycl@@YAXPEAX0V?$optional@W4image_target@_V1@sycl@@@std@@W4mode@access@23@PEBXIAEBUcode_location@123@@Z
?unsampledImageConstructorNotification@detail@_V1@sycl@@YAXPEAX0AEBV?$optional@W4image_target@_V1@sycl@@@std@@W4mode@access@23@PEBXIAEBUcode_location@123@@Z
?unsampledImageConstructorNotification@image_impl@detail@_V1@sycl@@QEAAXAEBUcode_location@234@PEAXPEBXIQEA_KW4image_format@34@@Z
?unsampledImageConstructorNotification@image_plain@detail@_V1@sycl@@IEAAXAEBUcode_location@234@PEAXPEBXIQEA_KW4image_format@34@@Z
?unsampledImageDestructorNotification@image_impl@detail@_V1@sycl@@QEAAXPEAX@Z
Expand Down