P4 to Git Change 1979479 by cpaquot@cpaquot-ocl-lc-lnx on 2019/08/07 11:25:59

SWDEV-198424 - [HIP] Implemented missing fields for hipGetDeviceAttribute.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_device.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_device_runtime.cpp#17 edit


[ROCm/hip commit: 042a4c2bb2]

projects/hip/api/hip/hip_device.cpp

@@ -195,6 +195,15 @@ hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device )
   deviceProps.cooperativeLaunch = info.cooperativeGroups_;
   deviceProps.cooperativeMultiDeviceLaunch = info.cooperativeMultiDeviceGroups_;
 
+  deviceProps.maxTexture1D = info.imageMaxBufferSize_;
+  deviceProps.maxTexture2D[0] = info.image2DMaxWidth_;
+  deviceProps.maxTexture2D[1] = info.image2DMaxHeight_;
+  deviceProps.maxTexture3D[0] = info.image3DMaxWidth_;
+  deviceProps.maxTexture3D[1] = info.image3DMaxHeight_;
+  deviceProps.maxTexture3D[2] = info.image3DMaxDepth_;
+  deviceProps.hdpMemFlushCntl = nullptr;
+  deviceProps.hdpRegFlushCntl = nullptr;
+
   *props = deviceProps;
   HIP_RETURN(hipSuccess);
 }

projects/hip/api/hip/hip_device_runtime.cpp

@@ -241,6 +241,30 @@ hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t attr, int device)
   case hipDeviceAttributeCooperativeMultiDeviceLaunch:
     *pi = prop.cooperativeMultiDeviceLaunch;
     break;
+  case hipDeviceAttributeMaxTexture1DWidth:
+    *pi = prop.maxTexture1D;
+    break;
+  case hipDeviceAttributeMaxTexture2DWidth:
+    *pi = prop.maxTexture2D[0];
+    break;
+  case hipDeviceAttributeMaxTexture2DHeight:
+    *pi = prop.maxTexture2D[1];
+    break;
+  case hipDeviceAttributeMaxTexture3DWidth:
+    *pi = prop.maxTexture3D[0];
+    break;
+  case hipDeviceAttributeMaxTexture3DHeight:
+    *pi = prop.maxTexture3D[1];
+    break;
+  case hipDeviceAttributeMaxTexture3DDepth:
+    *pi = prop.maxTexture3D[2];
+    break;
+  case hipDeviceAttributeHdpMemFlushCntl:
+    *reinterpret_cast<unsigned int**>(pi) = prop.hdpMemFlushCntl;
+    break;
+  case hipDeviceAttributeHdpRegFlushCntl:
+    *reinterpret_cast<unsigned int**>(pi) = prop.hdpRegFlushCntl;
+    break;
   default:
     HIP_RETURN(hipErrorInvalidValue);
   }