Skip to content

Commit 93c0417

Browse files
fineg74fineg74
committed
Merge branch 'scalarOffset' of https://github.com/fineg74/llvm into scalarOffset
# Conflicts: # sycl/include/sycl/ext/intel/esimd/memory.hpp
2 parents f01cc09 + 5283d4b commit 93c0417

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

‎sycl/include/sycl/ext/intel/esimd/memory.hpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ __ESIMD_API simd<Tx, N> gather(const Tx *p,
188188
/// undefined.
189189
///
190190
template <typename Tx, int N, typename Toffset>
191-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value, simd<Tx, N>>
191+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>, simd<Tx, N>>
192192
gather(const Tx *p, Toffset offset, simd_mask<N> mask = 1) {
193193
return gather<Tx, N>(p, simd<Toffset, N>(offset), mask);
194194
}
@@ -266,7 +266,7 @@ __ESIMD_API void scatter(Tx *p, simd_view<Toffset, RegionTy> offsets,
266266
/// @param mask The access mask, defaults to all 1s.
267267
///
268268
template <typename Tx, int N, typename Toffset>
269-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value>
269+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>>
270270
scatter(Tx *p, Toffset offset, simd<Tx, N> vals, simd_mask<N> mask = 1) {
271271
scatter<Tx, N>(p, simd<Toffset, N>(offset), vals, mask);
272272
}
@@ -687,7 +687,7 @@ gather_rgba(const T *p, simd_view<Toffset, RegionTy> offsets,
687687
///
688688
template <rgba_channel_mask RGBAMask = rgba_channel_mask::ABGR, typename T,
689689
int N, typename Toffset>
690-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value,
690+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>,
691691
simd<T, N * get_num_channels_enabled(RGBAMask)>>
692692
gather_rgba(const T *p, Toffset offset, simd_mask<N> mask = 1) {
693693
return gather_rgba<RGBAMask, T, N>(p, simd<Toffset, N>(offset), mask);
@@ -794,7 +794,7 @@ scatter_rgba(T *p, simd_view<Toffset, RegionTy> offsets,
794794
///
795795
template <rgba_channel_mask RGBAMask = rgba_channel_mask::ABGR, typename T,
796796
int N, typename Toffset>
797-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value>
797+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>>
798798
scatter_rgba(T *p, Toffset offset,
799799
simd<T, N * get_num_channels_enabled(RGBAMask)> vals,
800800
simd_mask<N> mask = 1) {
@@ -1056,7 +1056,7 @@ __ESIMD_API simd<Tx, N> atomic_update(Tx *p,
10561056
/// scalar.
10571057
///
10581058
/// @tparam Op The atomic operation - can be \c atomic_op::inc or
1059-
/// atomic_op::dec.
1059+
/// \c atomic_op::dec, \c atomic_op::load.
10601060
/// @tparam Tx The vector element type.
10611061
/// @tparam N The number of memory locations to update.
10621062
/// @param p The USM pointer.
@@ -1067,7 +1067,7 @@ __ESIMD_API simd<Tx, N> atomic_update(Tx *p,
10671067
/// update.
10681068
///
10691069
template <atomic_op Op, typename Tx, int N, typename Toffset>
1070-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value, simd<Tx, N>>
1070+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>, simd<Tx, N>>
10711071
atomic_update(Tx *p, Toffset offset, simd_mask<N> mask = 1) {
10721072
return atomic_update<Op, Tx, N>(p, simd<Toffset, N>(offset), mask);
10731073
}
@@ -1124,7 +1124,7 @@ __ESIMD_API simd<Tx, N> atomic_update(Tx *p, simd<Toffset, N> offset,
11241124
/// atomic_op::max, \c atomic_op::xchg, \c atomic_op::bit_and, \c
11251125
/// atomic_op::bit_or, \c atomic_op::bit_xor, \c atomic_op::minsint, \c
11261126
/// atomic_op::maxsint, \c atomic_op::fmax, \c atomic_op::fmin, \c
1127-
/// atomic_op::save.
1127+
/// atomic_op::store.
11281128
/// @tparam Tx The vector element type.
11291129
/// @tparam N The number of memory locations to update.
11301130
/// @param p The USM pointer.
@@ -1163,7 +1163,7 @@ __ESIMD_API simd<Tx, N> atomic_update(Tx *p,
11631163
/// update.
11641164
///
11651165
template <atomic_op Op, typename Tx, int N, typename Toffset>
1166-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value, simd<Tx, N>>
1166+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>, simd<Tx, N>>
11671167
atomic_update(Tx *p, Toffset offset, simd<Tx, N> src0, simd_mask<N> mask) {
11681168
return atomic_update<Op, Tx, N>(p, simd<Toffset, N>(offset), src0, mask);
11691169
}
@@ -1249,7 +1249,7 @@ atomic_update(Tx *p, simd_view<Toffset, RegionTy> offsets, simd<Tx, N> src0,
12491249
/// update.
12501250
///
12511251
template <atomic_op Op, typename Tx, int N, typename Toffset>
1252-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value, simd<Tx, N>>
1252+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>, simd<Tx, N>>
12531253
atomic_update(Tx *p, Toffset offset, simd<Tx, N> src0, simd<Tx, N> src1,
12541254
simd_mask<N> mask) {
12551255
return atomic_update<Op, Tx, N>(p, simd<Toffset, N>(offset), src0, src1,
@@ -1883,3 +1883,4 @@ simd_obj_impl<T, N, T1, SFINAE>::copy_to(AccessorT acc, uint32_t offset,
18831883
} // namespace ext::intel::esimd
18841884
} // __SYCL_INLINE_VER_NAMESPACE(_V1)
18851885
} // namespace sycl
1886+

‎sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ template <typename T, int NElts = 1,
437437
lsc_data_size DS = lsc_data_size::default_size,
438438
cache_hint L1H = cache_hint::none, cache_hint L3H = cache_hint::none,
439439
int N, typename Toffset>
440-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value,
440+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>,
441441
__ESIMD_NS::simd<T, N * NElts>>
442442
lsc_gather(const T *p, Toffset offset, __ESIMD_NS::simd_mask<N> pred = 1) {
443443
return lsc_gather<T, NElts, DS, L1H, L3H, N>(
@@ -696,7 +696,7 @@ template <typename T, int NElts = 1,
696696
lsc_data_size DS = lsc_data_size::default_size,
697697
cache_hint L1H = cache_hint::none, cache_hint L3H = cache_hint::none,
698698
int N, typename Toffset>
699-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value>
699+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>>
700700
lsc_prefetch(const T *p, Toffset offset, __ESIMD_NS::simd_mask<N> pred = 1) {
701701
lsc_prefetch<T, NElts, DS, L1H, L3H, N>(
702702
p, __ESIMD_NS::simd<Toffset, N>(offset), pred);
@@ -963,7 +963,7 @@ template <typename T, int NElts = 1,
963963
lsc_data_size DS = lsc_data_size::default_size,
964964
cache_hint L1H = cache_hint::none, cache_hint L3H = cache_hint::none,
965965
int N, typename Toffset>
966-
__ESIMD_API std::enable_if_t<std::is_integral<Toffset>::value>
966+
__ESIMD_API std::enable_if_t<std::is_integral_v<Toffset>>
967967
lsc_scatter(T *p, Toffset offset, __ESIMD_NS::simd<T, N * NElts> vals,
968968
__ESIMD_NS::simd_mask<N> pred = 1) {
969969
lsc_scatter<T, NElts, DS, L1H, L3H, N>(
@@ -1545,7 +1545,7 @@ template <__ESIMD_NS::atomic_op Op, typename T, int N,
15451545
cache_hint L1H = cache_hint::none, cache_hint L3H = cache_hint::none,
15461546
typename Toffset>
15471547
__ESIMD_API
1548-
std::enable_if_t<std::is_integral<Toffset>::value, __ESIMD_NS::simd<T, N>>
1548+
std::enable_if_t<std::is_integral_v<Toffset>, __ESIMD_NS::simd<T, N>>
15491549
lsc_atomic_update(T *p, Toffset offset, __ESIMD_NS::simd_mask<N> pred = 1) {
15501550
return lsc_atomic_update<Op, T, N, DS, L1H, L3H>(
15511551
p, __ESIMD_NS::simd<Toffset, N>(offset), pred);
@@ -1617,7 +1617,7 @@ template <__ESIMD_NS::atomic_op Op, typename T, int N,
16171617
cache_hint L1H = cache_hint::none, cache_hint L3H = cache_hint::none,
16181618
typename Toffset>
16191619
__ESIMD_API
1620-
std::enable_if_t<std::is_integral<Toffset>::value, __ESIMD_NS::simd<T, N>>
1620+
std::enable_if_t<std::is_integral_v<Toffset>, __ESIMD_NS::simd<T, N>>
16211621
lsc_atomic_update(T *p, Toffset offset, __ESIMD_NS::simd<T, N> src0,
16221622
__ESIMD_NS::simd_mask<N> pred = 1) {
16231623
return lsc_atomic_update<Op, T, N, DS, L1H, L3H>(
@@ -1692,7 +1692,7 @@ template <__ESIMD_NS::atomic_op Op, typename T, int N,
16921692
cache_hint L1H = cache_hint::none, cache_hint L3H = cache_hint::none,
16931693
typename Toffset>
16941694
__ESIMD_API
1695-
std::enable_if_t<std::is_integral<Toffset>::value, __ESIMD_NS::simd<T, N>>
1695+
std::enable_if_t<std::is_integral_v<Toffset>, __ESIMD_NS::simd<T, N>>
16961696
lsc_atomic_update(T *p, Toffset offset, __ESIMD_NS::simd<T, N> src0,
16971697
__ESIMD_NS::simd<T, N> src1,
16981698
__ESIMD_NS::simd_mask<N> pred = 1) {
@@ -1905,7 +1905,7 @@ __ESIMD_API simd<T, N> atomic_update(T *p, simd_view<Toffset, RegionTy> offsets,
19051905

19061906
template <native::lsc::atomic_op Op, typename T, int N, typename Toffset>
19071907
__ESIMD_API
1908-
std::enable_if_t<std::is_integral<Toffset>::value, __ESIMD_NS::simd<T, N>>
1908+
std::enable_if_t<std::is_integral_v<Toffset>, __ESIMD_NS::simd<T, N>>
19091909
atomic_update(T *p, Toffset offset, simd_mask<N> mask = 1) {
19101910
return __ESIMD_ENS::lsc_atomic_update<detail::to_atomic_op<Op>(), T, N>(
19111911
p, offset, mask);
@@ -1929,7 +1929,7 @@ __ESIMD_API simd<T, N> atomic_update(T *p, simd_view<Toffset, RegionTy> offsets,
19291929

19301930
template <native::lsc::atomic_op Op, typename T, int N, typename Toffset>
19311931
__ESIMD_API
1932-
std::enable_if_t<std::is_integral<Toffset>::value, __ESIMD_NS::simd<T, N>>
1932+
std::enable_if_t<std::is_integral_v<Toffset>, __ESIMD_NS::simd<T, N>>
19331933
atomic_update(T *p, Toffset offset, simd<T, N> src0,
19341934
simd_mask<N> mask = 1) {
19351935
return __ESIMD_ENS::lsc_atomic_update<detail::to_atomic_op<Op>(), T, N>(
@@ -1959,7 +1959,7 @@ __ESIMD_API simd<T, N> atomic_update(T *p, simd_view<Toffset, RegionTy> offsets,
19591959

19601960
template <native::lsc::atomic_op Op, typename T, int N, typename Toffset>
19611961
__ESIMD_API
1962-
std::enable_if_t<std::is_integral<Toffset>::value, __ESIMD_NS::simd<T, N>>
1962+
std::enable_if_t<std::is_integral_v<Toffset>, __ESIMD_NS::simd<T, N>>
19631963
atomic_update(T *p, Toffset offset, simd<T, N> src0, simd<T, N> src1,
19641964
simd_mask<N> mask = 1) {
19651965
return __ESIMD_ENS::lsc_atomic_update<detail::to_atomic_op<Op>(), T, N>(

0 commit comments

Comments
 (0)