Skip to content

[SYCL][ESIMD] Add more stringent compile time checks to atomic_update API #11683

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 22 commits into from
Dec 14, 2023
Merged

[SYCL][ESIMD] Add more stringent compile time checks to atomic_update API #11683

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a7f4098
Introduce more stringent checks for atomic_update API
fineg74 Oct 26, 2023
c9bfece
Merge remote-tracking branch 'origin/sycl' into accessorCheck3
fineg74 Oct 26, 2023
f2b0c38
Add additional tests for block_load/store API
fineg74 Oct 27, 2023
cc1ce4c
Merge remote-tracking branch 'origin/sycl' into accessorCheck3
fineg74 Dec 1, 2023
b4ca8fe
Update the new API with checks,
fineg74 Dec 4, 2023
9671245
Fix test failures
fineg74 Dec 4, 2023
885e963
Address PR comments
fineg74 Dec 5, 2023
c3b734a
Merge branches 'sycl', 'accessorCheck3', 'accessorCheck3' and 'access…
fineg74 Dec 6, 2023
098ac3e
Merge remote-tracking branch 'origin/sycl' into accessorCheck3
fineg74 Dec 6, 2023
b10017b
Simplify the compile time checks
fineg74 Dec 7, 2023
339e376
Merge remote-tracking branch 'origin/sycl' into accessorCheck3
fineg74 Dec 7, 2023
fea8a3d
Merge remote-tracking branch 'origin/sycl' into accessorCheck3
fineg74 Dec 8, 2023
d574160
Update sycl/include/sycl/ext/intel/esimd/memory.hpp
fineg74 Dec 8, 2023
134f11c
Update sycl/include/sycl/ext/intel/esimd/memory.hpp
fineg74 Dec 8, 2023
b55f7d4
Update sycl/include/sycl/ext/intel/esimd/memory.hpp
fineg74 Dec 8, 2023
02ce465
Update sycl/test/esimd/flat_atomic.cpp
fineg74 Dec 8, 2023
842426c
Address PR comments
fineg74 Dec 8, 2023
d8eee69
Merge branch 'accessorCheck3' of https://github.com/fineg74/llvm into…
fineg74 Dec 9, 2023
6a74b23
Revert some of the last changes
fineg74 Dec 9, 2023
15a25a4
Address PR comments
fineg74 Dec 13, 2023
c60e0a0
Fix build break
fineg74 Dec 13, 2023
0e4131c
Address PR comments
fineg74 Dec 14, 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
113 changes: 52 additions & 61 deletions sycl/include/sycl/ext/intel/esimd/memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4371,9 +4371,8 @@ __ESIMD_API std::enable_if_t<
__ESIMD_DNS::get_num_args<Op>() == 1 &&
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd_mask<N> mask,
PropertyListT props = {}) {
atomic_update(T *p, simd<Toffset, N> byte_offset, simd_view<T, RegionTy> src0,
simd_mask<N> mask, PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, byte_offset, src0.read(), mask, props);
}

