From 66388092d4371b514bdc0abfeb3710673f5143ca Mon Sep 17 00:00:00 2001 From: Laurent Morichetti Date: Sat, 21 Dec 2019 16:32:00 -0800 Subject: [PATCH] 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 --- gdb/amdgcn-rocm-tdep.c | 2 +- gdb/rocm-tdep.c | 4 ++-- gdb/solib-rocm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/amdgcn-rocm-tdep.c b/gdb/amdgcn-rocm-tdep.c index 525c6341dc..ae79ff1f0c 100644 --- 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 af9d16bedb..2989a82081 100644 --- 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 2ca3fa3bc1..2431de9216 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -35,7 +35,7 @@ #include #include -#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 "]" -- 2.34.1