Revert "Changes to HIP to cope with Promote-free HCC"

This reverts commit efb9b9e86c.

Change-Id: I20a9bab3883ad09913b320210344d37599cb8fcd

tests/src/deviceLib/hipTestDeviceSymbol.cpp

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