Expand Down Expand Up @@ -4410,8 +4409,8 @@ __ESIMD_API std::enable_if_t<
__ESIMD_DNS::get_num_args<Op>() == 1 &&
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, PropertyListT props = {}) {
atomic_update(T *p, simd<Toffset, N> byte_offset, simd_view<T, RegionTy> src0,
PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, byte_offset, src0.read(), mask, props);
}
Expand Down Expand Up @@ -4532,7 +4531,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> offsets,
simd_view<simd<T, N>, RegionTy> src0, simd_mask<N> mask,
simd_view<T, RegionTy> src0, simd_mask<N> mask,
PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, offsets.read(), src0.read(), mask, props);
}
Expand Down Expand Up @@ -4572,7 +4571,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> offsets,
simd_view<simd<T, N>, RegionTy> src0, PropertyListT props = {}) {
simd_view<T, RegionTy> src0, PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, offsets.read(), src0.read(), mask, props);
}
Expand Down Expand Up @@ -4809,7 +4808,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset, simd<T, N> src0,
simd_view<simd<T, N>, RegionTy> src1, simd_mask<N> mask,
simd_view<T, RegionTy> src1, simd_mask<N> mask,
PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, byte_offset, src0, src1.read(), mask,
props);
Expand Down Expand Up @@ -4842,7 +4841,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset, simd<T, N> src0,
simd_view<simd<T, N>, RegionTy> src1, PropertyListT props = {}) {
simd_view<T, RegionTy> src1, PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, byte_offset, src0, src1.read(), mask,
props);
Expand Down Expand Up @@ -4877,9 +4876,8 @@ __ESIMD_API std::enable_if_t<
__ESIMD_DNS::get_num_args<Op>() == 2 &&
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd<T, N> src1,
simd_mask<N> mask, PropertyListT props = {}) {
atomic_update(T *p, simd<Toffset, N> byte_offset, simd_view<T, RegionTy> src0,
simd<T, N> src1, simd_mask<N> mask, PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, byte_offset, src0.read(), src1, mask,
props);
}
Expand Down Expand Up @@ -4910,9 +4908,8 @@ __ESIMD_API std::enable_if_t<
__ESIMD_DNS::get_num_args<Op>() == 2 &&
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd<T, N> src1,
PropertyListT props = {}) {
atomic_update(T *p, simd<Toffset, N> byte_offset, simd_view<T, RegionTy> src0,
simd<T, N> src1, PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, byte_offset, src0.read(), src1, mask,
props);
Expand Down Expand Up @@ -4946,9 +4943,8 @@ __ESIMD_API std::enable_if_t<
__ESIMD_DNS::get_num_args<Op>() == 2 &&
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0,
simd_view<simd<T, N>, RegionTy> src1, simd_mask<N> mask,
atomic_update(T *p, simd<Toffset, N> byte_offset, simd_view<T, RegionTy> src0,
simd_view<T, RegionTy> src1, simd_mask<N> mask,
PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, byte_offset, src0.read(), src1.read(), mask,
props);
Expand Down Expand Up @@ -4980,9 +4976,8 @@ __ESIMD_API std::enable_if_t<
__ESIMD_DNS::get_num_args<Op>() == 2 &&
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0,
simd_view<simd<T, N>, RegionTy> src1, PropertyListT props = {}) {
atomic_update(T *p, simd<Toffset, N> byte_offset, simd_view<T, RegionTy> src0,
simd_view<T, RegionTy> src1, PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, byte_offset, src0.read(), src1.read(), mask,
props);
Expand Down Expand Up @@ -5086,8 +5081,8 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd<T, N> src0, simd_view<simd<T, N>, RegionTy> src1,
simd_mask<N> mask, PropertyListT props = {}) {
simd<T, N> src0, simd_view<T, RegionTy> src1, simd_mask<N> mask,
PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, byte_offset.read(), src0, src1.read(), mask,
props);
}
Expand Down Expand Up @@ -5119,7 +5114,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd<T, N> src0, simd_view<simd<T, N>, RegionTy> src1,
simd<T, N> src0, simd_view<T, RegionTy> src1,
PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, byte_offset.read(), src0, src1.read(), mask,
Expand Down Expand Up @@ -5156,8 +5151,8 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd<T, N> src1,
simd_mask<N> mask, PropertyListT props = {}) {
simd_view<T, RegionTy> src0, simd<T, N> src1, simd_mask<N> mask,
PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, byte_offset.read(), src0.read(), src1, mask,
props);
}
Expand Down Expand Up @@ -5190,7 +5185,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd<T, N> src1,
simd_view<T, RegionTy> src0, simd<T, N> src1,
PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, byte_offset.read(), src0.read(), src1, mask,
Expand Down Expand Up @@ -5227,9 +5222,8 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd_view<simd<T, N>, RegionTy> src0,
simd_view<simd<T, N>, RegionTy> src1, simd_mask<N> mask,
PropertyListT props = {}) {
simd_view<T, RegionTy> src0, simd_view<T, RegionTy> src1,
simd_mask<N> mask, PropertyListT props = {}) {
return atomic_update<Op, T, N>(p, byte_offset.read(), src0.read(),
src1.read(), mask, props);
}
Expand Down Expand Up @@ -5262,8 +5256,8 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(T *p, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd_view<simd<T, N>, RegionTy> src0,
simd_view<simd<T, N>, RegionTy> src1, PropertyListT props = {}) {
simd_view<T, RegionTy> src0, simd_view<T, RegionTy> src1,
PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(p, byte_offset.read(), src0.read(),
src1.read(), mask, props);
Expand Down Expand Up @@ -5578,16 +5572,15 @@ atomic_update(AccessorTy acc, simd_view<Toffset, RegionTy> byte_offset,
/// update.
///
template <atomic_op Op, typename T, int N, typename AccessorTy,
typename RegionTy = region1d_t<uint32_t, N, 1>>
typename Toffset, typename RegionTy = region1d_t<Toffset, N, 1>>
__ESIMD_API
std::enable_if_t<__ESIMD_DNS::get_num_args<Op>() == 0 &&
detail::is_local_accessor_with_v<
AccessorTy, detail::accessor_mode_cap::can_read> &&
detail::is_local_accessor_with_v<
AccessorTy, detail::accessor_mode_cap::can_write>,
simd<T, N>>
atomic_update(AccessorTy acc,
simd_view<simd<uint32_t, N>, RegionTy> byte_offset,
atomic_update(AccessorTy acc, simd_view<Toffset, RegionTy> byte_offset,
simd_mask<N> mask) {
return atomic_update<Op, T, N>(acc, byte_offset.read(), mask);
}
Expand Down Expand Up @@ -5867,8 +5860,8 @@ atomic_update(AccessorTy acc, simd<Toffset, N> byte_offset, simd<T, N> src0,
/// @return A vector of the old values at the memory locations before the
/// update.
///
template <atomic_op Op, typename T, int N, typename Toffset,
typename RegionTy = region1d_t<T, N, 1>, typename AccessorTy,
template <atomic_op Op, typename T, int N, typename Toffset, typename Tsrc,
typename RegionTy = region1d_t<Tsrc, N, 1>, typename AccessorTy,
typename PropertyListT =
ext::oneapi::experimental::detail::empty_properties_t>
__ESIMD_API std::enable_if_t<
Expand All @@ -5880,7 +5873,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(AccessorTy acc, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd_mask<N> mask,
simd_view<Tsrc, RegionTy> src0, simd_mask<N> mask,
PropertyListT props = {}) {
return atomic_update<Op, T, N>(acc, byte_offset, src0.read(), mask, props);
}
Expand Down Expand Up @@ -5918,8 +5911,8 @@ atomic_update(AccessorTy acc, simd<Toffset, N> byte_offset,
/// @return A vector of the old values at the memory locations before the
/// update.
///
template <atomic_op Op, typename T, int N, typename Toffset,
typename RegionTy = region1d_t<T, N, 1>, typename AccessorTy,
template <atomic_op Op, typename T, int N, typename Toffset, typename Tsrc,
typename RegionTy = region1d_t<Tsrc, N, 1>, typename AccessorTy,
typename PropertyListT =
ext::oneapi::experimental::detail::empty_properties_t>
__ESIMD_API std::enable_if_t<
Expand All @@ -5931,7 +5924,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(AccessorTy acc, simd<Toffset, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, PropertyListT props = {}) {
simd_view<Tsrc, RegionTy> src0, PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(acc, byte_offset, src0.read(), mask, props);
}
Expand Down Expand Up @@ -6017,8 +6010,8 @@ __ESIMD_API
/// @return A vector of the old values at the memory locations before the
/// update.
///
template <atomic_op Op, typename T, int N,
typename RegionTy = region1d_t<T, N, 1>, typename AccessorTy>
template <atomic_op Op, typename T, int N, typename Tsrc,
typename RegionTy = region1d_t<Tsrc, N, 1>, typename AccessorTy>
__ESIMD_API
std::enable_if_t<__ESIMD_DNS::get_num_args<Op>() == 1 &&
detail::is_local_accessor_with_v<
Expand All @@ -6027,7 +6020,7 @@ __ESIMD_API
AccessorTy, detail::accessor_mode_cap::can_write>,
simd<T, N>>
atomic_update(AccessorTy acc, simd<uint32_t, N> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd_mask<N> mask) {
simd_view<Tsrc, RegionTy> src0, simd_mask<N> mask) {
return atomic_update<Op, T, N>(acc, byte_offset, src0.read(), mask);
}

Expand Down Expand Up @@ -6112,16 +6105,15 @@ atomic_update(AccessorTy acc, simd_view<Toffset, RegionTy> byte_offset,
/// update.
///
template <atomic_op Op, typename T, int N, typename AccessorTy,
typename RegionTy = region1d_t<uint32_t, N, 1>>
typename Toffset, typename RegionTy = region1d_t<Toffset, N, 1>>
__ESIMD_API
std::enable_if_t<__ESIMD_DNS::get_num_args<Op>() == 1 &&
detail::is_local_accessor_with_v<
AccessorTy, detail::accessor_mode_cap::can_read> &&
detail::is_local_accessor_with_v<
AccessorTy, detail::accessor_mode_cap::can_write>,
simd<T, N>>
atomic_update(AccessorTy acc,
simd_view<simd<uint32_t, N>, RegionTy> byte_offset,
atomic_update(AccessorTy acc, simd_view<Toffset, RegionTy> byte_offset,
simd<T, N> src0, simd_mask<N> mask) {
return atomic_update<Op, T, N>(acc, byte_offset.read(), src0, mask);
}
Expand Down Expand Up @@ -6204,10 +6196,10 @@ atomic_update(AccessorTy acc, simd_view<Toffset, RegionTy> byte_offset,
/// @return A vector of the old values at the memory locations before the
/// update.
///
template <atomic_op Op, typename T, int N, typename Toffset,
template <atomic_op Op, typename T, int N, typename Toffset, typename Tsrc,
typename AccessorTy,
typename OffsetRegionTy = region1d_t<Toffset, N, 1>,
typename RegionTy = region1d_t<T, N, 1>,
typename RegionTy = region1d_t<Tsrc, N, 1>,
typename PropertyListT =
ext::oneapi::experimental::detail::empty_properties_t>
__ESIMD_API std::enable_if_t<
Expand All @@ -6219,7 +6211,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(AccessorTy acc, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd_mask<N> mask,
simd_view<Tsrc, RegionTy> src0, simd_mask<N> mask,
PropertyListT props = {}) {
return atomic_update<Op, T, N>(acc, byte_offset.read(), src0.read(), mask,
props);
Expand Down Expand Up @@ -6253,9 +6245,9 @@ atomic_update(AccessorTy acc, simd_view<Toffset, OffsetRegionTy> byte_offset,
/// @return A vector of the old values at the memory locations before the
/// update.
///
template <atomic_op Op, typename T, int N, typename AccessorTy,
typename OffsetRegionTy = region1d_t<uint32_t, N, 1>,
typename RegionTy = region1d_t<T, N, 1>>
template <atomic_op Op, typename T, int N, typename AccessorTy, typename Tsrc,
typename Toffset, typename OffsetRegionTy = region1d_t<Toffset, N, 1>,
typename RegionTy = region1d_t<Tsrc, N, 1>>
__ESIMD_API
std::enable_if_t<__ESIMD_DNS::get_num_args<Op>() == 1 &&
detail::is_local_accessor_with_v<
Expand All @@ -6264,8 +6256,8 @@ __ESIMD_API
AccessorTy, detail::accessor_mode_cap::can_write>,
simd<T, N>>
atomic_update(AccessorTy acc,
simd_view<simd<uint32_t, N>, OffsetRegionTy> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, simd_mask<N> mask) {
simd_view<Toffset, OffsetRegionTy> byte_offset,
simd_view<Tsrc, RegionTy> src0, simd_mask<N> mask) {
return atomic_update<Op, T, N>(acc, byte_offset.read(), src0.read(), mask);
}

Expand Down Expand Up @@ -6298,10 +6290,10 @@ __ESIMD_API
/// @return A vector of the old values at the memory locations before the
/// update.
///
template <atomic_op Op, typename T, int N, typename Toffset,
template <atomic_op Op, typename T, int N, typename Toffset, typename Tsrc,
typename AccessorTy,
typename OffsetRegionTy = region1d_t<Toffset, N, 1>,
typename RegionTy = region1d_t<T, N, 1>,
typename RegionTy = region1d_t<Tsrc, N, 1>,
typename PropertyListT =
ext::oneapi::experimental::detail::empty_properties_t>
__ESIMD_API std::enable_if_t<
Expand All @@ -6313,7 +6305,7 @@ __ESIMD_API std::enable_if_t<
ext::oneapi::experimental::is_property_list_v<PropertyListT>,
simd<T, N>>
atomic_update(AccessorTy acc, simd_view<Toffset, OffsetRegionTy> byte_offset,
simd_view<simd<T, N>, RegionTy> src0, PropertyListT props = {}) {
simd_view<Tsrc, RegionTy> src0, PropertyListT props = {}) {
simd_mask<N> mask = 1;
return atomic_update<Op, T, N>(acc, byte_offset.read(), src0.read(), mask,
props);
Expand Down Expand Up @@ -6532,15 +6524,14 @@ __ESIMD_API
/// update.
///
template <atomic_op Op, typename Tx, int N, typename AccessorTy,
typename RegionTy = region1d_t<uint32_t, N, 1>>
typename Toffset, typename RegionTy = region1d_t<Toffset, N, 1>>
__ESIMD_API
std::enable_if_t<detail::is_local_accessor_with_v<
AccessorTy, detail::accessor_mode_cap::can_read> &&
detail::is_local_accessor_with_v<
AccessorTy, detail::accessor_mode_cap::can_write>,
simd<Tx, N>>
atomic_update(AccessorTy acc,
simd_view<simd<uint32_t, N>, RegionTy> offsets,
atomic_update(AccessorTy acc, simd_view<Toffset, RegionTy> offsets,
simd<Tx, N> src0, simd<Tx, N> src1, simd_mask<N> mask) {
return atomic_update<Op, Tx, N>(acc, offsets.read(), src0, src1, mask);
}
Expand Down