[gcc r15-5080] libgomp/plugin/plugin-gcn.c: Show device number in ISA error message

[Tobias Burnus via Gcc-cvs]

https://gcc.gnu.org/g:8473010807a264af35fb7cecad6f9406feab929f

commit r15-5080-g8473010807a264af35fb7cecad6f9406feab929f
Author: Tobias Burnus <tbur...@baylibre.com>
Date:   Mon Nov 11 12:17:42 2024 +0100

    libgomp/plugin/plugin-gcn.c: Show device number in ISA error message
    
    libgomp/ChangeLog:
    
            * plugin/plugin-gcn.c (isa_matches_agent): Mention the device number
            and ROCR_VISIBLE_DEVICES when reporting an ISA mismatch error.

Diff:
---
 libgomp/plugin/plugin-gcn.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c
index 592a7b6daba4..f2f2940de9db 100644
--- a/libgomp/plugin/plugin-gcn.c
+++ b/libgomp/plugin/plugin-gcn.c
@@ -2414,14 +2414,17 @@ isa_matches_agent (struct agent_info *agent, Elf64_Ehdr 
*image)
 
   if (isa_field != agent->device_isa)
     {
-      char msg[120];
+      char msg[204];
       const char *agent_isa_s = isa_name (agent->device_isa);
       assert (agent_isa_s);
 
       snprintf (msg, sizeof msg,
-               "GCN code object ISA '%s' does not match GPU ISA '%s'.\n"
-               "Try to recompile with '-foffload-options=-march=%s'.\n",
-               isa_s, agent_isa_s, agent_isa_s);
+               "GCN code object ISA '%s' does not match GPU ISA '%s' "
+               "(device %d).\n"
+               "Try to recompile with '-foffload-options=-march=%s',\n"
+               "or use ROCR_VISIBLE_DEVICES to disable incompatible "
+               "devices.\n",
+               isa_s, agent_isa_s, agent->device_id, agent_isa_s);
 
       hsa_error (msg, HSA_STATUS_ERROR);
       return false;