Rename ROCm Threads AMDGPU Threads

Also rename ROCm DSOs AMDGPU shared objects.

gdb/ChangeLog:

        * amdgcn-rocm-tdep.c (amdgcn_rocm_displaced_step_fixup): Fix
        a typo.
        * rocm-tdep.c (rocm_target_ops::pid_to_str): Rename ROCm Thread
        AMDGPU Thread.
        * solib-rocm.c (ROCM_DSO_NAME_PREFIX): Rename ROCm-supplied DSO
        AMDGPU shared object.

Change-Id: I09dbebcc605be9829983247d09c57c3c267bbf6a

diff --git a/gdb/amdgcn-rocm-tdep.c b/gdb/amdgcn-rocm-tdep.c
index 525c6341dc6abbe82f8bf24f617fdb7ffa2156ab..ae79ff1f0c472766a77d84f1fa270b279e676486 100644 (file)
--- a/gdb/amdgcn-rocm-tdep.c
+++ b/gdb/amdgcn-rocm-tdep.c
@@ -303,7 +303,7 @@ amdgcn_rocm_displaced_step_fixup (struct gdbarch *gdbarch,
       closure->process_id, closure->wave_id, closure->displaced_stepping_id);
 
   if (status != AMD_DBGAPI_STATUS_SUCCESS)
-    error (_ ("amd_dbgapi_displaced_stepping_complete failed (rc=%d"), status);
+    error (_ ("amd_dbgapi_displaced_stepping_complete failed (rc=%d)"), status);
 
   /* We may have written some registers, so flush the register cache.  */
   registers_changed_ptid (regcache->ptid ());

diff --git a/gdb/rocm-tdep.c b/gdb/rocm-tdep.c
index af9d16bedb4202b02bb99ad778ab613b5bd01297..2989a82081d356586594fc5642c0d676067671ac 100644 (file)
--- a/gdb/rocm-tdep.c
+++ b/gdb/rocm-tdep.c
@@ -429,9 +429,9 @@ rocm_target_ops::pid_to_str (ptid_t ptid)
              AMD_DBGAPI_WAVE_INFO_WAVE_NUMBER_IN_WORK_GROUP,
              sizeof (wave_in_group), &wave_in_group)
              != AMD_DBGAPI_STATUS_SUCCESS)
-    return std::string ("ROCm Thread");
+    return std::string ("AMDGPU Thread");
   else
-    return string_printf ("ROCm Thread %ld.%ld (%d,%d,%d)/%d",
+    return string_printf ("AMDGPU Thread %ld.%ld (%d,%d,%d)/%d",
                           dispatch_id.handle, wave_id.handle, group_ids[2],
                           group_ids[1], group_ids[0], wave_in_group);
 }

diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c
index 2ca3fa3bc1e3692e8032e89628cce5f7bcf213cb..2431de92162da5823f3a4208ee8fb277e5fcf860 100644 (file)
--- a/gdb/solib-rocm.c
+++ b/gdb/solib-rocm.c
@@ -35,7 +35,7 @@
 #include <functional>
 #include <string>
 
-#define ROCM_DSO_NAME_PREFIX "ROCm-supplied DSO [loaded from memory "
+#define ROCM_DSO_NAME_PREFIX "AMDGPU shared object [loaded from memory "
 
 #define ROCM_DSO_NAME_SUFFIX "]"