P4 to Git Change 1998982 by cpaquot@cpaquot-ocl-lc-lnx on 2019/09/16 17:49:10

SWDEV-145570 - [HIP] Fix regression from new headers.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_device.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_device_runtime.cpp#18 edit

hipamd/api/hip/hip_device.cpp

@@ -208,6 +208,11 @@ hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device )
   deviceProps.hdpMemFlushCntl = nullptr;
   deviceProps.hdpRegFlushCntl = nullptr;
 
+  deviceProps.memPitch = info.maxMemAllocSize_;
+  deviceProps.textureAlignment = std::max(info.imageBaseAddressAlignment_, info.imagePitchAlignment_);
+  deviceProps.kernelExecTimeoutEnabled = 0;
+  deviceProps.ECCEnabled = info.errorCorrectionSupport_? 1:0;
+
   *props = deviceProps;
   HIP_RETURN(hipSuccess);
 }

hipamd/api/hip/hip_device_runtime.cpp

@@ -265,6 +265,21 @@ hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t attr, int device)
   case hipDeviceAttributeHdpRegFlushCntl:
     *reinterpret_cast<unsigned int**>(pi) = prop.hdpRegFlushCntl;
     break;
+  case hipDeviceAttributeMaxPitch:
+    *pi = prop.memPitch;
+    break;
+  case hipDeviceAttributeTextureAlignment:
+    *pi = prop.textureAlignment;
+    break;
+  case hipDeviceAttributeKernelExecTimeout:
+    *pi = prop.kernelExecTimeoutEnabled;
+    break;
+  case hipDeviceAttributeCanMapHostMemory:
+    *pi = prop.canMapHostMemory;
+    break;
+  case hipDeviceAttributeEccEnabled:
+    *pi = prop.ECCEnabled;
+    break;
   default:
     HIP_RETURN(hipErrorInvalidValue);
   }