Merge branch 'amd-master' into amd-develop

hipamd/tests/src/deviceLib/hipTestDeviceSymbol.cpp

@@ -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)
 {

hipamd/tests/src/kernel/hipDynamicShared2.cpp

@@ -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) {