undo spir-v changes

frasercrmck · frasercrmck · commit ca117e3027a0 · 2025-01-22T16:29:39.000Z
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
@@ -360,12 +360,6 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
 
     set( clc_build_flags ${build_flags} -DCLC_INTERNAL )
 
-    # clspv and spir-v targets remap some CLC functions to OpenCL builtins.
-    # Automatically provide those declarations to the compiler for CLC builtins.
-    if ( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64 OR ARCH STREQUAL clspv OR ARCH STREQUAL clspv64 )
-      list( APPEND clc_build_flags -Xclang -fdeclare-opencl-builtins )
-    endif()
-
     add_libclc_builtin_set(
       CLC_INTERNAL
       ARCH ${ARCH}
diff --git a/libclc/clc/include/clc/common/clc_sign.h b/libclc/clc/include/clc/common/clc_sign.h
@@ -1,17 +1,10 @@
 #ifndef __CLC_COMMON_CLC_SIGN_H__
 #define __CLC_COMMON_CLC_SIGN_H__
 
-#if defined(CLC_CLSPV)
-// clspv targets provide their own OpenCL-compatible sign
-#define __clc_sign sign
-#else
-
 #define __CLC_FUNCTION __clc_sign
 #define __CLC_BODY <clc/math/unary_decl.inc>
 #include <clc/math/gentype.inc>
 #undef __CLC_FUNCTION
 #undef __CLC_BODY
 
-#endif
-
 #endif // __CLC_COMMON_CLC_SIGN_H__
diff --git a/libclc/clc/include/clc/common/floatn.inc b/libclc/clc/include/clc/common/floatn.inc
diff --git a/libclc/clc/include/clc/relational/clc_isnan.h b/libclc/clc/include/clc/relational/clc_isnan.h
@@ -1,11 +1,6 @@
 #ifndef __CLC_RELATIONAL_CLC_ISNAN_H__
 #define __CLC_RELATIONAL_CLC_ISNAN_H__
 
-#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
-// clspv and spir-v targets provide their own OpenCL-compatible isnan
-#define __clc_isnan isnan
-#else
-
 #include <clc/clcfunc.h>
 #include <clc/clctypes.h>
 
@@ -37,6 +32,4 @@ _CLC_VECTOR_ISNAN_DECL(short, half)
 #undef _CLC_ISNAN_DECL
 #undef _CLC_VECTOR_ISNAN_DECL
 
-#endif
-
 #endif // __CLC_RELATIONAL_CLC_ISNAN_H__
diff --git a/libclc/clc/include/clc/shared/unary_def.inc b/libclc/clc/include/clc/shared/unary_def.inc
@@ -4,6 +4,6 @@
 #define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)
 #endif
 
-_CLC_OVERLOAD _CLC_DEF __CLC_FLOATN FUNCTION(__CLC_FLOATN a) {
+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE a) {
   return __CLC_FUNCTION(FUNCTION)(a);
 }
diff --git a/libclc/clc/lib/clspv/SOURCES b/libclc/clc/lib/clspv/SOURCES
@@ -1,8 +1,10 @@
+../generic/common/clc_sign.cl
 ../generic/math/clc_ceil.cl
 ../generic/math/clc_fabs.cl
 ../generic/math/clc_floor.cl
 ../generic/math/clc_mad.cl
 ../generic/math/clc_rint.cl
 ../generic/math/clc_trunc.cl
+../generic/relational/clc_isnan.cl
 ../generic/relational/clc_select.cl
 ../generic/shared/clc_clamp.cl
diff --git a/libclc/clc/lib/spirv/SOURCES b/libclc/clc/lib/spirv/SOURCES
@@ -9,5 +9,6 @@
 ../generic/math/clc_mad.cl
 ../generic/math/clc_rint.cl
 ../generic/math/clc_trunc.cl
+../generic/relational/clc_isnan.cl
 ../generic/relational/clc_select.cl
 ../generic/shared/clc_clamp.cl
diff --git a/libclc/clc/lib/spirv64/SOURCES b/libclc/clc/lib/spirv64/SOURCES
@@ -9,5 +9,6 @@
 ../generic/math/clc_mad.cl
 ../generic/math/clc_rint.cl
 ../generic/math/clc_trunc.cl
+../generic/relational/clc_isnan.cl
 ../generic/relational/clc_select.cl
 ../generic/shared/clc_clamp.cl
diff --git a/libclc/generic/lib/common/sign.cl b/libclc/generic/lib/common/sign.cl
@@ -3,6 +3,6 @@
 #include <clc/common/clc_sign.h>
 
 #define FUNCTION sign
-#define __CLC_BODY "unary_def.inc"
+#define __CLC_BODY <clc/shared/unary_def.inc>
 
-#include <clc/common/floatn.inc>
+#include <clc/math/gentype.inc>

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`#define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)`
`5`	`5`	`#endif`
`6`	`6`
`7`		`-_CLC_OVERLOAD _CLC_DEF __CLC_FLOATN FUNCTION(__CLC_FLOATN a) {`
	`7`	`+_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE a) {`
`8`	`8`	`return __CLC_FUNCTION(FUNCTION)(a);`
`9`	`9`	`}`