update macro usage

Author: frasercrmck

libclc/CMakeLists.txt

@@ -440,13 +440,19 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
     # to declare certain builtins in that address space.
     # Note: we assume that if there is no distinct generic address space, it
     # maps to the private address space.
-    set ( has_distinct_generic_addrspace TRUE )
-    if( ARCH STREQUAL nvptx OR ARCH STREQUAL nvptx64 )
-      set ( has_distinct_generic_addrspace FALSE )
+    set ( private_addrspace_val 0 )
+    set ( generic_addrspace_val 0 )
+    if( ARCH STREQUAL amdgcn OR ARCH STREQUAL r600 OR ARCH STREQUAL amdgcn-amdhsa )
+      set ( private_addrspace_val 5 )
     endif()
-    if( has_distinct_generic_addrspace )
-      list( APPEND build_flags -D__CLC_DISTINCT_GENERIC_ADDRSPACE__ )
+    if( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64
+        OR ARCH STREQUAL clspv OR ARCH STREQUAL clspv64 )
+      set ( generic_addrspace_val 4 )
     endif()
+    list( APPEND build_flags
+      -D__CLC_PRIVATE_ADDRSPACE_VAL=${private_addrspace_val}
+      -D__CLC_GENERIC_ADDRSPACE_VAL=${generic_addrspace_val}
+    )
 
     set( clc_build_flags ${build_flags} -DCLC_INTERNAL )
 

libclc/clc/include/clc/clcfunc.h

@@ -27,8 +27,14 @@
     (__OPENCL_C_VERSION__ >= CL_VERSION_3_0 &&                                 \
      defined(__opencl_c_generic_address_space))
 #define _CLC_GENERIC_AS_SUPPORTED 1
+#if __CLC_PRIVATE_ADDRSPACE_VAL != __CLC_GENERIC_ADDRSPACE_VAL
+#define _CLC_DISTINCT_GENERIC_AS_SUPPORTED 1
+#else
+#define _CLC_DISTINCT_GENERIC_AS_SUPPORTED 0
+#endif
 #else
 #define _CLC_GENERIC_AS_SUPPORTED 0
+#define _CLC_DISTINCT_GENERIC_AS_SUPPORTED 0
 #endif
 
 #endif // __CLC_CLCFUNC_H_

libclc/clc/include/clc/math/remquo_decl.inc

@@ -17,3 +17,8 @@ _CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x,
 _CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x,
                                                      __CLC_GENTYPE y,
                                                      local __CLC_INTN *q);
+#if _CLC_GENERIC_AS_SUPPORTED
+_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x,
+                                                     __CLC_GENTYPE y,
+                                                     generic __CLC_INTN *q);
+#endif

libclc/clc/lib/generic/math/clc_fract.inc

@@ -34,5 +34,8 @@ _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_fract(__CLC_GENTYPE x,
 
 FRACT_DEF(local);
 FRACT_DEF(global);
+#if _CLC_DISTINCT_GENERIC_AS_SUPPORTED
+FRACT_DEF(generic);
+#endif
 
 #undef MIN_CONSTANT

libclc/clc/lib/generic/math/clc_frexp.cl

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <clc/clcfunc.h>
 #include <clc/clc_convert.h>
 #include <clc/internal/clc.h>
 #include <clc/math/math.h>

libclc/clc/lib/generic/math/clc_remquo.cl

@@ -29,3 +29,9 @@
 #define __CLC_ADDRESS_SPACE local
 #include <clc_remquo.inc>
 #undef __CLC_ADDRESS_SPACE
+
+#if _CLC_DISTINCT_GENERIC_AS_SUPPORTED
+#define __CLC_ADDRESS_SPACE generic
+#include <clc_remquo.inc>
+#undef __CLC_ADDRESS_SPACE
+#endif