https://github.com/wenju-he created https://github.com/llvm/llvm-project/pull/186384
Follow-up of 9b96ebc. There are binary_def.inc and unary_def.inc in header directory. - clc_ep.inc -> clc_ep_decl.inc - relational/binary_def.inc -> relational/relational_binary_def.inc - relational/unary_def.inc -> relational/relational_unary_def.inc >From c85fa107e49305cd3b533b5d0cb3d005c5172983 Mon Sep 17 00:00:00 2001 From: Wenju He <[email protected]> Date: Fri, 13 Mar 2026 13:51:38 +0100 Subject: [PATCH] [libclc][NFC] Rename three .inc files to avoid name conflicts Follow-up of 9b96ebc. There are binary_def.inc and unary_def.inc in header directory. - clc_ep.inc -> clc_ep_decl.inc - relational/binary_def.inc -> relational/relational_binary_def.inc - relational/unary_def.inc -> relational/relational_unary_def.inc --- libclc/clc/include/clc/math/clc_ep.h | 2 +- libclc/clc/include/clc/math/{clc_ep.inc => clc_ep_decl.inc} | 0 libclc/opencl/lib/generic/relational/isequal.cl | 2 +- libclc/opencl/lib/generic/relational/isfinite.cl | 2 +- libclc/opencl/lib/generic/relational/isgreater.cl | 2 +- libclc/opencl/lib/generic/relational/isgreaterequal.cl | 2 +- libclc/opencl/lib/generic/relational/isinf.cl | 2 +- libclc/opencl/lib/generic/relational/isless.cl | 2 +- libclc/opencl/lib/generic/relational/islessequal.cl | 2 +- libclc/opencl/lib/generic/relational/islessgreater.cl | 2 +- libclc/opencl/lib/generic/relational/isnan.cl | 2 +- libclc/opencl/lib/generic/relational/isnormal.cl | 2 +- libclc/opencl/lib/generic/relational/isnotequal.cl | 2 +- libclc/opencl/lib/generic/relational/isordered.cl | 2 +- libclc/opencl/lib/generic/relational/isunordered.cl | 2 +- .../relational/{binary_def.inc => relational_binary_def.inc} | 0 .../relational/{unary_def.inc => relational_unary_def.inc} | 0 libclc/opencl/lib/generic/relational/signbit.cl | 2 +- 18 files changed, 15 insertions(+), 15 deletions(-) rename libclc/clc/include/clc/math/{clc_ep.inc => clc_ep_decl.inc} (100%) rename libclc/opencl/lib/generic/relational/{binary_def.inc => relational_binary_def.inc} (100%) rename libclc/opencl/lib/generic/relational/{unary_def.inc => relational_unary_def.inc} (100%) diff --git a/libclc/clc/include/clc/math/clc_ep.h b/libclc/clc/include/clc/math/clc_ep.h index 1834ba05d7e50..a53e8ca539ea8 100644 --- a/libclc/clc/include/clc/math/clc_ep.h +++ b/libclc/clc/include/clc/math/clc_ep.h @@ -15,7 +15,7 @@ #include "clc/internal/clc.h" -#define __CLC_BODY <clc/math/clc_ep.inc> +#define __CLC_BODY <clc/math/clc_ep_decl.inc> #include <clc/math/gentype.inc> #endif // __CLC_MATH_CLC_EP_H__ diff --git a/libclc/clc/include/clc/math/clc_ep.inc b/libclc/clc/include/clc/math/clc_ep_decl.inc similarity index 100% rename from libclc/clc/include/clc/math/clc_ep.inc rename to libclc/clc/include/clc/math/clc_ep_decl.inc diff --git a/libclc/opencl/lib/generic/relational/isequal.cl b/libclc/opencl/lib/generic/relational/isequal.cl index 6bbf7d4d664aa..c82657333a8de 100644 --- a/libclc/opencl/lib/generic/relational/isequal.cl +++ b/libclc/opencl/lib/generic/relational/isequal.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isequal.h> #define __CLC_FUNCTION isequal -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isfinite.cl b/libclc/opencl/lib/generic/relational/isfinite.cl index 67c59ea42c426..58957be473fb0 100644 --- a/libclc/opencl/lib/generic/relational/isfinite.cl +++ b/libclc/opencl/lib/generic/relational/isfinite.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isfinite.h> #define __CLC_FUNCTION isfinite -#define __CLC_BODY "unary_def.inc" +#define __CLC_BODY "relational_unary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isgreater.cl b/libclc/opencl/lib/generic/relational/isgreater.cl index ca4c068855a46..5f450c2986d7a 100644 --- a/libclc/opencl/lib/generic/relational/isgreater.cl +++ b/libclc/opencl/lib/generic/relational/isgreater.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isgreater.h> #define __CLC_FUNCTION isgreater -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isgreaterequal.cl b/libclc/opencl/lib/generic/relational/isgreaterequal.cl index e97b6f6119ae6..03c04419e3cbd 100644 --- a/libclc/opencl/lib/generic/relational/isgreaterequal.cl +++ b/libclc/opencl/lib/generic/relational/isgreaterequal.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isgreaterequal.h> #define __CLC_FUNCTION isgreaterequal -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isinf.cl b/libclc/opencl/lib/generic/relational/isinf.cl index 2f5571b8b0124..db2c31bb4868e 100644 --- a/libclc/opencl/lib/generic/relational/isinf.cl +++ b/libclc/opencl/lib/generic/relational/isinf.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isinf.h> #define __CLC_FUNCTION isinf -#define __CLC_BODY "unary_def.inc" +#define __CLC_BODY "relational_unary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isless.cl b/libclc/opencl/lib/generic/relational/isless.cl index 3673c050c9157..39a332b5dc6e8 100644 --- a/libclc/opencl/lib/generic/relational/isless.cl +++ b/libclc/opencl/lib/generic/relational/isless.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isless.h> #define __CLC_FUNCTION isless -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/islessequal.cl b/libclc/opencl/lib/generic/relational/islessequal.cl index c7e840cbe44cd..84c960d494020 100644 --- a/libclc/opencl/lib/generic/relational/islessequal.cl +++ b/libclc/opencl/lib/generic/relational/islessequal.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_islessequal.h> #define __CLC_FUNCTION islessequal -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/islessgreater.cl b/libclc/opencl/lib/generic/relational/islessgreater.cl index 057c35c7c7ff3..ea8accc299d79 100644 --- a/libclc/opencl/lib/generic/relational/islessgreater.cl +++ b/libclc/opencl/lib/generic/relational/islessgreater.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_islessgreater.h> #define __CLC_FUNCTION islessgreater -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isnan.cl b/libclc/opencl/lib/generic/relational/isnan.cl index 248cc17af5159..41b54f3a10420 100644 --- a/libclc/opencl/lib/generic/relational/isnan.cl +++ b/libclc/opencl/lib/generic/relational/isnan.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isnan.h> #define __CLC_FUNCTION isnan -#define __CLC_BODY "unary_def.inc" +#define __CLC_BODY "relational_unary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isnormal.cl b/libclc/opencl/lib/generic/relational/isnormal.cl index 6d046c375b2a3..a0a09f6f6abae 100644 --- a/libclc/opencl/lib/generic/relational/isnormal.cl +++ b/libclc/opencl/lib/generic/relational/isnormal.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isnormal.h> #define __CLC_FUNCTION isnormal -#define __CLC_BODY "unary_def.inc" +#define __CLC_BODY "relational_unary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isnotequal.cl b/libclc/opencl/lib/generic/relational/isnotequal.cl index 5bf6907587672..8504b5ee77729 100644 --- a/libclc/opencl/lib/generic/relational/isnotequal.cl +++ b/libclc/opencl/lib/generic/relational/isnotequal.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isnotequal.h> #define __CLC_FUNCTION isnotequal -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isordered.cl b/libclc/opencl/lib/generic/relational/isordered.cl index 0ce72493638c3..cd79333f45aa1 100644 --- a/libclc/opencl/lib/generic/relational/isordered.cl +++ b/libclc/opencl/lib/generic/relational/isordered.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isordered.h> #define __CLC_FUNCTION isordered -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/isunordered.cl b/libclc/opencl/lib/generic/relational/isunordered.cl index 6bea618618591..90f5506e1f988 100644 --- a/libclc/opencl/lib/generic/relational/isunordered.cl +++ b/libclc/opencl/lib/generic/relational/isunordered.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_isunordered.h> #define __CLC_FUNCTION isunordered -#define __CLC_BODY "binary_def.inc" +#define __CLC_BODY "relational_binary_def.inc" #include <clc/math/gentype.inc> diff --git a/libclc/opencl/lib/generic/relational/binary_def.inc b/libclc/opencl/lib/generic/relational/relational_binary_def.inc similarity index 100% rename from libclc/opencl/lib/generic/relational/binary_def.inc rename to libclc/opencl/lib/generic/relational/relational_binary_def.inc diff --git a/libclc/opencl/lib/generic/relational/unary_def.inc b/libclc/opencl/lib/generic/relational/relational_unary_def.inc similarity index 100% rename from libclc/opencl/lib/generic/relational/unary_def.inc rename to libclc/opencl/lib/generic/relational/relational_unary_def.inc diff --git a/libclc/opencl/lib/generic/relational/signbit.cl b/libclc/opencl/lib/generic/relational/signbit.cl index 50c4b2ab2bf4a..89e3e9f335403 100644 --- a/libclc/opencl/lib/generic/relational/signbit.cl +++ b/libclc/opencl/lib/generic/relational/signbit.cl @@ -9,6 +9,6 @@ #include <clc/relational/clc_signbit.h> #define __CLC_FUNCTION signbit -#define __CLC_BODY "unary_def.inc" +#define __CLC_BODY "relational_unary_def.inc" #include <clc/math/gentype.inc> _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
