[NFC][libclc] Replace redundant integer header files with clc, move relational.h into libspirv (#17793)

wenju-he · web-flow · commit 62ba344d5515 · 2025-04-02T22:05:46.000-07:00
clc_add_sat.h/clc_sub_sat.h become redundant after recent clc changes.
generic/include/relational.h is now only used by libspirv.
diff --git a/libclc/generic/include/core/clc_core.h b/libclc/generic/include/core/clc_core.h
@@ -38,8 +38,6 @@
 
 #include <core/convert.h>
 
-#include <core/integer/clc_add_sat.h>
 #include <core/integer/clc_mad_sat.h>
-#include <core/integer/clc_sub_sat.h>
 
 #pragma OPENCL EXTENSION all : disable
diff --git a/libclc/generic/include/core/integer/clc_add_sat.h b/libclc/generic/include/core/integer/clc_add_sat.h
diff --git a/libclc/generic/include/core/integer/clc_add_sat.inc b/libclc/generic/include/core/integer/clc_add_sat.inc
diff --git a/libclc/generic/include/core/integer/clc_sub_sat.h b/libclc/generic/include/core/integer/clc_sub_sat.h
diff --git a/libclc/generic/include/core/integer/clc_sub_sat.inc b/libclc/generic/include/core/integer/clc_sub_sat.inc
diff --git a/libclc/libspirv/include/libspirv/relational.h b/libclc/libspirv/include/libspirv/relational.h
diff --git a/libclc/libspirv/lib/generic/core/integer/clc_mad_sat.cl b/libclc/libspirv/lib/generic/core/integer/clc_mad_sat.cl
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <clc/clcmacro.h>
+#include <clc/integer/clc_add_sat.h>
 #include <clc/integer/clc_mad24.h>
 #include <clc/integer/clc_mul_hi.h>
 #include <clc/integer/clc_upsample.h>
diff --git a/libclc/libspirv/lib/generic/integer/add_sat.cl b/libclc/libspirv/lib/generic/integer/add_sat.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <core/integer/clc_add_sat.h>
+#include <clc/integer/clc_add_sat.h>
 #include <libspirv/spirv.h>
 
 #define __CLC_BODY <add_sat.inc>
diff --git a/libclc/libspirv/lib/generic/relational/isequal.cl b/libclc/libspirv/lib/generic/relational/isequal.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_FUnordEqual
diff --git a/libclc/libspirv/lib/generic/relational/isfinite.cl b/libclc/libspirv/lib/generic/relational/isfinite.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_IsFinite
diff --git a/libclc/libspirv/lib/generic/relational/isgreater.cl b/libclc/libspirv/lib/generic/relational/isgreater.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_FOrdGreaterThan
diff --git a/libclc/libspirv/lib/generic/relational/isgreaterequal.cl b/libclc/libspirv/lib/generic/relational/isgreaterequal.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_FOrdGreaterThanEqual
diff --git a/libclc/libspirv/lib/generic/relational/isinf.cl b/libclc/libspirv/lib/generic/relational/isinf.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_IsInf
diff --git a/libclc/libspirv/lib/generic/relational/isless.cl b/libclc/libspirv/lib/generic/relational/isless.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_FOrdLessThan
diff --git a/libclc/libspirv/lib/generic/relational/islessequal.cl b/libclc/libspirv/lib/generic/relational/islessequal.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_FOrdLessThanEqual
diff --git a/libclc/libspirv/lib/generic/relational/islessgreater.cl b/libclc/libspirv/lib/generic/relational/islessgreater.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_LessOrGreater
diff --git a/libclc/libspirv/lib/generic/relational/isnan.cl b/libclc/libspirv/lib/generic/relational/isnan.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_IsNan
diff --git a/libclc/libspirv/lib/generic/relational/isnormal.cl b/libclc/libspirv/lib/generic/relational/isnormal.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_IsNormal
diff --git a/libclc/libspirv/lib/generic/relational/isnotequal.cl b/libclc/libspirv/lib/generic/relational/isnotequal.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_FUnordNotEqual
diff --git a/libclc/libspirv/lib/generic/relational/isordered.cl b/libclc/libspirv/lib/generic/relational/isordered.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_Ordered
diff --git a/libclc/libspirv/lib/generic/relational/isunordered.cl b/libclc/libspirv/lib/generic/relational/isunordered.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_Unordered
diff --git a/libclc/libspirv/lib/generic/relational/signbit.cl b/libclc/libspirv/lib/generic/relational/signbit.cl
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <relational.h>
+#include <libspirv/relational.h>
 #include <libspirv/spirv.h>
 
 #define _CLC_SPIRV_BUILTIN __spirv_SignBitSet
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/relational/isfinite.cl b/libclc/libspirv/lib/ptx-nvidiacl/relational/isfinite.cl
@@ -9,7 +9,7 @@
 #include <libspirv/spirv.h>
 
 #include <libspirv/ptx-nvidiacl/libdevice.h>
-#include <relational.h>
+#include <libspirv/relational.h>
 
 #ifdef cl_khr_fp64
 
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/relational/isinf.cl b/libclc/libspirv/lib/ptx-nvidiacl/relational/isinf.cl
@@ -9,7 +9,7 @@
 #include <libspirv/spirv.h>
 
 #include <libspirv/ptx-nvidiacl/libdevice.h>
-#include <relational.h>
+#include <libspirv/relational.h>
 
 _CLC_DEF _CLC_OVERLOAD bool __spirv_IsInf(float x) { return __nv_isinff(x); }
 
diff --git a/libclc/libspirv/lib/ptx-nvidiacl/relational/isnan.cl b/libclc/libspirv/lib/ptx-nvidiacl/relational/isnan.cl
@@ -9,7 +9,7 @@
 #include <libspirv/spirv.h>
 
 #include <libspirv/ptx-nvidiacl/libdevice.h>
-#include <relational.h>
+#include <libspirv/relational.h>
 
 _CLC_DEF _CLC_OVERLOAD bool __spirv_IsNan(float x) { return __nv_isnanf(x); }
 
