Skip to content

[NFC][libclc] Refactor _CLC_*_VECTORIZE macros to functions in .inc files #145678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[NFC][libclc] Refactor _CLC_*_VECTORIZE macros to functions in .inc files #145678

wants to merge 1 commit into from
+560 −276

Conversation

wenju-he
Copy link
Contributor

With this PR, if we have customized implementation for scalar or vector length = 2, we don't need to write new macros, e.g. https://github.com/intel/llvm/blob/fb18321705f6/libclc/clc/include/clc/clcmacro.h#L15

Undef __HALF_ONLY, __FLOAT_ONLY and __DOUBLE_ONLY at the end of clc/include/clc/math/gentype.inc

llvm-diff shows no change to nvptx64--nvidiacl.bc and amdgcn--amdhsa.bc

@wenju-he
[NFC][libclc] Refactor _CLC_*_VECTORIZE macros to functions in .inc f…
4e6aa2a 
…iles

With this PR, if we have customized implementation for scalar or vector
length = 2, we don't need to write new macros, e.g.
https://github.com/intel/llvm/blob/fb18321705f6/libclc/clc/include/clc/clcmacro.h#L15

Undef __HALF_ONLY, __FLOAT_ONLY and __DOUBLE_ONLY at the end of
clc/include/clc/math/gentype.inc

llvm-diff shows no change to nvptx64--nvidiacl.bc and amdgcn--amdhsa.bc
@wenju-he wenju-he requested a review from frasercrmck June 25, 2025 11:26
@llvmbot
Copy link
Member

llvmbot commented Jun 25, 2025

@llvm/pr-subscribers-backend-amdgpu

Author: Wenju He (wenju-he)

Changes

With this PR, if we have customized implementation for scalar or vector length = 2, we don't need to write new macros, e.g. https://github.com/intel/llvm/blob/fb18321705f6/libclc/clc/include/clc/clcmacro.h#L15

Undef __HALF_ONLY, __FLOAT_ONLY and __DOUBLE_ONLY at the end of clc/include/clc/math/gentype.inc

llvm-diff shows no change to nvptx64--nvidiacl.bc and amdgcn--amdhsa.bc

Patch is 70.59 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/145678.diff

