Got rid of __SPIR_TARGET_ONLY__.

Signed-off-by: Vyacheslav Zakharin <[email protected]>

Author: Vyacheslav Zakharin

libdevice/cmath_wrapper.cpp

@@ -8,7 +8,7 @@
 
 #include "device_math.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 DEVICE_EXTERN_C
 float scalbnf(float x, int n) { return __devicelib_scalbnf(x, n); }
@@ -369,4 +369,4 @@ float _FSinh(float x, float y) { // compute y * sinh(x), |y| <= 1
   }
 }
 #endif // defined(_WIN32)
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/cmath_wrapper_fp64.cpp

@@ -8,7 +8,7 @@
 
 #include "device_math.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 // All exported functions in math and complex device libraries are weak
 // reference. If users provide their own math or complex functions(with
@@ -399,4 +399,4 @@ double _Sinh(double x, double y) { // compute y * sinh(x), |y| <= 1
   }
 }
 #endif // defined(_WIN32)
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/complex_wrapper.cpp

@@ -8,7 +8,7 @@
 
 #include "device_complex.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 DEVICE_EXTERN_C
 float cimagf(float __complex__ z) { return __devicelib_cimagf(z); }
@@ -99,4 +99,4 @@ DEVICE_EXTERN_C
 float __complex__ __divsc3(float __a, float __b, float __c, float __d) {
   return __devicelib___divsc3(__a, __b, __c, __d);
 }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/complex_wrapper_fp64.cpp

@@ -8,7 +8,7 @@
 
 #include "device_complex.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 DEVICE_EXTERN_C
 double cimag(double __complex__ z) { return __devicelib_cimag(z); }
@@ -99,4 +99,4 @@ DEVICE_EXTERN_C
 double __complex__ __divdc3(double __a, double __b, double __c, double __d) {
   return __devicelib___divdc3(__a, __b, __c, __d);
 }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/device.h

@@ -15,18 +15,14 @@
 #define EXTERN_C
 #endif // __cplusplus
 
-#if __SPIR__
-#define __SPIR_TARGET_ONLY__ 1
+#ifdef __SPIR__
 #ifdef __SYCL_DEVICE_ONLY__
 #define DEVICE_EXTERNAL SYCL_EXTERNAL __attribute__((weak))
 #else // __SYCL_DEVICE_ONLY__
 #define DEVICE_EXTERNAL __attribute__((weak))
 #endif // __SYCL_DEVICE_ONLY__
 
 #define DEVICE_EXTERN_C DEVICE_EXTERNAL EXTERN_C
-
-#else // __SPIR__
-#define __SPIR_TARGET_ONLY__ 0
 #endif // __SPIR__
 
 #endif // __LIBDEVICE_DEVICE_H__

libdevice/device_complex.h

@@ -10,7 +10,7 @@
 
 #include "device.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 // TODO: This needs to be more robust.
 // clang doesn't recognize the c11 CMPLX macro, but it does have
@@ -165,5 +165,5 @@ double __complex__ __devicelib___divdc3(double a, double b, double c, double d);
 
 DEVICE_EXTERN_C
 float __complex__ __devicelib___divsc3(float a, float b, float c, float d);
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__
 #endif // __LIBDEVICE_DEVICE_COMPLEX_H_

libdevice/device_math.h

@@ -11,7 +11,7 @@
 
 #include "device.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 DEVICE_EXTERN_C
 double __devicelib_log(double x);
@@ -249,5 +249,5 @@ float __devicelib_logbf(float x);
 
 DEVICE_EXTERN_C
 float __devicelib_scalbnf(float x, int n);
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__
 #endif // __LIBDEVICE_DEVICE_MATH_H__

libdevice/fallback-cassert.cpp

@@ -8,7 +8,7 @@
 
 #include "wrapper.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 static const __attribute__((opencl_constant)) char assert_fmt[] =
     "%s:%d: %s: global id: [%lu,%lu,%lu], local id: [%lu,%lu,%lu] "
     "Assertion `%s` failed.\n";
@@ -31,4 +31,4 @@ DEVICE_EXTERN_C void __devicelib_assert_fail(const char *expr, const char *file,
   // volatile int *die = (int *)0x0;
   // *die = 0xdead;
 }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/fallback-cmath-fp64.cpp

