Merge branch 'amd-master' into amd-develop

Change-Id: I01a77c34e11b1b02cb20e11b105741f6bd383543 [ROCm/hip commit: 1337ed9159]
2017-03-15 09:56:20 +05:30
parent 03c6de6968 508ad44c7c
commit 366a5e09a1
8 changed files with 20 additions and 13 deletions
@@ -31,8 +31,15 @@ THE SOFTWARE.
 #define NUM 1024
 #define SIZE 1024*4

+#ifdef __HIP_PLATFORM_HCC__
+__attribute__((address_space(1))) int globalIn[NUM];
+__attribute__((address_space(1))) int globalOut[NUM];
+#endif
+
+#ifdef __HIP_PLATFORM_NVCC__
 __device__ int globalIn[NUM];
 __device__ int globalOut[NUM];
+#endif

 __global__ void Assign(hipLaunchParm lp, int* Out)
 {
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include "hip/hip_runtime.h"
 #include "test_common.h"

-#define LEN 8*1024
+#define LEN 16*1024
 #define SIZE LEN*4

 __global__ void vectorAdd(hipLaunchParm lp, float *Ad, float *Bd) {