Revert "SWDEV-264166 - Remove gcnArch"

This reverts commit ab303e6440.

Reason for revert: Moved out to future release

Change-Id: I36b046c8681371baa9e0ccb69d46dad633ee5706
Cette révision appartient à :
Maneesh Gupta
2022-07-26 23:39:56 -04:00
Parent fa786c606a
révision d328d72fab
2 fichiers modifiés avec 3 ajouts et 2 suppressions
+2
Voir le fichier
@@ -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_;
+1 -2
Voir le fichier
@@ -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;