From d328d72fab353a50b5dab8c4626de2c7db6edc0f Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Tue, 26 Jul 2022 23:39:56 -0400 Subject: [PATCH] Revert "SWDEV-264166 - Remove gcnArch" This reverts commit ab303e6440a2c2157f7921aabacf953981800d14. Reason for revert: Moved out to future release Change-Id: I36b046c8681371baa9e0ccb69d46dad633ee5706 --- hipamd/src/hip_device.cpp | 2 ++ hipamd/src/hip_peer.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hipamd/src/hip_device.cpp b/hipamd/src/hip_device.cpp index 1467bb2f40..8c72bd0d7c 100644 --- a/hipamd/src/hip_device.cpp +++ b/hipamd/src/hip_device.cpp @@ -302,6 +302,8 @@ hipError_t ihipGetDeviceProperties(hipDeviceProp_t* props, hipDevice_t device) { deviceProps.pciDeviceID = info.deviceTopology_.pcie.device; deviceProps.maxSharedMemoryPerMultiProcessor = info.localMemSizePerCU_; deviceProps.canMapHostMemory = 1; + // FIXME: This should be removed, targets can have character names as well. + deviceProps.gcnArch = isa.versionMajor() * 100 + isa.versionMinor() * 10 + isa.versionStepping(); sprintf(deviceProps.gcnArchName, "%s", isa.targetId()); deviceProps.cooperativeLaunch = info.cooperativeGroups_; deviceProps.cooperativeMultiDeviceLaunch = info.cooperativeMultiDeviceGroups_; diff --git a/hipamd/src/hip_peer.cpp b/hipamd/src/hip_peer.cpp index 240d1e0912..fb6b332942 100644 --- a/hipamd/src/hip_peer.cpp +++ b/hipamd/src/hip_peer.cpp @@ -151,8 +151,7 @@ hipError_t hipDeviceGetP2PAttribute(int* value, hipDeviceP2PAttr attr, // Linear layout access is supported if P2P is enabled // Opaque Images are supported only on homogeneous systems // Might have more conditions to check, in future. - if (0 == strncmp(srcDeviceProp.gcnArchName, dstDeviceProp.gcnArchName, - sizeof(srcDeviceProp.gcnArchName))) { + if (srcDeviceProp.gcnArch == dstDeviceProp.gcnArch) { HIP_RETURN_ONFAIL(canAccessPeer(value, srcDevice, dstDevice)); } else { *value = 0;