change __MEMORY_SCOPE_SYSTEM to __MEMORY_SCOPE_DEVICE since __opencl_c_atomic_scope_device macro is required for the new built-ins

Author: wenju-he

libclc/opencl/lib/generic/atomic/atomic_def.inc

@@ -31,14 +31,14 @@
   _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(                               \
       volatile ADDRSPACE __CLC_ATOMIC_GENTYPE *Ptr) {                          \
     return __IMPL_FUNCTION((volatile ADDRSPACE __CLC_GENTYPE *)Ptr,            \
-                           __ATOMIC_SEQ_CST, __MEMORY_SCOPE_SYSTEM);           \
+                           __ATOMIC_SEQ_CST, __MEMORY_SCOPE_DEVICE);           \
   }
 #elif defined(__CLC_RETURN_VOID)
 #define __CLC_DEFINE_ATOMIC(ADDRSPACE)                                         \
   _CLC_OVERLOAD _CLC_DEF void FUNCTION(                                        \
       volatile ADDRSPACE __CLC_ATOMIC_GENTYPE *Ptr, __CLC_GENTYPE Value) {     \
     __IMPL_FUNCTION((volatile ADDRSPACE __CLC_GENTYPE *)Ptr, Value,            \
-                    __ATOMIC_SEQ_CST, __MEMORY_SCOPE_SYSTEM);                  \
+                    __ATOMIC_SEQ_CST, __MEMORY_SCOPE_DEVICE);                  \
   }
 #elif defined(__CLC_COMPARE_EXCHANGE)
 #define __CLC_DEFINE_ATOMIC(ADDRSPACE)                                         \
@@ -48,7 +48,7 @@
     __CLC_GENTYPE Comparator = *Expected;                                      \
     __CLC_GENTYPE RetValue = __clc_atomic_compare_exchange(                    \
         (volatile ADDRSPACE __CLC_GENTYPE *)Ptr, Comparator, Desired,          \
-        __ATOMIC_SEQ_CST, __ATOMIC_RELAXED, __MEMORY_SCOPE_SYSTEM);            \
+        __ATOMIC_SEQ_CST, __ATOMIC_RELAXED, __MEMORY_SCOPE_DEVICE);            \
     if (Comparator != RetValue) {                                              \
       *Expected = RetValue;                                                    \
       return true;                                                             \
@@ -60,7 +60,7 @@
   _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(                               \
       volatile ADDRSPACE __CLC_ATOMIC_GENTYPE *Ptr, __CLC_GENTYPE Value) {     \
     return __IMPL_FUNCTION((volatile ADDRSPACE __CLC_GENTYPE *)Ptr, Value,     \
-                           __ATOMIC_SEQ_CST, __MEMORY_SCOPE_SYSTEM);           \
+                           __ATOMIC_SEQ_CST, __MEMORY_SCOPE_DEVICE);           \
   }
 #endif
 

libclc/opencl/lib/generic/atomic/atomic_inc_dec.inc

@@ -13,7 +13,7 @@
 #define __CLC_DEFINE_ATOMIC(ADDRSPACE)                                         \
   _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(                               \
       volatile ADDRSPACE __CLC_GENTYPE *Ptr) {                                 \
-    return __IMPL_FUNCTION(Ptr, __ATOMIC_SEQ_CST, __MEMORY_SCOPE_SYSTEM);      \
+    return __IMPL_FUNCTION(Ptr, __ATOMIC_SEQ_CST, __MEMORY_SCOPE_DEVICE);      \
   }
 
 __CLC_DEFINE_ATOMIC(global)