Merge pull request #1679 from frasercrmck/hip-usm-get-mem-alloc-size

kbenzie · web-flow · commit 39cb69ab8c5c · 2024-06-04T14:35:10.000+01:00
[HIP] Add support for querying USM allocation size
diff --git a/source/adapters/hip/usm.cpp b/source/adapters/hip/usm.cpp
@@ -230,8 +230,12 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,
       }
       return ReturnValue(Pool);
     }
+    case UR_USM_ALLOC_INFO_SIZE: {
+      size_t RangeSize = 0;
+      UR_CHECK_ERROR(hipMemPtrGetInfo(const_cast<void *>(pMem), &RangeSize));
+      return ReturnValue(RangeSize);
+    }
     case UR_USM_ALLOC_INFO_BASE_PTR:
-    case UR_USM_ALLOC_INFO_SIZE:
       return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
     default:
       return UR_RESULT_ERROR_INVALID_ENUMERATION;
diff --git a/test/conformance/enqueue/enqueue_adapter_hip.match b/test/conformance/enqueue/enqueue_adapter_hip.match
@@ -35,11 +35,9 @@ urEnqueueMemImageReadTest.Success1D/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueMemImageReadTest.Success3D/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueMemImageWriteTest.Success1D/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueMemImageWriteTest.Success3D/AMD_HIP_BACKEND___{{.*}}_
-{{OPT}}urEnqueueUSMFill2DNegativeTest.OutOfBounds/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueUSMAdviseWithParamTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
 urEnqueueUSMAdviseTest.MultipleParamsSuccess/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueUSMAdviseTest.NonCoherentDeviceMemorySuccessOrWarning/AMD_HIP_BACKEND___{{.*}}_
-urEnqueueUSMMemcpy2DNegativeTest.InvalidSize/AMD_HIP_BACKEND___{{.*}}___pitch__1__width__1__height__1__src__UR_USM_TYPE_DEVICE__dst__UR_USM_TYPE_DEVICE
 urEnqueueUSMPrefetchWithParamTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
 urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/AMD_HIP_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
 urEnqueueTimestampRecordingExpTest.Success/AMD_HIP_BACKEND___{{.*}}
diff --git a/test/conformance/usm/usm_adapter_hip.match b/test/conformance/usm/usm_adapter_hip.match
@@ -22,7 +22,6 @@ urUSMDeviceAllocAlignmentTest.SuccessAlignedAllocations/AMD_HIP_BACKEND___{{.*}}
 urUSMDeviceAllocAlignmentTest.SuccessAlignedAllocations/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled_64_512
 urUSMDeviceAllocAlignmentTest.SuccessAlignedAllocations/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled_64_2048
 urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_BASE_PTR
-urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_SIZE
 urUSMGetMemAllocInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ALLOC_INFO_POOL
 urUSMHostAllocTest.Success/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
 urUSMHostAllocTest.SuccessWithDescriptors/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled

Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,12 @@ urUSMGetMemAllocInfo(ur_context_handle_t hContext, const void *pMem,`
`230`	`230`	`}`
`231`	`231`	`return ReturnValue(Pool);`
`232`	`232`	`}`
	`233`	`+ case UR_USM_ALLOC_INFO_SIZE: {`
	`234`	`+ size_t RangeSize = 0;`
	`235`	`+ UR_CHECK_ERROR(hipMemPtrGetInfo(const_cast<void *>(pMem), &RangeSize));`
	`236`	`+ return ReturnValue(RangeSize);`
	`237`	`+ }`
`233`	`238`	`case UR_USM_ALLOC_INFO_BASE_PTR:`
`234`		`- case UR_USM_ALLOC_INFO_SIZE:`
`235`	`239`	`return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;`
`236`	`240`	`default:`
`237`	`241`	`return UR_RESULT_ERROR_INVALID_ENUMERATION;`