90 Files Affected:

  • (modified) libclc/clc/include/clc/clcmacro.h (-113)
  • (modified) libclc/clc/include/clc/geometric/clc_fast_distance.h (-1)
  • (modified) libclc/clc/include/clc/geometric/clc_fast_length.h (-1)
  • (modified) libclc/clc/include/clc/geometric/clc_fast_normalize.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_exp_helper.h (-2)
  • (modified) libclc/clc/include/clc/math/clc_half_cos.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_divide.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_exp.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_exp10.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_exp2.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_log.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_log10.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_log2.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_powr.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_recip.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_rsqrt.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_sin.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_sqrt.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_half_tan.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_cos.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_divide.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_exp.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_exp10.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_exp2.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_log.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_log10.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_log2.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_powr.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_recip.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_rsqrt.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_sin.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_sqrt.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_native_tan.h (-1)
  • (modified) libclc/clc/include/clc/math/clc_sincos_helpers.h (-4)
  • (modified) libclc/clc/include/clc/math/gentype.inc (+4)
  • (added) libclc/clc/include/clc/shared/binary_def_scalarize.inc (+121)
  • (added) libclc/clc/include/clc/shared/ternary_def_scalarize.inc (+143)
  • (added) libclc/clc/include/clc/shared/unary_def_scalarize.inc (+87)
  • (modified) libclc/clc/lib/amdgcn/math/clc_fmax.cl (+4-4)
  • (modified) libclc/clc/lib/amdgcn/math/clc_fmin.cl (+4-4)
  • (modified) libclc/clc/lib/amdgcn/math/clc_ldexp_override.cl (+14-3)
  • (modified) libclc/clc/lib/amdgpu/math/clc_native_exp2.cl (+6-5)
  • (modified) libclc/clc/lib/amdgpu/math/clc_sqrt_fp64.cl (+4-1)
  • (modified) libclc/clc/lib/clspv/math/clc_sw_fma.cl (+4-2)
  • (modified) libclc/clc/lib/generic/integer/clc_clz.cl (+3-8)
  • (modified) libclc/clc/lib/generic/integer/clc_ctz.cl (+3-8)
  • (modified) libclc/clc/lib/generic/math/clc_erf.cl (+10-2)
  • (modified) libclc/clc/lib/generic/math/clc_erfc.cl (+10-2)
  • (modified) libclc/clc/lib/generic/math/clc_fmax.cl (+25-3)
  • (modified) libclc/clc/lib/generic/math/clc_fmin.cl (+24-3)
  • (modified) libclc/clc/lib/generic/math/clc_fmod.cl (+13-3)
  • (modified) libclc/clc/lib/generic/math/clc_ldexp.cl (+6-6)
  • (modified) libclc/clc/lib/generic/math/clc_log.cl (+4-6)
  • (modified) libclc/clc/lib/generic/math/clc_log10.cl (+3-9)
  • (modified) libclc/clc/lib/generic/math/clc_log2.cl (+3-9)
  • (modified) libclc/clc/lib/generic/math/clc_remainder.cl (+13-4)
  • (modified) libclc/clc/lib/generic/math/clc_sincos_helpers.cl (-4)
  • (modified) libclc/clc/lib/generic/math/clc_sw_fma.cl (+4-2)
  • (modified) libclc/clc/lib/generic/math/clc_tgamma.cl (+10-2)
  • (modified) libclc/clc/lib/r600/math/clc_fmax.cl (+12-3)
  • (modified) libclc/clc/lib/r600/math/clc_fmin.cl (+12-3)
  • (modified) libclc/clc/lib/r600/math/clc_native_rsqrt.cl (+4-1)
  • (modified) libclc/clc/lib/r600/math/clc_rsqrt_override.cl (+10-2)
  • (modified) libclc/opencl/include/clc/opencl/geometric/fast_distance.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/geometric/fast_length.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/geometric/fast_normalize.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_cos.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_exp.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_exp10.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_exp2.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_log.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_log10.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_log2.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_recip.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_rsqrt.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_sin.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_sqrt.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/half_tan.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_cos.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_exp.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_exp10.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_exp2.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_log.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_log10.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_log2.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_recip.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_rsqrt.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_sin.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_sqrt.h (-1)
  • (modified) libclc/opencl/include/clc/opencl/math/native_tan.h (-1)
diff --git a/libclc/clc/include/clc/clcmacro.h b/libclc/clc/include/clc/clcmacro.h
index b712fe5cf326c..5c67c937cb1d4 100644
--- a/libclc/clc/include/clc/clcmacro.h
+++ b/libclc/clc/include/clc/clcmacro.h
@@ -12,111 +12,6 @@
 #include <clc/internal/clc.h>
 #include <clc/utils.h>
 
