[libclc] Move abs/abs_diff to CLC library

frasercrmck · frasercrmck · commit 4e20b3e57107 · 2024-12-04T10:45:41.000Z
diff --git a/libclc/clc/include/clc/integer/clc_abs.h b/libclc/clc/include/clc/integer/clc_abs.h
@@ -0,0 +1,14 @@
+#ifndef __CLC_INTEGER_CLC_ABS_H__
+#define __CLC_INTEGER_CLC_ABS_H__
+
+#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
+// clspv and spir-v targets provide their own OpenCL-compatible abs
+#define __clc_abs abs
+#else
+
+#define __CLC_BODY <clc/integer/clc_abs.inc>
+#include <clc/integer/gentype.inc>
+
+#endif
+
+#endif // __CLC_INTEGER_CLC_ABS_H__
diff --git a/libclc/clc/include/clc/integer/clc_abs.inc b/libclc/clc/include/clc/integer/clc_abs.inc
@@ -0,0 +1 @@
+_CLC_OVERLOAD _CLC_DECL __CLC_U_GENTYPE __clc_abs(__CLC_GENTYPE x);
diff --git a/libclc/clc/include/clc/integer/clc_abs_diff.h b/libclc/clc/include/clc/integer/clc_abs_diff.h
@@ -0,0 +1,14 @@
+#ifndef __CLC_INTEGER_CLC_ABS_DIFF_H__
+#define __CLC_INTEGER_CLC_ABS_DIFF_H__
+
+#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
+// clspv and spir-v targets provide their own OpenCL-compatible abs_diff
+#define __clc_abs_diff abs_diff
+#else
+
+#define __CLC_BODY <clc/integer/clc_abs_diff.inc>
+#include <clc/integer/gentype.inc>
+
+#endif
+
+#endif // __CLC_INTEGER_CLC_ABS_DIFF_H__
diff --git a/libclc/clc/include/clc/integer/clc_abs_diff.inc b/libclc/clc/include/clc/integer/clc_abs_diff.inc
@@ -0,0 +1,2 @@
+_CLC_OVERLOAD _CLC_DECL __CLC_U_GENTYPE __clc_abs_diff(__CLC_GENTYPE x,
+                                                       __CLC_GENTYPE y);
diff --git a/libclc/clc/lib/generic/SOURCES b/libclc/clc/lib/generic/SOURCES
@@ -1,4 +1,6 @@
 geometric/clc_dot.cl
+integer/clc_abs.cl
+integer/clc_abs_diff.cl
 shared/clc_clamp.cl
 shared/clc_max.cl
 shared/clc_min.cl
diff --git a/libclc/clc/lib/generic/integer/clc_abs.cl b/libclc/clc/lib/generic/integer/clc_abs.cl
@@ -0,0 +1,4 @@
+#include <clc/internal/clc.h>
+
+#define __CLC_BODY <clc_abs.inc>
+#include <clc/integer/gentype.inc>
diff --git a/libclc/clc/lib/generic/integer/clc_abs.inc b/libclc/clc/lib/generic/integer/clc_abs.inc
@@ -0,0 +1,4 @@
+_CLC_OVERLOAD _CLC_DEF __CLC_U_GENTYPE __clc_abs(__CLC_GENTYPE x) {
+  return __builtin_astype((__CLC_GENTYPE)(x > (__CLC_GENTYPE)(0) ? x : -x),
+                          __CLC_U_GENTYPE);
+}
diff --git a/libclc/clc/lib/generic/integer/clc_abs_diff.cl b/libclc/clc/lib/generic/integer/clc_abs_diff.cl
@@ -0,0 +1,4 @@
+#include <clc/internal/clc.h>
+
+#define __CLC_BODY <clc_abs_diff.inc>
+#include <clc/integer/gentype.inc>
diff --git a/libclc/clc/lib/generic/integer/clc_abs_diff.inc b/libclc/clc/lib/generic/integer/clc_abs_diff.inc
@@ -0,0 +1,6 @@
+_CLC_OVERLOAD _CLC_DEF __CLC_U_GENTYPE __clc_abs_diff(__CLC_GENTYPE x,
+                                                      __CLC_GENTYPE y) {
+  __CLC_U_GENTYPE ux = __builtin_astype(x, __CLC_U_GENTYPE);
+  __CLC_U_GENTYPE uy = __builtin_astype(y, __CLC_U_GENTYPE);
+  return x > y ? ux - uy : uy - ux;
+}
diff --git a/libclc/generic/lib/integer/abs.cl b/libclc/generic/lib/integer/abs.cl
@@ -1,6 +1,5 @@
 #include <clc/clc.h>
-#include <core/clc_core.h>
-#include <spirv/spirv.h>
+#include <clc/integer/clc_abs.h>
 
 #define __CLC_BODY <abs.inc>
 #include <clc/integer/gentype.inc>
