Merge branch 'amd-master' into amd-develop

[ROCm/hip commit: 675dd1cedf]
2017-03-14 13:44:41 +05:30
parent 99ab69e1b5 9043ba55db
commit 5191fc0c5c
8 changed files with 13 additions and 20 deletions
@@ -31,15 +31,8 @@ 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 16*1024
+#define LEN 8*1024
 #define SIZE LEN*4

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