-#define _CLC_UNARY_VECTORIZE(DECLSPEC, RET_TYPE, FUNCTION, ARG1_TYPE)          \
-  DECLSPEC RET_TYPE##2 FUNCTION(ARG1_TYPE##2 x) {                              \
-    return (RET_TYPE##2)(FUNCTION(x.s0), FUNCTION(x.s1));                      \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##3 FUNCTION(ARG1_TYPE##3 x) {                              \
-    return (RET_TYPE##3)(FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2));      \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##4 FUNCTION(ARG1_TYPE##4 x) {                              \
-    return (RET_TYPE##4)(FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2),       \
-                         FUNCTION(x.s3));                                      \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##8 FUNCTION(ARG1_TYPE##8 x) {                              \
-    return (RET_TYPE##8)(FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2),       \
-                         FUNCTION(x.s3), FUNCTION(x.s4), FUNCTION(x.s5),       \
-                         FUNCTION(x.s6), FUNCTION(x.s7));                      \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##16 FUNCTION(ARG1_TYPE##16 x) {                            \
-    return (RET_TYPE##16)(                                                     \
-        FUNCTION(x.s0), FUNCTION(x.s1), FUNCTION(x.s2), FUNCTION(x.s3),        \
-        FUNCTION(x.s4), FUNCTION(x.s5), FUNCTION(x.s6), FUNCTION(x.s7),        \
-        FUNCTION(x.s8), FUNCTION(x.s9), FUNCTION(x.sa), FUNCTION(x.sb),        \
-        FUNCTION(x.sc), FUNCTION(x.sd), FUNCTION(x.se), FUNCTION(x.sf));       \
-  }
-
-#define _CLC_BINARY_VECTORIZE(DECLSPEC, RET_TYPE, FUNCTION, ARG1_TYPE,         \
-                              ARG2_TYPE)                                       \
-  DECLSPEC RET_TYPE##2 FUNCTION(ARG1_TYPE##2 x, ARG2_TYPE##2 y) {              \
-    return (RET_TYPE##2)(FUNCTION(x.s0, y.s0), FUNCTION(x.s1, y.s1));          \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##3 FUNCTION(ARG1_TYPE##3 x, ARG2_TYPE##3 y) {              \
-    return (RET_TYPE##3)(FUNCTION(x.s0, y.s0), FUNCTION(x.s1, y.s1),           \
-                         FUNCTION(x.s2, y.s2));                                \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##4 FUNCTION(ARG1_TYPE##4 x, ARG2_TYPE##4 y) {              \
-    return (RET_TYPE##4)(FUNCTION(x.s0, y.s0), FUNCTION(x.s1, y.s1),           \
-                         FUNCTION(x.s2, y.s2), FUNCTION(x.s3, y.s3));          \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##8 FUNCTION(ARG1_TYPE##8 x, ARG2_TYPE##8 y) {              \
-    return (RET_TYPE##8)(FUNCTION(x.s0, y.s0), FUNCTION(x.s1, y.s1),           \
-                         FUNCTION(x.s2, y.s2), FUNCTION(x.s3, y.s3),           \
-                         FUNCTION(x.s4, y.s4), FUNCTION(x.s5, y.s5),           \
-                         FUNCTION(x.s6, y.s6), FUNCTION(x.s7, y.s7));          \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##16 FUNCTION(ARG1_TYPE##16 x, ARG2_TYPE##16 y) {           \
-    return (RET_TYPE##16)(                                                     \
-        FUNCTION(x.s0, y.s0), FUNCTION(x.s1, y.s1), FUNCTION(x.s2, y.s2),      \
-        FUNCTION(x.s3, y.s3), FUNCTION(x.s4, y.s4), FUNCTION(x.s5, y.s5),      \
-        FUNCTION(x.s6, y.s6), FUNCTION(x.s7, y.s7), FUNCTION(x.s8, y.s8),      \
-        FUNCTION(x.s9, y.s9), FUNCTION(x.sa, y.sa), FUNCTION(x.sb, y.sb),      \
-        FUNCTION(x.sc, y.sc), FUNCTION(x.sd, y.sd), FUNCTION(x.se, y.se),      \
-        FUNCTION(x.sf, y.sf));                                                 \
-  }
-
-#define _CLC_TERNARY_VECTORIZE(DECLSPEC, RET_TYPE, FUNCTION, ARG1_TYPE,        \
-                               ARG2_TYPE, ARG3_TYPE)                           \
-  DECLSPEC RET_TYPE##2 FUNCTION(ARG1_TYPE##2 x, ARG2_TYPE##2 y,                \
-                                ARG3_TYPE##2 z) {                              \
-    return (RET_TYPE##2)(FUNCTION(x.s0, y.s0, z.s0),                           \
-                         FUNCTION(x.s1, y.s1, z.s1));                          \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##3 FUNCTION(ARG1_TYPE##3 x, ARG2_TYPE##3 y,                \
-                                ARG3_TYPE##3 z) {                              \
-    return (RET_TYPE##3)(FUNCTION(x.s0, y.s0, z.s0),                           \
-                         FUNCTION(x.s1, y.s1, z.s1),                           \
-                         FUNCTION(x.s2, y.s2, z.s2));                          \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##4 FUNCTION(ARG1_TYPE##4 x, ARG2_TYPE##4 y,                \
-                                ARG3_TYPE##4 z) {                              \
-    return (RET_TYPE##4)(                                                      \
-        FUNCTION(x.s0, y.s0, z.s0), FUNCTION(x.s1, y.s1, z.s1),                \
-        FUNCTION(x.s2, y.s2, z.s2), FUNCTION(x.s3, y.s3, z.s3));               \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##8 FUNCTION(ARG1_TYPE##8 x, ARG2_TYPE##8 y,                \
-                                ARG3_TYPE##8 z) {                              \
-    return (RET_TYPE##8)(                                                      \
-        FUNCTION(x.s0, y.s0, z.s0), FUNCTION(x.s1, y.s1, z.s1),                \
-        FUNCTION(x.s2, y.s2, z.s2), FUNCTION(x.s3, y.s3, z.s3),                \
-        FUNCTION(x.s4, y.s4, z.s4), FUNCTION(x.s5, y.s5, z.s5),                \
-        FUNCTION(x.s6, y.s6, z.s6), FUNCTION(x.s7, y.s7, z.s7));               \
-  }                                                                            \
-                                                                               \
-  DECLSPEC RET_TYPE##16 FUNCTION(ARG1_TYPE##16 x, ARG2_TYPE##16 y,             \
-                                 ARG3_TYPE##16 z) {                            \
-    return (RET_TYPE##16)(                                                     \
-        FUNCTION(x.s0, y.s0, z.s0), FUNCTION(x.s1, y.s1, z.s1),                \
-        FUNCTION(x.s2, y.s2, z.s2), FUNCTION(x.s3, y.s3, z.s3),                \
-        FUNCTION(x.s4, y.s4, z.s4), FUNCTION(x.s5, y.s5, z.s5),                \
-        FUNCTION(x.s6, y.s6, z.s6), FUNCTION(x.s7, y.s7, z.s7),                \
-        FUNCTION(x.s8, y.s8, z.s8), FUNCTION(x.s9, y.s9, z.s9),                \
-        FUNCTION(x.sa, y.sa, z.sa), FUNCTION(x.sb, y.sb, z.sb),                \
-        FUNCTION(x.sc, y.sc, z.sc), FUNCTION(x.sd, y.sd, z.sd),                \
-        FUNCTION(x.se, y.se, z.se), FUNCTION(x.sf, y.sf, z.sf));               \
-  }
-
 #define _CLC_V_V_VP_VECTORIZE(DECLSPEC, RET_TYPE, FUNCTION, ARG1_TYPE,         \
                               ADDR_SPACE, ARG2_TYPE)                           \
   DECLSPEC __CLC_XCONCAT(RET_TYPE, 2)                                          \