diff --git a/libclc/generic/lib/integer/abs.inc b/libclc/generic/lib/integer/abs.inc
@@ -1,3 +1,3 @@
 _CLC_OVERLOAD _CLC_DEF __CLC_U_GENTYPE abs(__CLC_GENTYPE x) {
-  return __builtin_astype((__CLC_GENTYPE)(x > (__CLC_GENTYPE)(0) ? x : -x), __CLC_U_GENTYPE);
+  return __clc_abs(x);
 }
diff --git a/libclc/generic/lib/integer/abs_diff.cl b/libclc/generic/lib/integer/abs_diff.cl
@@ -1,6 +1,5 @@
 #include <clc/clc.h>
-#include <core/clc_core.h>
-#include <spirv/spirv.h>
+#include <clc/integer/clc_abs_diff.h>
 
 #define __CLC_BODY <abs_diff.inc>
 #include <clc/integer/gentype.inc>
diff --git a/libclc/generic/lib/integer/abs_diff.inc b/libclc/generic/lib/integer/abs_diff.inc
@@ -1,5 +1,3 @@
 _CLC_OVERLOAD _CLC_DEF __CLC_U_GENTYPE abs_diff(__CLC_GENTYPE x, __CLC_GENTYPE y) {
-  __CLC_U_GENTYPE ux = __builtin_astype(x, __CLC_U_GENTYPE);
-  __CLC_U_GENTYPE uy = __builtin_astype(y, __CLC_U_GENTYPE);
-  return x > y ? ux - uy : uy - ux;
+  return __clc_abs_diff(x, y);
 }
diff --git a/libclc/generic/libspirv/SOURCES b/libclc/generic/libspirv/SOURCES
@@ -27,8 +27,6 @@ common/radians.cl
 common/sign.cl
 common/smoothstep.cl
 common/step.cl
-core/integer/clc_abs.cl
-core/integer/clc_abs_diff.cl
 core/integer/clc_add_sat.cl
 core/integer/clc_hadd.cl
 core/integer/clc_mad24.cl
diff --git a/libclc/generic/libspirv/core/integer/clc_abs.cl b/libclc/generic/libspirv/core/integer/clc_abs.cl
diff --git a/libclc/generic/libspirv/core/integer/clc_abs.inc b/libclc/generic/libspirv/core/integer/clc_abs.inc
diff --git a/libclc/generic/libspirv/core/integer/clc_abs_diff.cl b/libclc/generic/libspirv/core/integer/clc_abs_diff.cl
diff --git a/libclc/generic/libspirv/core/integer/clc_abs_diff.inc b/libclc/generic/libspirv/core/integer/clc_abs_diff.inc
diff --git a/libclc/generic/libspirv/integer/abs.cl b/libclc/generic/libspirv/integer/abs.cl
@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <core/clc_core.h>
+#include <clc/internal/clc.h>
+#include <clc/integer/clc_abs.h>
 #include <spirv/spirv.h>
 
 #define __CLC_BODY <abs.inc>
diff --git a/libclc/generic/libspirv/integer/abs_diff.cl b/libclc/generic/libspirv/integer/abs_diff.cl
@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <core/clc_core.h>
+#include <clc/internal/clc.h>
+#include <clc/integer/clc_abs_diff.h>
 #include <spirv/spirv.h>
 
 #define __CLC_BODY <abs_diff.inc>
diff --git a/libclc/generic/libspirv/math/clc_fma.cl b/libclc/generic/libspirv/math/clc_fma.cl
@@ -21,6 +21,7 @@
  */
 
 #include <clc/clcmacro.h>
+#include <clc/integer/clc_abs.h>
 #include <config.h>
 #include <core/clc_core.h>
 #include <math/math.h>
diff --git a/libclc/generic/libspirv/math/clc_hypot.cl b/libclc/generic/libspirv/math/clc_hypot.cl
@@ -9,8 +9,9 @@
 #include <spirv/spirv.h>
 
 #include <clc/clc.h>
-#include <clc/shared/clc_clamp.h>
 #include <clc/clcmacro.h>
+#include <clc/integer/clc_abs.h>
+#include <clc/shared/clc_clamp.h>
 #include <config.h>
 #include <math/clc_hypot.h>
 #include <math/math.h>
@@ -69,7 +70,7 @@ _CLC_DEF _CLC_OVERLOAD double __clc_hypot(double x, double y) {
 
   // If the difference in exponents between x and y is large
   double s = x + y;
-  c = __spirv_ocl_s_abs(xexp - yexp) > MANTLENGTH_DP64 + 1;
+  c = __clc_abs(xexp - yexp) > MANTLENGTH_DP64 + 1;
   r = c ? s : r;
 
   // Check for NaN

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+_CLC_OVERLOAD _CLC_DECL __CLC_U_GENTYPE __clc_abs(__CLC_GENTYPE x);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+_CLC_OVERLOAD _CLC_DECL __CLC_U_GENTYPE __clc_abs_diff(__CLC_GENTYPE x,`
	`2`	`+ __CLC_GENTYPE y);`