[libclc][NFC] Remove unary_builtin.inc (#137656)

frasercrmck · web-flow · commit 837d5a740f12 · 2025-04-29T14:17:17.000+01:00
We had two ways of achieving the same thing. This commit removes
unary_builtin.inc in favour of the approach combining gentype.inc with
unary_def.inc.

There is no change to the codegen for any target.
diff --git a/libclc/clc/include/clc/math/unary_builtin.inc b/libclc/clc/include/clc/math/unary_builtin.inc
diff --git a/libclc/clc/lib/generic/math/clc_ceil.cl b/libclc/clc/lib/generic/math/clc_ceil.cl
@@ -8,7 +8,8 @@
 
 #include <clc/internal/clc.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION __clc_ceil
-#define __CLC_BUILTIN __builtin_elementwise_ceil
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION __clc_ceil
+#define __CLC_FUNCTION(x) __builtin_elementwise_ceil
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/clc/lib/generic/math/clc_fabs.cl b/libclc/clc/lib/generic/math/clc_fabs.cl
@@ -8,7 +8,8 @@
 
 #include <clc/internal/clc.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION __clc_fabs
-#define __CLC_BUILTIN __builtin_elementwise_abs
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION __clc_fabs
+#define __CLC_FUNCTION(x) __builtin_elementwise_abs
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/clc/lib/generic/math/clc_floor.cl b/libclc/clc/lib/generic/math/clc_floor.cl
@@ -8,7 +8,8 @@
 
 #include <clc/internal/clc.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION __clc_floor
-#define __CLC_BUILTIN __builtin_elementwise_floor
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION __clc_floor
+#define __CLC_FUNCTION(x) __builtin_elementwise_floor
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/clc/lib/generic/math/clc_rint.cl b/libclc/clc/lib/generic/math/clc_rint.cl
@@ -8,7 +8,8 @@
 
 #include <clc/internal/clc.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION __clc_rint
-#define __CLC_BUILTIN __builtin_elementwise_rint
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION __clc_rint
+#define __CLC_FUNCTION(x) __builtin_elementwise_rint
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/clc/lib/generic/math/clc_round.cl b/libclc/clc/lib/generic/math/clc_round.cl
@@ -8,7 +8,8 @@
 
 #include <clc/internal/clc.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION __clc_round
-#define __CLC_BUILTIN __builtin_elementwise_round
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION __clc_round
+#define __CLC_FUNCTION(x) __builtin_elementwise_round
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/clc/lib/generic/math/clc_trunc.cl b/libclc/clc/lib/generic/math/clc_trunc.cl
@@ -8,7 +8,8 @@
 
 #include <clc/internal/clc.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION __clc_trunc
-#define __CLC_BUILTIN __builtin_elementwise_trunc
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION __clc_trunc
+#define __CLC_FUNCTION(x) __builtin_elementwise_trunc
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/acos.cl b/libclc/generic/lib/math/acos.cl
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clc.h>
-#include <clc/clcmacro.h>
 #include <clc/math/clc_acos.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION acos
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION acos
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/acosh.cl b/libclc/generic/lib/math/acosh.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_acosh.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION acosh
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION acosh
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/acospi.cl b/libclc/generic/lib/math/acospi.cl
@@ -9,7 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_acospi.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION acospi
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION acospi
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/asin.cl b/libclc/generic/lib/math/asin.cl
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clc.h>
-#include <clc/clcmacro.h>
 #include <clc/math/clc_asin.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION asin
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION asin
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/asinh.cl b/libclc/generic/lib/math/asinh.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_asinh.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION asinh
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION asinh
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/asinpi.cl b/libclc/generic/lib/math/asinpi.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_asinpi.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION asinpi
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION asinpi
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/atan.cl b/libclc/generic/lib/math/atan.cl
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clc.h>
-#include <clc/clcmacro.h>
 #include <clc/math/clc_atan.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION atan
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION atan
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/atanh.cl b/libclc/generic/lib/math/atanh.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_atanh.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION atanh
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION atanh
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/atanpi.cl b/libclc/generic/lib/math/atanpi.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_atanpi.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION atanpi
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION atanpi
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/ceil.cl b/libclc/generic/lib/math/ceil.cl
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clc.h>
-#include <clc/clcmacro.h>
 #include <clc/math/clc_ceil.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION ceil
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION ceil
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/fabs.cl b/libclc/generic/lib/math/fabs.cl
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clc.h>
-#include <clc/clcmacro.h>
 #include <clc/math/clc_fabs.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION fabs
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION fabs
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/floor.cl b/libclc/generic/lib/math/floor.cl
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clc.h>
-#include <clc/clcmacro.h>
 #include <clc/math/clc_floor.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION floor
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION floor
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/log1p.cl b/libclc/generic/lib/math/log1p.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_log1p.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION log1p
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION log1p
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/rint.cl b/libclc/generic/lib/math/rint.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_rint.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION rint
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION rint
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/round.cl b/libclc/generic/lib/math/round.cl
@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clc.h>
-#include <clc/clcmacro.h>
 #include <clc/math/clc_round.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION round
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION round
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
diff --git a/libclc/generic/lib/math/trunc.cl b/libclc/generic/lib/math/trunc.cl
@@ -9,6 +9,7 @@
 #include <clc/clc.h>
 #include <clc/math/clc_trunc.h>
 
-#undef __CLC_FUNCTION
-#define __CLC_FUNCTION trunc
-#include <clc/math/unary_builtin.inc>
+#define FUNCTION trunc
+#define __CLC_BODY <clc/shared/unary_def.inc>
+
+#include <clc/math/gentype.inc>
