[libspirv] reuse clc function in __spirv_ocl_normalize/fast_normalize

libclc/libspirv/lib/generic/geometric/fast_normalize.cl

@@ -6,13 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <clc/geometric/clc_fast_normalize.h>
 #include <libspirv/spirv.h>
 
-_CLC_OVERLOAD _CLC_DEF float __spirv_ocl_fast_normalize(float p) {
-  return __spirv_ocl_normalize(p);
-}
-
-#define __CLC_BODY <fast_normalize.inc>
+#define FUNCTION __spirv_ocl_fast_normalize
+#define __IMPL_FUNCTION(x) __clc_fast_normalize
+#define __CLC_GEOMETRIC_RET_GENTYPE
+#define __CLC_BODY <clc/geometric/unary_def.inc>
 #define __FLOAT_ONLY
-#include <libspirv/generic/math/floatn.inc>
-#undef __FLOAT_ONLY
+#include <clc/math/gentype.inc>

libclc/libspirv/lib/generic/geometric/normalize.cl

@@ -6,86 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <clc/clc_convert.h>
-#include <clc/relational/clc_all.h>
+#include <clc/geometric/clc_normalize.h>
 #include <libspirv/spirv.h>
 
-#define HALF_MAX_SQRT 0x1.0p+8h
-#define HALF_MIN_SQRT 0x1.0p-8h
+#define FUNCTION __spirv_ocl_normalize
+#define __IMPL_FUNCTION(x) __clc_normalize
+#define __CLC_GEOMETRIC_RET_GENTYPE
+#define __CLC_BODY <clc/geometric/unary_def.inc>
 
-#define _CLC_SPIRV_NORMALIZE_IMPL(FP_TYPE, FLOAT_MARK, INT_TYPE, VLEN,         \
-                                  MAX_SQRT, MIN_SQRT)                          \
-  _CLC_OVERLOAD _CLC_DEF FP_TYPE##VLEN __spirv_ocl_normalize(                  \
-      FP_TYPE##VLEN p) {                                                       \
-    if (__clc_all(p == (FP_TYPE##VLEN)0.0##FLOAT_MARK))                        \
-      return p;                                                                \
-    FP_TYPE l2 = __spirv_Dot(p, p);                                            \
-    if (l2 < FLT_MIN) {                                                        \
-      p *= MAX_SQRT;                                                           \
-      l2 = __spirv_Dot(p, p);                                                  \
-    } else if (l2 == INFINITY) {                                               \
-      p *= MIN_SQRT;                                                           \
-      l2 = __spirv_Dot(p, p);                                                  \
-      if (l2 == INFINITY) {                                                    \
-        p = __spirv_ocl_copysign(                                              \
-            __spirv_ocl_select(                                                \
-                (FP_TYPE##VLEN)0.0##FLOAT_MARK,                                \
-                (FP_TYPE##VLEN)1.0##FLOAT_MARK,                                \
-                __clc_convert_##INT_TYPE##VLEN(__spirv_IsInf(p))),             \
-            p);                                                                \
-        l2 = __spirv_Dot(p, p);                                                \
-      }                                                                        \
-    }                                                                          \
-    return p * __spirv_ocl_rsqrt(l2);                                          \
-  }
-
-#define _CLC_SPIRV_NORMALIZE(VLEN)                                             \
-  _CLC_SPIRV_NORMALIZE_IMPL(float, f, int, VLEN, 0x1.0p+86F, 0x1.0p-65f)
-
-_CLC_OVERLOAD _CLC_DEF float __spirv_ocl_normalize(float p) {
-  return __spirv_ocl_sign(p);
-}
-
-_CLC_SPIRV_NORMALIZE(2)
-_CLC_SPIRV_NORMALIZE(3)
-_CLC_SPIRV_NORMALIZE(4)
-
-#undef _CLC_SPIRV_NORMALIZE
-
-#ifdef cl_khr_fp64
-
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-#define _CLC_SPIRV_NORMALIZE(VLEN)                                             \
-  _CLC_SPIRV_NORMALIZE_IMPL(double, , long, VLEN, 0x1.0p+563, 0x1.0p-513)
-
-_CLC_OVERLOAD _CLC_DEF double __spirv_ocl_normalize(double p) {
-  return __spirv_ocl_sign(p);
-}
-
-_CLC_SPIRV_NORMALIZE(2)
-_CLC_SPIRV_NORMALIZE(3)
-_CLC_SPIRV_NORMALIZE(4)
-
-#undef _CLC_SPIRV_NORMALIZE
-
-#endif
-
-#ifdef cl_khr_fp16
-
-#pragma OPENCL EXTENSION cl_khr_fp16 : enable
-
-#define _CLC_SPIRV_NORMALIZE(VLEN)                                             \
-  _CLC_SPIRV_NORMALIZE_IMPL(half, h, short, VLEN, HALF_MAX_SQRT, HALF_MIN_SQRT)
-
-_CLC_OVERLOAD _CLC_DEF half __spirv_ocl_normalize(half p) {
-  return __spirv_ocl_sign(p);
-}
-
-_CLC_SPIRV_NORMALIZE(2)
-_CLC_SPIRV_NORMALIZE(3)
-_CLC_SPIRV_NORMALIZE(4)
-
-#undef _CLC_SPIRV_NORMALIZE
-
-#endif
+#include <clc/math/gentype.inc>