Skip to content

Commit 502dd54

Browse files
[SYCL] Change macro to follow naming C++ identifiers rules (#8031)
..for SYCL project Signed-off-by: Tikhomirova, Kseniya <kseniya.tikhomirova@intel.com> --------- Signed-off-by: Tikhomirova, Kseniya <kseniya.tikhomirova@intel.com>
1 parent 23f107d commit 502dd54

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

sycl/include/sycl/ext/oneapi/experimental/builtins.hpp

100755100644
Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,23 +113,24 @@ inline __SYCL_ALWAYS_INLINE
113113
sycl::marray<T, N>>
114114
tanh(sycl::marray<T, N> x) __NOEXC {
115115
sycl::marray<T, N> res;
116-
#if defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
117-
#define FUNC_VEC native::tanh
118-
#define FUNC FUNC_VEC
119-
#else
120-
#define FUNC_VEC __sycl_std::__invoke_tanh<sycl::vec<T, 2>>
121-
#define FUNC __sycl_std::__invoke_tanh<T>
122-
#endif // defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
123116

124117
for (size_t i = 0; i < N / 2; i++) {
125-
auto partial_res = FUNC_VEC(sycl::detail::to_vec2(x, i * 2));
118+
#if defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
119+
auto partial_res = native::tanh(sycl::detail::to_vec2(x, i * 2));
120+
#else
121+
auto partial_res = __sycl_std::__invoke_tanh<sycl::vec<T, 2>>(
122+
sycl::detail::to_vec2(x, i * 2));
123+
#endif
126124
std::memcpy(&res[i * 2], &partial_res, sizeof(vec<T, 2>));
127125
}
128126
if (N % 2) {
129-
res[N - 1] = FUNC(x[N - 1]);
127+
#if defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
128+
res[N - 1] = native::tanh(x[N - 1]);
129+
#else
130+
res[N - 1] = __sycl_std::__invoke_tanh<T>(x[N - 1]);
131+
#endif
130132
}
131-
#undef FUNC_VEC
132-
#undef FUNC
133+
133134
return res;
134135
}
135136

@@ -155,23 +156,23 @@ template <size_t N>
155156
inline __SYCL_ALWAYS_INLINE sycl::marray<half, N>
156157
exp2(sycl::marray<half, N> x) __NOEXC {
157158
sycl::marray<half, N> res;
158-
#if defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
159-
#define FUNC_VEC native::exp2
160-
#define FUNC FUNC_VEC
161-
#else
162-
#define FUNC_VEC __sycl_std::__invoke_exp2<sycl::vec<half, 2>>
163-
#define FUNC __sycl_std::__invoke_exp2<half>
164-
#endif // defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
165159

166160
for (size_t i = 0; i < N / 2; i++) {
167-
auto partial_res = FUNC_VEC(sycl::detail::to_vec2(x, i * 2));
161+
#if defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
162+
auto partial_res = native::exp2(sycl::detail::to_vec2(x, i * 2));
163+
#else
164+
auto partial_res = __sycl_std::__invoke_exp2<sycl::vec<half, 2>>(
165+
sycl::detail::to_vec2(x, i * 2));
166+
#endif
168167
std::memcpy(&res[i * 2], &partial_res, sizeof(vec<half, 2>));
169168
}
170169
if (N % 2) {
171-
res[N - 1] = FUNC(x[N - 1]);
170+
#if defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
171+
res[N - 1] = native::exp2(x[N - 1]);
172+
#else
173+
res[N - 1] = __sycl_std::__invoke_exp2<half>(x[N - 1]);
174+
#endif
172175
}
173-
#undef FUNC_VEC
174-
#undef FUNC
175176
return res;
176177
}
177178

0 commit comments

Comments
 (0)