[SYCL][ESIMD] Fix compilation issue of abs function (#6443)

* Fix compilation issue of abs function

Author: fineg74

sycl/include/sycl/ext/intel/esimd/math.hpp

@@ -93,56 +93,53 @@ saturate(simd<T1, SZ> src) {
 // abs
 namespace detail {
 
-template <typename T0, typename T1, int SZ>
-ESIMD_NODEBUG ESIMD_INLINE simd<T0, SZ>
-__esimd_abs_common_internal(simd<T1, SZ> src0) {
-  simd<T1, SZ> Result = simd<T0, SZ>(__esimd_abs<T1, SZ>(src0.data()));
-  return Result;
+template <typename TRes, typename TArg, int SZ>
+ESIMD_NODEBUG ESIMD_INLINE simd<TRes, SZ>
+__esimd_abs_common_internal(simd<TArg, SZ> src0) {
+  simd<TArg, SZ> Result = simd<TArg, SZ>(__esimd_abs<TArg, SZ>(src0.data()));
+  return convert<TRes>(Result);
 }
 
-template <typename T0, typename T1>
+template <typename TRes, typename TArg>
 ESIMD_NODEBUG
-    ESIMD_INLINE std::enable_if_t<detail::is_esimd_scalar<T0>::value &&
-                                      detail::is_esimd_scalar<T1>::value,
-                                  std::remove_const_t<T0>>
-    __esimd_abs_common_internal(T1 src0) {
-  using TT0 = std::remove_const_t<T0>;
-  using TT1 = std::remove_const_t<T1>;
-
-  simd<TT1, 1> Src0 = src0;
-  simd<TT0, 1> Result = __esimd_abs_common_internal<TT0>(Src0);
-  return Result[0];
+    ESIMD_INLINE std::enable_if_t<detail::is_esimd_scalar<TRes>::value &&
+                                      detail::is_esimd_scalar<TArg>::value,
+                                  TRes>
+    __esimd_abs_common_internal(TArg src0) {
+  simd<TArg, 1> Src0 = src0;
+  simd<TArg, 1> Result = __esimd_abs_common_internal<TArg>(Src0);
+  return convert<TRes>(Result)[0];
 }
 } // namespace detail
 /// @endcond ESIMD_DETAIL
 
 /// Get absolute value (vector version)
-/// @tparam T0 element type of the returned vector.
-/// @tparam T1 element type of the input vector.
+/// @tparam TRes element type of the returned vector.
+/// @tparam TArg element type of the input vector.
 /// @tparam SZ size of the input and returned vector.
 /// @param src0 the input vector.
 /// @return vector of absolute values.
-template <typename T0, typename T1, int SZ>
+template <typename TRes, typename TArg, int SZ>
 __ESIMD_API std::enable_if_t<
-    !std::is_same<std::remove_const_t<T0>, std::remove_const_t<T1>>::value,
-    simd<T0, SZ>>
-abs(simd<T1, SZ> src0) {
-  return detail::__esimd_abs_common_internal<T0, T1, SZ>(src0.data());
+    !std::is_same<std::remove_const_t<TRes>, std::remove_const_t<TArg>>::value,
+    simd<TRes, SZ>>
+abs(simd<TArg, SZ> src0) {
+  return detail::__esimd_abs_common_internal<TRes, TArg, SZ>(src0.data());
 }
 
 /// Get absolute value (scalar version)
 /// @tparam T0 element type of the returned value.
 /// @tparam T1 element type of the input value.
 /// @param src0 the source operand.
 /// @return absolute value.
-template <typename T0, typename T1>
-__ESIMD_API std::enable_if_t<
-    !std::is_same<std::remove_const_t<T0>, std::remove_const_t<T1>>::value &&
-        detail::is_esimd_scalar<T0>::value &&
-        detail::is_esimd_scalar<T1>::value,
-    std::remove_const_t<T0>>
-abs(T1 src0) {
-  return detail::__esimd_abs_common_internal<T0, T1>(src0);
+template <typename TRes, typename TArg>
+__ESIMD_API std::enable_if_t<!std::is_same<std::remove_const_t<TRes>,
+                                           std::remove_const_t<TArg>>::value &&
+                                 detail::is_esimd_scalar<TRes>::value &&
+                                 detail::is_esimd_scalar<TArg>::value,
+                             std::remove_const_t<TRes>>
+abs(TArg src0) {
+  return detail::__esimd_abs_common_internal<TRes, TArg>(src0);
 }
 
 /// Get absolute value (vector version). This is a specialization of a version

sycl/include/sycl/ext/intel/esimd/simd.hpp

@@ -181,7 +181,8 @@ class simd : public detail::simd_obj_impl<
 /// element type \c To.
 template <typename To, typename From, int N>
 ESIMD_INLINE simd<To, N> convert(const simd<From, N> &val) {
-  if constexpr (std::is_same_v<To, From>)
+  if constexpr (std::is_same_v<std::remove_const_t<To>,
+                               std::remove_const_t<From>>)
     return val;
   else
     return detail::convert_vector<To, From, N>(val.data());