@@ -171,12 +66,4 @@
         FUNCTION(x.sf, ptr + 15));                                             \
   }
 
-#define _CLC_DEFINE_BINARY_BUILTIN(RET_TYPE, FUNCTION, BUILTIN, ARG1_TYPE,     \
-                                   ARG2_TYPE)                                  \
-  _CLC_DEF _CLC_OVERLOAD RET_TYPE FUNCTION(ARG1_TYPE x, ARG2_TYPE y) {         \
-    return BUILTIN(x, y);                                                      \
-  }                                                                            \
-  _CLC_BINARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, RET_TYPE, FUNCTION, ARG1_TYPE, \
-                        ARG2_TYPE)
-
 #endif // __CLC_CLCMACRO_H__
diff --git a/libclc/clc/include/clc/geometric/clc_fast_distance.h b/libclc/clc/include/clc/geometric/clc_fast_distance.h
index 489bea4299516..17165e56367ca 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_distance.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_distance.h
@@ -15,7 +15,6 @@
 
 #include <clc/math/gentype.inc>
 
-#undef __FLOAT_ONLY
 #undef __CLC_FUNCTION
 
 #endif // __CLC_GEOMETRIC_CLC_FAST_DISTANCE_H__
diff --git a/libclc/clc/include/clc/geometric/clc_fast_length.h b/libclc/clc/include/clc/geometric/clc_fast_length.h
index 40552634fff94..a2d533e79c0ef 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_length.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_length.h
@@ -15,7 +15,6 @@
 
 #include <clc/math/gentype.inc>
 
