Skip to content

[NFC] Cleanup unneded macro from builtins implementation #1445

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 1 commit into from
Apr 6, 2020
Merged

[NFC] Cleanup unneded macro from builtins implementation #1445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 5 additions & 20 deletions sycl/include/CL/sycl/detail/builtins.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
#define __SYCL_EXTERN_IT2(Ret, prefix, call, Arg1, Arg2)
#define __SYCL_EXTERN_IT2_SAME(Ret, prefix, call, Arg)
#define __SYCL_EXTERN_IT3(Ret, prefix, call, Arg1, Arg2, Arg3)
#define __SYCL_TPARAMS0(Type)
#define __SYCL_TPARAMS1(Ret, A1)
#define __SYCL_TPARAMS2(Ret, A1, A2)
#define __SYCL_TPARAMS3(Ret, A1, A2, A3)
#else
#define __FUNC_PREFIX_OCL
#define __FUNC_PREFIX_CORE
Expand All @@ -39,10 +35,6 @@
extern Ret __SYCL_PPCAT(prefix, call)(Arg1, Arg2)
#define __SYCL_EXTERN_IT3(Ret, prefix, call, Arg1, Arg2, Arg3) \
extern Ret __SYCL_PPCAT(prefix, call)(Arg1, Arg2, Arg3)
#define __SYCL_TPARAMS0(Type)
#define __SYCL_TPARAMS1(Ret, A1)
#define __SYCL_TPARAMS2(Ret, A1, A2)
#define __SYCL_TPARAMS3(Ret, A1, A2, A3)
#endif

#define __SYCL_PPCAT_NX(A, B) A##B
Expand All @@ -55,7 +47,7 @@
using Arg1 = cl::sycl::detail::ConvertToOpenCLType_t<T1>; \
__SYCL_EXTERN_IT1(Ret, prefix, call, Arg1); \
Arg1 arg1 = cl::sycl::detail::convertDataToType<T1, Arg1>(t1); \
Ret ret = __SYCL_PPCAT(prefix, call) __SYCL_TPARAMS1(Ret, Arg1)(arg1); \
Ret ret = __SYCL_PPCAT(prefix, call)(arg1); \
return cl::sycl::detail::convertDataToType<Ret, R>(ret); \
}

Expand All @@ -68,8 +60,7 @@
__SYCL_EXTERN_IT2(Ret, prefix, call, Arg1, Arg2); \
Arg1 arg1 = cl::sycl::detail::convertDataToType<T1, Arg1>(t1); \
Arg2 arg2 = cl::sycl::detail::convertDataToType<T2, Arg2>(t2); \
Ret ret = __SYCL_PPCAT(prefix, call) \
__SYCL_TPARAMS2(Ret, Arg1, Arg2)(arg1, arg2); \
Ret ret = __SYCL_PPCAT(prefix, call)(arg1, arg2); \
return cl::sycl::detail::convertDataToType<Ret, R>(ret); \
}

Expand All @@ -81,8 +72,7 @@
__SYCL_EXTERN_IT2_SAME(Ret, prefix, call, Arg); \
Arg arg1 = cl::sycl::detail::convertDataToType<T, Arg>(t1); \
Arg arg2 = cl::sycl::detail::convertDataToType<T, Arg>(t2); \
Ret ret = \
__SYCL_PPCAT(prefix, call) __SYCL_TPARAMS1(Ret, Arg)(arg1, arg2); \
Ret ret = __SYCL_PPCAT(prefix, call)(arg1, arg2); \
return cl::sycl::detail::convertDataToType<Ret, R>(ret); \
}

Expand All @@ -93,7 +83,7 @@
__SYCL_EXTERN_IT2_SAME(Type, prefix, call, Type); \
Type arg1 = cl::sycl::detail::convertDataToType<T, Type>(v1); \
Type arg2 = cl::sycl::detail::convertDataToType<T, Type>(v2); \
Type ret = __SYCL_PPCAT(prefix, call) __SYCL_TPARAMS0(Type)(arg1, arg2); \
Type ret = __SYCL_PPCAT(prefix, call)(arg1, arg2); \
return cl::sycl::detail::convertDataToType<Type, T>(ret); \
}

Expand All @@ -108,8 +98,7 @@
Arg1 arg1 = cl::sycl::detail::convertDataToType<T1, Arg1>(t1); \
Arg2 arg2 = cl::sycl::detail::convertDataToType<T2, Arg2>(t2); \
Arg3 arg3 = cl::sycl::detail::convertDataToType<T3, Arg3>(t3); \
Ret ret = __SYCL_PPCAT(prefix, call) \
__SYCL_TPARAMS3(Ret, Arg1, Arg2, Arg3)(arg1, arg2, arg3); \
Ret ret = __SYCL_PPCAT(prefix, call)(arg1, arg2, arg3); \
return cl::sycl::detail::convertDataToType<Ret, R>(ret); \
}

Expand Down Expand Up @@ -302,10 +291,6 @@ __SYCL_MAKE_CALL_ARG3(select, __FUNC_PREFIX_OCL) // select
#undef __SYCL_PPCAT
#undef __FUNC_PREFIX_OCL
#undef __FUNC_PREFIX_CORE
#undef __SYCL_TPARAMS0
#undef __SYCL_TPARAMS1
#undef __SYCL_TPARAMS2
#undef __SYCL_TPARAMS3
#undef __SYCL_EXTERN_IT1
#undef __SYCL_EXTERN_IT2
#undef __SYCL_EXTERN_IT2_SAME
Expand Down