@@ -8,7 +8,7 @@
 
 #include "device_math.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 DEVICE_EXTERN_C
 double __devicelib_log(double x) { return __spirv_ocl_log(x); }
@@ -140,4 +140,4 @@ double __devicelib_asinh(double x) { return __spirv_ocl_asinh(x); }
 
 DEVICE_EXTERN_C
 double __devicelib_atanh(double x) { return __spirv_ocl_atanh(x); }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/fallback-cmath.cpp

@@ -8,7 +8,7 @@
 
 #include "device_math.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 DEVICE_EXTERN_C
 float __devicelib_scalbnf(float x, int n) { return __spirv_ocl_ldexp(x, n); }
@@ -142,4 +142,4 @@ float __devicelib_asinhf(float x) { return __spirv_ocl_asinh(x); }
 DEVICE_EXTERN_C
 float __devicelib_atanhf(float x) { return __spirv_ocl_atanh(x); }
 
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/fallback-complex-fp64.cpp

@@ -9,7 +9,7 @@
 #include "device_complex.h"
 #include "device_math.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 #include <cmath>
 
 DEVICE_EXTERN_C
@@ -425,4 +425,4 @@ double __complex__ __devicelib_catan(double __complex__ z) {
       __devicelib_catanh(CMPLX(-__devicelib_cimag(z), __devicelib_creal(z)));
   return CMPLX(__devicelib_cimag(w), -__devicelib_creal(w));
 }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/fallback-complex.cpp

@@ -9,7 +9,7 @@
 #include "device_complex.h"
 #include "device_math.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 #include <cmath>
 
 DEVICE_EXTERN_C
@@ -429,4 +429,4 @@ float __complex__ __devicelib_catanf(float __complex__ z) {
       CMPLXF(-__devicelib_cimagf(z), __devicelib_crealf(z)));
   return CMPLXF(__devicelib_cimagf(w), -__devicelib_crealf(w));
 }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/glibc_wrapper.cpp

@@ -8,7 +8,7 @@
 
 #include "wrapper.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 DEVICE_EXTERN_C
 void __assert_fail(const char *expr, const char *file, unsigned int line,
                    const char *func) {
@@ -18,4 +18,4 @@ void __assert_fail(const char *expr, const char *file, unsigned int line,
       __spirv_LocalInvocationId_x(), __spirv_LocalInvocationId_y(),
       __spirv_LocalInvocationId_z());
 }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/msvc_wrapper.cpp

@@ -8,7 +8,7 @@
 
 #include "wrapper.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 // Truncates a wide (16 or 32 bit) string (wstr) into an ASCII string (str).
 // Any non-ASCII characters are replaced by question mark '?'.
 static void __truncate_wchar_char_str(const wchar_t *wstr, char *str,
@@ -37,4 +37,4 @@ void _wassert(const wchar_t *wexpr, const wchar_t *wfile, unsigned line) {
       __spirv_LocalInvocationId_x(), __spirv_LocalInvocationId_y(),
       __spirv_LocalInvocationId_z());
 }
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__

libdevice/spirv_vars.h

@@ -11,7 +11,7 @@
 
 #include "device.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 #include <cstddef>
 #include <cstdint>
@@ -40,5 +40,5 @@ DEVICE_EXTERNAL inline size_t __spirv_LocalInvocationId_z() {
   return __spirv_BuiltInLocalInvocationId.z;
 }
 
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__
 #endif // __LIBDEVICE_SPIRV_VARS_H

libdevice/wrapper.h

@@ -11,7 +11,7 @@
 
 #include "device.h"
 
-#if __SPIR_TARGET_ONLY__
+#ifdef __SPIR__
 
 #include <cstddef>
 #include <cstdint>
@@ -24,5 +24,5 @@ void __devicelib_assert_fail(const char *expr, const char *file, int32_t line,
                              const char *func, uint64_t gid0, uint64_t gid1,
                              uint64_t gid2, uint64_t lid0, uint64_t lid1,
                              uint64_t lid2);
-#endif // __SPIR_TARGET_ONLY__
+#endif // __SPIR__
 #endif // __LIBDEVICE_WRAPPER_H__