-#undef __FLOAT_ONLY
 #undef __CLC_FUNCTION
 
 #endif // __CLC_GEOMETRIC_CLC_FAST_LENGTH_H__
diff --git a/libclc/clc/include/clc/geometric/clc_fast_normalize.h b/libclc/clc/include/clc/geometric/clc_fast_normalize.h
index 66eed8b83ab18..a168ac1d46783 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_normalize.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_normalize.h
@@ -17,6 +17,5 @@
 
 #undef __CLC_FUNCTION
 #undef __CLC_GEOMETRIC_RET_GENTYPE
-#undef __FLOAT_ONLY
 
 #endif // __CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H__
diff --git a/libclc/clc/include/clc/math/clc_exp_helper.h b/libclc/clc/include/clc/math/clc_exp_helper.h
index 89c725ca0d5c9..0c5028bd23858 100644
--- a/libclc/clc/include/clc/math/clc_exp_helper.h
+++ b/libclc/clc/include/clc/math/clc_exp_helper.h
@@ -14,6 +14,4 @@
 
 #include <clc/math/gentype.inc>
 
-#undef __DOUBLE_ONLY
-
 #endif // __CLC_MATH_CLC_EXP_HELPER
diff --git a/libclc/clc/include/clc/math/clc_half_cos.h b/libclc/clc/include/clc/math/clc_half_cos.h
index d0efc45793af9..4c70572c99070 100644
--- a/libclc/clc/include/clc/math/clc_half_cos.h
+++ b/libclc/clc/include/clc/math/clc_half_cos.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_COS_H__
diff --git a/libclc/clc/include/clc/math/clc_half_divide.h b/libclc/clc/include/clc/math/clc_half_divide.h
index 5d1e7b9e33e39..d87577e3bc201 100644
--- a/libclc/clc/include/clc/math/clc_half_divide.h
+++ b/libclc/clc/include/clc/math/clc_half_divide.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_DIVIDE_H__
diff --git a/libclc/clc/include/clc/math/clc_half_exp.h b/libclc/clc/include/clc/math/clc_half_exp.h
index e95f3d42085c8..a66f9c2ab16cb 100644
--- a/libclc/clc/include/clc/math/clc_half_exp.h
+++ b/libclc/clc/include/clc/math/clc_half_exp.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_EXP_H__
diff --git a/libclc/clc/include/clc/math/clc_half_exp10.h b/libclc/clc/include/clc/math/clc_half_exp10.h
index e4cce6e63bf7a..a61720af4d1b5 100644
--- a/libclc/clc/include/clc/math/clc_half_exp10.h
+++ b/libclc/clc/include/clc/math/clc_half_exp10.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_EXP10_H__
diff --git a/libclc/clc/include/clc/math/clc_half_exp2.h b/libclc/clc/include/clc/math/clc_half_exp2.h
index 6fc99735f0928..ca96d25f77c58 100644
--- a/libclc/clc/include/clc/math/clc_half_exp2.h
+++ b/libclc/clc/include/clc/math/clc_half_exp2.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_EXP2_H__
diff --git a/libclc/clc/include/clc/math/clc_half_log.h b/libclc/clc/include/clc/math/clc_half_log.h
index e44e686499663..95bf1a9745605 100644
--- a/libclc/clc/include/clc/math/clc_half_log.h
+++ b/libclc/clc/include/clc/math/clc_half_log.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_LOG_H__
diff --git a/libclc/clc/include/clc/math/clc_half_log10.h b/libclc/clc/include/clc/math/clc_half_log10.h
index 23e0ba116c728..359e37ce6cf18 100644
--- a/libclc/clc/include/clc/math/clc_half_log10.h
+++ b/libclc/clc/include/clc/math/clc_half_log10.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_LOG10_H__
diff --git a/libclc/clc/include/clc/math/clc_half_log2.h b/libclc/clc/include/clc/math/clc_half_log2.h
index 8ea2439eb3db6..82bfa9bd6afa6 100644
--- a/libclc/clc/include/clc/math/clc_half_log2.h
+++ b/libclc/clc/include/clc/math/clc_half_log2.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_LOG2_H__
diff --git a/libclc/clc/include/clc/math/clc_half_powr.h b/libclc/clc/include/clc/math/clc_half_powr.h
index 252bfcd785043..bde0c0249abfd 100644
--- a/libclc/clc/include/clc/math/clc_half_powr.h
+++ b/libclc/clc/include/clc/math/clc_half_powr.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_POWR_H__
diff --git a/libclc/clc/include/clc/math/clc_half_recip.h b/libclc/clc/include/clc/math/clc_half_recip.h
index 1adb0bbe249cc..40793cfb2aef5 100644
--- a/libclc/clc/include/clc/math/clc_half_recip.h
+++ b/libclc/clc/include/clc/math/clc_half_recip.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_RECIP_H__
diff --git a/libclc/clc/include/clc/math/clc_half_rsqrt.h b/libclc/clc/include/clc/math/clc_half_rsqrt.h
index 6342739ed6f20..c0c9971480f87 100644
--- a/libclc/clc/include/clc/math/clc_half_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_half_rsqrt.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_RSQRT_H__
diff --git a/libclc/clc/include/clc/math/clc_half_sin.h b/libclc/clc/include/clc/math/clc_half_sin.h
index 31378d290fecc..022b6bbeabf16 100644
--- a/libclc/clc/include/clc/math/clc_half_sin.h
+++ b/libclc/clc/include/clc/math/clc_half_sin.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_SIN_H__
diff --git a/libclc/clc/include/clc/math/clc_half_sqrt.h b/libclc/clc/include/clc/math/clc_half_sqrt.h
index 0e765fb3e7731..be663c298b89c 100644
--- a/libclc/clc/include/clc/math/clc_half_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_half_sqrt.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_SQRT_H__
diff --git a/libclc/clc/include/clc/math/clc_half_tan.h b/libclc/clc/include/clc/math/clc_half_tan.h
index 6c890a952522c..acb30c4e31d4e 100644
--- a/libclc/clc/include/clc/math/clc_half_tan.h
+++ b/libclc/clc/include/clc/math/clc_half_tan.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_HALF_TAN_H__
diff --git a/libclc/clc/include/clc/math/clc_native_cos.h b/libclc/clc/include/clc/math/clc_native_cos.h
index f5837d5479133..bd678301fa505 100644
--- a/libclc/clc/include/clc/math/clc_native_cos.h
+++ b/libclc/clc/include/clc/math/clc_native_cos.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_COS_H__
diff --git a/libclc/clc/include/clc/math/clc_native_divide.h b/libclc/clc/include/clc/math/clc_native_divide.h
index ed8118775e98b..1e912152cbb6c 100644
--- a/libclc/clc/include/clc/math/clc_native_divide.h
+++ b/libclc/clc/include/clc/math/clc_native_divide.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_DIVIDE_H__
diff --git a/libclc/clc/include/clc/math/clc_native_exp.h b/libclc/clc/include/clc/math/clc_native_exp.h
index b9c4005585daa..e85d7a8b006e3 100644
--- a/libclc/clc/include/clc/math/clc_native_exp.h
+++ b/libclc/clc/include/clc/math/clc_native_exp.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_EXP_H__
diff --git a/libclc/clc/include/clc/math/clc_native_exp10.h b/libclc/clc/include/clc/math/clc_native_exp10.h
index 5c49e46330d60..17213bbd2b248 100644
--- a/libclc/clc/include/clc/math/clc_native_exp10.h
+++ b/libclc/clc/include/clc/math/clc_native_exp10.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_EXP10_H__
diff --git a/libclc/clc/include/clc/math/clc_native_exp2.h b/libclc/clc/include/clc/math/clc_native_exp2.h
index 2fa368f69fef4..2310fcd60cacf 100644
--- a/libclc/clc/include/clc/math/clc_native_exp2.h
+++ b/libclc/clc/include/clc/math/clc_native_exp2.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_EXP2_H__
diff --git a/libclc/clc/include/clc/math/clc_native_log.h b/libclc/clc/include/clc/math/clc_native_log.h
index 61fe0c0902d85..0613e34f500c8 100644
--- a/libclc/clc/include/clc/math/clc_native_log.h
+++ b/libclc/clc/include/clc/math/clc_native_log.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_LOG_H__
diff --git a/libclc/clc/include/clc/math/clc_native_log10.h b/libclc/clc/include/clc/math/clc_native_log10.h
index f9fca1d94aedb..462226393c093 100644
--- a/libclc/clc/include/clc/math/clc_native_log10.h
+++ b/libclc/clc/include/clc/math/clc_native_log10.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_LOG10_H__
diff --git a/libclc/clc/include/clc/math/clc_native_log2.h b/libclc/clc/include/clc/math/clc_native_log2.h
index 69aec752b832b..357ed117097f4 100644
--- a/libclc/clc/include/clc/math/clc_native_log2.h
+++ b/libclc/clc/include/clc/math/clc_native_log2.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_LOG2_H__
diff --git a/libclc/clc/include/clc/math/clc_native_powr.h b/libclc/clc/include/clc/math/clc_native_powr.h
index 8d50f21a3124d..378b9c8895ea9 100644
--- a/libclc/clc/include/clc/math/clc_native_powr.h
+++ b/libclc/clc/include/clc/math/clc_native_powr.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_POWR_H__
diff --git a/libclc/clc/include/clc/math/clc_native_recip.h b/libclc/clc/include/clc/math/clc_native_recip.h
index 94d494ad07a17..8ff18012c5f02 100644
--- a/libclc/clc/include/clc/math/clc_native_recip.h
+++ b/libclc/clc/include/clc/math/clc_native_recip.h
@@ -16,6 +16,5 @@
 #include <clc/math/gentype.inc>
 
 #undef __CLC_FUNCTION
