Move stubs over to spirv_vars.h

Author: jchlanda

libdevice/crt_wrapper.cpp

@@ -34,19 +34,6 @@ int memcmp(const void *s1, const void *s2, size_t n) {
   return __devicelib_memcmp(s1, s2, n);
 }
 
-#if defined(__NVPTX__) || defined(__AMDGCN__)
-// For AMD/Cuda those symbols will be provided by libclc.
-DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_x();
-DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_y();
-DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_z();
-DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_x();
-DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_y();
-DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_z();
-DEVICE_EXTERNAL size_t __spirv_GlobalSize_x();
-DEVICE_EXTERNAL size_t __spirv_GlobalSize_y();
-DEVICE_EXTERNAL size_t __spirv_GlobalSize_z();
-#endif // __NVPTX__ || __AMDGCN__
-
 #ifndef __NVPTX__
 
 // This simple rand is for ease of use only, the implementation aligns with

libdevice/spirv_vars.h

@@ -11,6 +11,19 @@
 
 #include "device.h"
 
+#if defined(__NVPTX__) || defined(__AMDGCN__)
+// For AMD/Cuda those symbols will be provided by libclc.
+DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_x();
+DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_y();
+DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_z();
+DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_x();
+DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_y();
+DEVICE_EXTERNAL size_t __spirv_LocalInvocationId_z();
+DEVICE_EXTERNAL size_t __spirv_GlobalSize_x();
+DEVICE_EXTERNAL size_t __spirv_GlobalSize_y();
+DEVICE_EXTERNAL size_t __spirv_GlobalSize_z();
+#endif // __NVPTX__ || __AMDGCN__
+
 #if defined(__SPIR__) || defined(__SPIRV__)
 
 #include <cstddef>