[SYCL]Deletion of workaround for wrong mangling of s_upsample (#1053)

We had issue with wrong mangling of s_upsample. I fixed it a long time ago, so we can delete workaround now.

Signed-off-by: Ilya Mashkov <[email protected]>

Author: imashkov

sycl/include/CL/sycl/builtins.hpp

@@ -851,10 +851,6 @@ detail::enable_if_t<detail::is_ugeninteger<T>::value, T> sub_sat(T x,
   return __sycl_std::__invoke_u_sub_sat<T>(x, y);
 }
 
-// TODO delete when Intel CPU OpenCL runtime will be fixed
-// OpExtInst ... s_upsample -> _Z8upsampleij (now _Z8upsampleii)
-#define __invoke_s_upsample __invoke_u_upsample
-
 // ugeninteger16bit upsample (ugeninteger8bit hi, ugeninteger8bit lo)
 template <typename T>
 detail::enable_if_t<detail::is_ugeninteger8bit<T>::value,
@@ -909,8 +905,6 @@ upsample(T hi, T2 lo) __NOEXC {
   return __sycl_std::__invoke_s_upsample<detail::make_larger_t<T>>(hi, lo);
 }
 
-#undef __invoke_s_upsample
-
 // geninteger popcount (geninteger x)
 template <typename T>
 detail::enable_if_t<detail::is_geninteger<T>::value, T> popcount(T x) __NOEXC {

sycl/source/detail/builtins_integer.cpp

@@ -720,10 +720,6 @@ MAKE_1V_2V(u_upsample, s::cl_ushort, s::cl_uchar, s::cl_uchar)
 MAKE_1V_2V(u_upsample, s::cl_uint, s::cl_ushort, s::cl_ushort)
 MAKE_1V_2V(u_upsample, s::cl_ulong, s::cl_uint, s::cl_uint)
 
-// TODO delete when Intel CPU OpenCL runtime will be fixed
-// ExtInst ... s_upsample -> _Z8upsampleij (now _Z8upsampleii)
-#define s_upsample u_upsample
-
 s::cl_short s_upsample(s::cl_char x, s::cl_uchar y) __NOEXC {
   return __upsample(x, y);
 }
@@ -737,8 +733,6 @@ MAKE_1V_2V(s_upsample, s::cl_short, s::cl_char, s::cl_uchar)
 MAKE_1V_2V(s_upsample, s::cl_int, s::cl_short, s::cl_ushort)
 MAKE_1V_2V(s_upsample, s::cl_long, s::cl_int, s::cl_uint)
 
-#undef s_upsample
-
 // popcount
 s::cl_uchar popcount(s::cl_uchar x) __NOEXC { return __popcount(x); }
 s::cl_ushort popcount(s::cl_ushort x) __NOEXC { return __popcount(x); }