[NFC][libclc] Delete clc/include/clc/relational/floatn.inc (#149252)

llvm-diff shows no change to amdgcn--amdhsa.bc.
2025-07-18 08:05:07 +08:00 · 2025-07-18 08:05:07 +08:00 · 3abecfe9e3
commit 3abecfe9e3
parent a131ce9603
41 changed files with 72 additions and 172 deletions
--- a/libclc/clc/include/clc/relational/binary_decl.inc
+++ b/libclc/clc/include/clc/relational/binary_decl.inc
@ -6,4 +6,12 @@
 //
 //===----------------------------------------------------------------------===//

-_CLC_OVERLOAD _CLC_DECL __CLC_INTN FUNCTION(__CLC_FLOATN a, __CLC_FLOATN b);
+#if __CLC_VECSIZE_OR_1 == 1
+#define __RETTYPE __CLC_INTN
+#else
+#define __RETTYPE __CLC_BIT_INTN
+#endif
+
+_CLC_OVERLOAD _CLC_DECL __RETTYPE FUNCTION(__CLC_GENTYPE a, __CLC_GENTYPE b);
+
+#undef __RETTYPE
--- a/libclc/clc/include/clc/relational/clc_isfinite.h
+++ b/libclc/clc/include/clc/relational/clc_isfinite.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isfinite
 #define __CLC_BODY <clc/relational/unary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_isgreater.h
+++ b/libclc/clc/include/clc/relational/clc_isgreater.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isgreater
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_isgreaterequal.h
+++ b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isgreaterequal
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_isless.h
+++ b/libclc/clc/include/clc/relational/clc_isless.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isless
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_islessequal.h
+++ b/libclc/clc/include/clc/relational/clc_islessequal.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_islessequal
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_islessgreater.h
+++ b/libclc/clc/include/clc/relational/clc_islessgreater.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_islessgreater
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_isnormal.h
+++ b/libclc/clc/include/clc/relational/clc_isnormal.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isnormal
 #define __CLC_BODY <clc/relational/unary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_isnotequal.h
+++ b/libclc/clc/include/clc/relational/clc_isnotequal.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isnotequal
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_isordered.h
+++ b/libclc/clc/include/clc/relational/clc_isordered.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isordered
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_isunordered.h
+++ b/libclc/clc/include/clc/relational/clc_isunordered.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_isunordered
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/clc_signbit.h
+++ b/libclc/clc/include/clc/relational/clc_signbit.h
@ -12,7 +12,7 @@
 #define FUNCTION __clc_signbit
 #define __CLC_BODY <clc/relational/unary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/clc/include/clc/relational/floatn.inc
+++ b/libclc/clc/include/clc/relational/floatn.inc
@ -1,132 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <clc/clcfunc.h>
-#include <clc/clctypes.h>
-
-#define __CLC_FLOATN float
-#define __CLC_INTN int
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN float2
-#define __CLC_INTN int2
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN float3
-#define __CLC_INTN int3
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN float4
-#define __CLC_INTN int4
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN float8
-#define __CLC_INTN int8
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN float16
-#define __CLC_INTN int16
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#undef __CLC_FLOAT
-#undef __CLC_INT
-
-#ifdef cl_khr_fp64
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-#define __CLC_FLOATN double
-#define __CLC_INTN int
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN double2
-#define __CLC_INTN long2
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN double3
-#define __CLC_INTN long3
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN double4
-#define __CLC_INTN long4
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN double8
-#define __CLC_INTN long8
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN double16
-#define __CLC_INTN long16
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#endif
-#ifdef cl_khr_fp16
-#pragma OPENCL EXTENSION cl_khr_fp16 : enable
-
-#define __CLC_FLOATN half
-#define __CLC_INTN int
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN half2
-#define __CLC_INTN short2
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN half3
-#define __CLC_INTN short3
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN half4
-#define __CLC_INTN short4
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN half8
-#define __CLC_INTN short8
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#define __CLC_FLOATN half16
-#define __CLC_INTN short16
-#include __CLC_BODY
-#undef __CLC_INTN
-#undef __CLC_FLOATN
-
-#endif
-
-#undef __CLC_BODY
--- a/libclc/clc/include/clc/relational/unary_decl.inc
+++ b/libclc/clc/include/clc/relational/unary_decl.inc
@ -6,4 +6,12 @@
 //
 //===----------------------------------------------------------------------===//

-_CLC_OVERLOAD _CLC_DECL __CLC_INTN FUNCTION(__CLC_FLOATN x);
+#if __CLC_VECSIZE_OR_1 == 1
+#define __RETTYPE __CLC_INTN
+#else
+#define __RETTYPE __CLC_BIT_INTN
+#endif
+
+_CLC_OVERLOAD _CLC_DECL __RETTYPE FUNCTION(__CLC_GENTYPE x);
+
+#undef __RETTYPE
--- a/libclc/opencl/include/clc/opencl/relational/isfinite.h
+++ b/libclc/opencl/include/clc/opencl/relational/isfinite.h
@ -14,7 +14,7 @@
 #define FUNCTION isfinite
 #define __CLC_BODY <clc/relational/unary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/isgreater.h
+++ b/libclc/opencl/include/clc/opencl/relational/isgreater.h
@ -14,7 +14,7 @@
 #define FUNCTION isgreater
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/isgreaterequal.h
+++ b/libclc/opencl/include/clc/opencl/relational/isgreaterequal.h
@ -14,7 +14,7 @@
 #define FUNCTION isgreaterequal
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/isless.h
+++ b/libclc/opencl/include/clc/opencl/relational/isless.h
@ -14,7 +14,7 @@
 #define FUNCTION isless
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/islessequal.h
+++ b/libclc/opencl/include/clc/opencl/relational/islessequal.h
@ -14,7 +14,7 @@
 #define FUNCTION islessequal
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/islessgreater.h
+++ b/libclc/opencl/include/clc/opencl/relational/islessgreater.h
@ -14,7 +14,7 @@
 #define FUNCTION islessgreater
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/isnormal.h
+++ b/libclc/opencl/include/clc/opencl/relational/isnormal.h
@ -14,7 +14,7 @@
 #define FUNCTION isnormal
 #define __CLC_BODY <clc/relational/unary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/isnotequal.h
+++ b/libclc/opencl/include/clc/opencl/relational/isnotequal.h
@ -14,7 +14,7 @@
 #define FUNCTION isnotequal
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/isordered.h
+++ b/libclc/opencl/include/clc/opencl/relational/isordered.h
@ -14,7 +14,7 @@
 #define FUNCTION isordered
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/isunordered.h
+++ b/libclc/opencl/include/clc/opencl/relational/isunordered.h
@ -14,7 +14,7 @@
 #define FUNCTION isunordered
 #define __CLC_BODY <clc/relational/binary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/include/clc/opencl/relational/signbit.h
+++ b/libclc/opencl/include/clc/opencl/relational/signbit.h
@ -14,7 +14,7 @@
 #define FUNCTION signbit
 #define __CLC_BODY <clc/relational/unary_decl.inc>

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>

 #undef FUNCTION

--- a/libclc/opencl/lib/generic/relational/binary_def.inc
+++ b/libclc/opencl/lib/generic/relational/binary_def.inc
@ -10,6 +10,14 @@

 #define __IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

-_CLC_OVERLOAD _CLC_DEF __CLC_INTN FUNCTION(__CLC_FLOATN a, __CLC_FLOATN b) {
+#if __CLC_VECSIZE_OR_1 == 1
+#define __RETTYPE __CLC_INTN
+#else
+#define __RETTYPE __CLC_BIT_INTN
+#endif
+
+_CLC_OVERLOAD _CLC_DEF __RETTYPE FUNCTION(__CLC_GENTYPE a, __CLC_GENTYPE b) {
  return __IMPL_FUNCTION(FUNCTION)(a, b);
 }
+
+#undef __RETTYPE
--- a/libclc/opencl/lib/generic/relational/isequal.cl
+++ b/libclc/opencl/lib/generic/relational/isequal.cl
@ -12,4 +12,4 @@
 #define FUNCTION isequal
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isfinite.cl
+++ b/libclc/opencl/lib/generic/relational/isfinite.cl
@ -12,4 +12,4 @@
 #define FUNCTION isfinite
 #define __CLC_BODY "unary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isgreater.cl
+++ b/libclc/opencl/lib/generic/relational/isgreater.cl
@ -12,4 +12,4 @@
 #define FUNCTION isgreater
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isgreaterequal.cl
+++ b/libclc/opencl/lib/generic/relational/isgreaterequal.cl
@ -12,4 +12,4 @@
 #define FUNCTION isgreaterequal
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isinf.cl
+++ b/libclc/opencl/lib/generic/relational/isinf.cl
@ -12,4 +12,4 @@
 #define FUNCTION isinf
 #define __CLC_BODY "unary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isless.cl
+++ b/libclc/opencl/lib/generic/relational/isless.cl
@ -12,4 +12,4 @@
 #define FUNCTION isless
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/islessequal.cl
+++ b/libclc/opencl/lib/generic/relational/islessequal.cl
@ -12,4 +12,4 @@
 #define FUNCTION islessequal
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/islessgreater.cl
+++ b/libclc/opencl/lib/generic/relational/islessgreater.cl
@ -12,4 +12,4 @@
 #define FUNCTION islessgreater
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isnan.cl
+++ b/libclc/opencl/lib/generic/relational/isnan.cl
@ -12,4 +12,4 @@
 #define FUNCTION isnan
 #define __CLC_BODY "unary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isnormal.cl
+++ b/libclc/opencl/lib/generic/relational/isnormal.cl
@ -12,4 +12,4 @@
 #define FUNCTION isnormal
 #define __CLC_BODY "unary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isnotequal.cl
+++ b/libclc/opencl/lib/generic/relational/isnotequal.cl
@ -12,4 +12,4 @@
 #define FUNCTION isnotequal
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isordered.cl
+++ b/libclc/opencl/lib/generic/relational/isordered.cl
@ -12,4 +12,4 @@
 #define FUNCTION isordered
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/isunordered.cl
+++ b/libclc/opencl/lib/generic/relational/isunordered.cl
@ -12,4 +12,4 @@
 #define FUNCTION isunordered
 #define __CLC_BODY "binary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/signbit.cl
+++ b/libclc/opencl/lib/generic/relational/signbit.cl
@ -12,4 +12,4 @@
 #define FUNCTION signbit
 #define __CLC_BODY "unary_def.inc"

-#include <clc/relational/floatn.inc>
+#include <clc/math/gentype.inc>
--- a/libclc/opencl/lib/generic/relational/unary_def.inc
+++ b/libclc/opencl/lib/generic/relational/unary_def.inc
@ -10,6 +10,14 @@

 #define __IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)

-_CLC_OVERLOAD _CLC_DEF __CLC_INTN FUNCTION(__CLC_FLOATN a) {
+#if __CLC_VECSIZE_OR_1 == 1
+#define __RETTYPE __CLC_INTN
+#else
+#define __RETTYPE __CLC_BIT_INTN
+#endif
+
+_CLC_OVERLOAD _CLC_DEF __RETTYPE FUNCTION(__CLC_GENTYPE a) {
  return __IMPL_FUNCTION(FUNCTION)(a);
 }
+
+#undef __RETTYPE