@llvm/pr-subscribers-offload

@llvm/pr-subscribers-backend-amdgpu

Author: Ross Brunton (RossBrunton)

diff --git a/offload/plugins-nextgen/amdgpu/src/rtl.cpp b/offload/plugins-nextgen/amdgpu/src/rtl.cpp
index 5f397436dffd1..a90bd65a9d908 100644
--- a/offload/plugins-nextgen/amdgpu/src/rtl.cpp
+++ b/offload/plugins-nextgen/amdgpu/src/rtl.cpp
@@ -2807,11 +2807,11 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
 
     Status = getDeviceAttrRaw(HSA_AMD_AGENT_INFO_PRODUCT_NAME, TmpChar);
     if (Status == HSA_STATUS_SUCCESS)
-      Info.add("Product Name", TmpChar);
+      Info.add("Product Name", TmpChar, "", DeviceInfo::NAME);
 
     Status = getDeviceAttrRaw(HSA_AGENT_INFO_NAME, TmpChar);
     if (Status == HSA_STATUS_SUCCESS)
-      Info.add("Device Name", TmpChar, "", DeviceInfo::NAME);
+      Info.add("Device Name", TmpChar);
 
     Status = getDeviceAttrRaw(HSA_AGENT_INFO_VENDOR_NAME, TmpChar);
     if (Status == HSA_STATUS_SUCCESS)

This sounds counterproductive. The product name is not really actionable information

As long as we print the actually useful part we can include the marketing name, sometimes good to know. That's what rocminfo does as well.

What's the sample output with and without this patch, for both fields?

To clarify, code name is the useful part. If the NVIDIA portion doesn't print that then it should be changed.

I've pushed up a change which leaves NAME as is, but adds PRODUCT_NAME as a new property.

For my AMD device, NAME will be gfx1100 while PRODUCT_NAME will be "Radeon RX 7900
GRE". On Nvidia, both NAME and PRODUCT_NAME will be something like "NVIDIA GeForce GT 1030" and the host device will have both values as "Virtual Host Device".

Although, would ARCH be a better name than NAME?

I've pushed up a change which leaves NAME as is, but adds PRODUCT_NAME as a new property.

For my AMD device, NAME will be gfx1100 while PRODUCT_NAME will be "Radeon RX 7900 GRE". On Nvidia, both NAME and PRODUCT_NAME will be something like "NVIDIA GeForce GT 1030" and the host device will have both values as "Virtual Host Device".

Although, would ARCH be a better name than NAME?

rocminfo calls it name so it should be fine.

IMHO if both product name and code name are shown, then it'd be fine.

@shiltian This PR doesn't affect anything being printed (this is the liboffload interface). #155626 adds a tool that prints device information, and I'll update that when this is merged (or this when that is merged).