-#undef __FLOAT_ONLY
 
 #endif // __CLC_MATH_CLC_NATIVE_RECIP_H__
diff --git a/libclc/clc/include/clc/math/clc_native_rsqrt.h b/libclc/clc/include/clc/math/clc_native_rsqrt.h
index 5b58d6efd7584..91e3b87261c27 100644
--- a/li...
[truncated]

frasercrmck
frasercrmck approved these changes Jun 25, 2025
View reviewed changes
Copy link
Contributor

@frasercrmck frasercrmck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was about to look into something along these lines but you beat me to it.

libclc/clc/include/clc/shared/binary_def_scalarize.inc
#endif

#ifndef __CLC_DEF_SPEC
#define __CLC_DEF_SPEC _CLC_DEF
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this idea. We should probably extend this to the existing gentype helpers (in another PR) so there's always control over the def spec.

libclc/clc/include/clc/shared/binary_def_scalarize.inc
#if __CLC_VECSIZE_OR_1 == 1

#ifndef __IMPL_FUNCTION
#define __IMPL_FUNCTION FUNCTION
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be #undefing these macros at the end of this file?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frasercrmck frasercrmck frasercrmck approved these changes

Assignees
No one assigned
Labels
backend:AMDGPU
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wenju-he @llvmbot @frasercrmck