From d5e2a56ee72517b57700f22fda328476b748c5a4 Mon Sep 17 00:00:00 2001 From: Julia Jiang Date: Thu, 6 Feb 2025 15:30:05 -0500 Subject: [PATCH] SWDEV-508961, SWDEV-509855 - Update hipDeviceAttributePciDomainID and requestedHandleType Change-Id: Ia223b8e8c6ea3f7d345fc0b2c373199cec3efee6 [ROCm/hip commit: 0031ab056f4bfb177082950b2d96d4644eb4c57e] --- projects/hip/include/hip/hip_runtime_api.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/hip/include/hip/hip_runtime_api.h b/projects/hip/include/hip/hip_runtime_api.h index 1ac9d0c08d..2764c48ce2 100644 --- a/projects/hip/include/hip/hip_runtime_api.h +++ b/projects/hip/include/hip/hip_runtime_api.h @@ -484,7 +484,8 @@ typedef enum hipDeviceAttribute_t { hipDeviceAttributePageableMemoryAccessUsesHostPageTables, ///< Device accesses pageable memory via the host's page tables hipDeviceAttributePciBusId, ///< PCI Bus ID. hipDeviceAttributePciDeviceId, ///< PCI Device ID. - hipDeviceAttributePciDomainID, ///< PCI Domain ID. + hipDeviceAttributePciDomainId, ///< PCI Domain Id. + hipDeviceAttributePciDomainID = hipDeviceAttributePciDomainId, ///< PCI Domain ID, for backward compatibility. hipDeviceAttributePersistingL2CacheMaxSize, ///< Maximum l2 persisting lines capacity in bytes hipDeviceAttributeMaxRegistersPerBlock, ///< 32-bit registers available to a thread block. This number is shared ///< by all thread blocks simultaneously resident on a multiprocessor. @@ -1574,7 +1575,10 @@ typedef struct hipGraphInstantiateParams { */ typedef struct hipMemAllocationProp { hipMemAllocationType type; ///< Memory allocation type - hipMemAllocationHandleType requestedHandleType; ///< Requested handle type + union { + hipMemAllocationHandleType requestedHandleType; ///< Requested handle type + hipMemAllocationHandleType requestedHandleTypes; ///< Requested handle types + }; hipMemLocation location; ///< Memory location void* win32HandleMetaData; ///< Metadata for Win32 handles struct {