P4 to Git Change 1594075 by skudchad@skudchad-lnx on 2018/08/15 14:00:33

SWDEV-145570 - [HIP] Fix some test failures

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_device_runtime.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#14 edit

hipamd/api/hip/hip_device_runtime.cpp

@@ -155,7 +155,9 @@ hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t attr, int device)
   //FIXME: should we cache the props, or just select from deviceHandle->info_?
   hipDeviceProp_t prop = {0};
   hipError_t err = hipGetDeviceProperties(&prop, device);
-  if (err != hipSuccess) HIP_RETURN(err);
+  if (err != hipSuccess) {
+    HIP_RETURN(err);
+  }
 
   switch (attr) {
   case hipDeviceAttributeMaxThreadsPerBlock:

hipamd/api/hip/hip_internal.hpp

@@ -67,7 +67,7 @@ extern amd::Memory* getMemoryObject(const void* ptr, size_t& offset);
 
 #define HIP_RETURN(ret)          \
         hip::g_lastError = ret;  \
-        return ret;              \
+        return hip::g_lastError; \
 
 
 #endif // HIP_SRC_HIP_INTERNAL_H