From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kRF3LYCwR2pRsiMAWB0awg (envelope-from ) for ; Fri, 03 Jul 2026 08:52:16 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=5pczcaUm; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id B57831E024; Fri, 03 Jul 2026 08:52:16 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8ECDF1E024 for ; Fri, 03 Jul 2026 08:52:15 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 257534BA23D4 for ; Fri, 3 Jul 2026 12:52:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 257534BA23D4 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=5pczcaUm Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012027.outbound.protection.outlook.com [40.107.209.27]) by sourceware.org (Postfix) with ESMTPS id 676424BA2E1B for ; Fri, 3 Jul 2026 12:51:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 676424BA2E1B Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=amd.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 676424BA2E1B Authentication-Results: sourceware.org; arc=pass smtp.remote-ip=40.107.209.27 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1783083098; cv=pass; b=nN7WvS2lRHlH5L8wnwqy4DnWiYDrW623SlPl5DJ9kF6smMRr1g12xudK0/wvmq7HuNp6Fras7/WHcOdc672NTuKNEaHui7dz197EdrPtZerLl3a1Vy1flfXEksddzmJWxgVcYiuaAyCl60193JD8G4IZQ08ee6jueRJVWJijRrw= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1783083098; c=relaxed/simple; bh=vZBUhw/xU/insuh/iszjxJkowXZv/37EHTukZ1CwCjI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GC4qjmG1lGOtpIWGit1M+ph9B/TKiy+eTIHCg1eRE9TyxyeZlrTbH2hkgpb90q/pf9wnwZO4xgqVCOdgePQ+maG2+n6QEVYeUrl0NjDGzXN2qddsuxiqWAZ8SjaJaWyOMlpBy6KULE3BEQ8SEm+MJ8/2AfV5oQ9YcmmKLLisvk4= ARC-Authentication-Results: i=2; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=5pczcaUm DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 676424BA2E1B ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oM6IuqMr2LK9F1dO/0dtxNyXBLhiJxAAskVYrfwULDMRxGfTfH6fz9o9F95DqrPyUGfhYedawDk8KwyaPi3p5rMZQ6U62uOACQJbUnEe6+tTk/dTDS/oBqHhUrK807CU9OrVTxed0IYAb/98Vi58i81TKVdj8Mk25IDkkdAZdI5WbsbQ2ISBQqIpbvxYQkeraMHmnTwIxPz67C2YSODtGcTreSpiFvqhHGiHvZy6XFGtpsc+xUadFM2NFHqKO8xcJ1rbzB5KGB+o3yeQBCAhRdzeT6RDWMrgjjb7H/l5FC4usGXtVGdee0Q8j6k7ZMExpA1tB50gzf1Uy5gLOJev1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GCHEDJYtHBib57SeVtA395wHjO5OPcRZZ9vxJyhd1cY=; b=FQAX3RkTnfnhP3KndQbrUl5un500hh763j/8soxm1C6wdwztrITd148L3aA2Q1FuycxV4u1bMuyzn0CAaZiYkJNLM6WV9Z6i639MYRukcUtdxL+0nnt09RqLjCytJLiQiR33GqGBPLKNpfUMHuwp1o3eJZbWFG8ipZr0RSXilxqiMrlLS+HRp9hCnkmYHCBFLioWnX5aTnZBS8qhFhYjy9IlGcMZe3KomOCVXNHM1TA7h8MwSBylPU20LzLUtyg5yAXc+m/OYBCKLLAu5Jos4OzxzHfmHr6bqh5UYngXx/MLz/dmRS0uy9WaIFXowA268TGyWi1s4iLp/HuDyqv5Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=sourceware.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GCHEDJYtHBib57SeVtA395wHjO5OPcRZZ9vxJyhd1cY=; b=5pczcaUmILWroLWjmdj1E4nMPTaupLndUEf97X48NBPKEL9Kvj3poneU0tM7Wo6ha6WKMwnmqYmqWaaX1/NhAcVj+L0S4KO2O2D922aXFyCjMSQulU1PuLZnwvkYcdFDEx9rEA74EWXKta2OWiTgsht4EEqB60ZfXni8GUxLr2I= Received: from BN0PR04CA0130.namprd04.prod.outlook.com (2603:10b6:408:ed::15) by CH3PR12MB8726.namprd12.prod.outlook.com (2603:10b6:610:17b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.10; Fri, 3 Jul 2026 12:51:31 +0000 Received: from BN2PEPF000044A5.namprd04.prod.outlook.com (2603:10b6:408:ed:cafe::ab) by BN0PR04CA0130.outlook.office365.com (2603:10b6:408:ed::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.181.11 via Frontend Transport; Fri, 3 Jul 2026 12:51:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN2PEPF000044A5.mail.protection.outlook.com (10.167.243.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.6 via Frontend Transport; Fri, 3 Jul 2026 12:51:30 +0000 Received: from ctr-rack32-mi300x-1.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Fri, 3 Jul 2026 07:51:30 -0500 From: Tankut Baris Aktemur To: CC: Subject: [PATCH 2/2] gdb, amd-dbgapi-target: split wave_coordinates::to_string Date: Fri, 3 Jul 2026 07:50:58 -0500 Message-ID: <20260703125058.1828518-2-tankutbaris.aktemur@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260703125058.1828518-1-tankutbaris.aktemur@amd.com> References: <20260703125058.1828518-1-tankutbaris.aktemur@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A5:EE_|CH3PR12MB8726:EE_ X-MS-Office365-Filtering-Correlation-Id: e60d3381-2d93-4ab8-a1d1-08ded901cde7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|23010399003|376014|1800799024|36860700016|56012099006|11063799006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 829ake2j9Apg+WRG830jfsoQKJhPfgxovvbn72SC/pSl+ZbzN90N/EO0PLRBa39LsVjBVOcnRkRBfFkBNbiaBZGwNT7PNeRuTYCWFmwJbBlZnlG6AV6z3ZVvbTo42q+OnGN10s+1yYqO5AwNgj62eHsPZm8SYlSId7Zv9867dVMENUMWFU7npDwfq9rvhlJLMC5iF1/0fuMg4IItLpL/96D4/Wev/IPL32yupj92vRdg/ftDMAYT7IcoHAtqW1SQ7SiaIGkOmTsModXNdjGsFfvH4GflUcJz9JbWZnI5r2noYCMD58qJJHdWpb/1eVFcaYycNI8trsI+D4VUOFJpcoCJXdSGi2m/0XdoGj0gP0clw95aIl3O1wdvBg947w2XL0ibniw8h1+wUgeHaI7OXoT8dC6c6RanxfeHRonWYQaQpjSePaGClVvK7psatpZxz50F1/Dvn58sC2n6mWq1oJb2Dl9KBfPM1GKqocm+HX/6JicTh7lkG+Fu0Arc78GRooNcZR4wZuqVDyP5wS+GkozHoZvQoqxcPqI/YDqgR5pXTGAKjYsme8yAfsd1aeTUqdmEXyI5YPfVgNamiMdscCG/Zo6+X+N1XfoBWxfM8jZpzM8YPAEgyCOQITN8c3ItCkY3tgEgdHZxQDkn/d+Lim7veNLuh4K44D6/w5nxl24YsgPuc+lh1+SISuMnEm6hV0xhBZAPpt4816W7uUmpYg== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(23010399003)(376014)(1800799024)(36860700016)(56012099006)(11063799006)(18002099003)(22082099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LA62aRQu0qMnP9LxVhPD4hnFhRfqvm867l1fSFgEtR2w9oK0jwoMz66eFPbilSU5HZYzheh4YY8WCfW2uRGBgMELsN0H8Jk5O3gngBsFE4eJvzzZ/nR1dima/7Po/tIVfZ8T9ZPJ0RRdCBEVU/SseWqLhB4Dpfr3IBhNCCN1EqJzq//QhGkwAY4J41Cew5Sh2LGpKVUAGLMSm6dq2iZ65NN6M8zXKTDomG2b+7zRYnpmj3xCtNa7ju7Xzsy7okmn1s/72BfAWQvGBCw/hdcOWXXPfVjAE6XKrObDi86c7O1rdgQz28yI6IDvi/Ddt9SRXXwQ2lbVKCFNwDHD9p/pyLyAJTAiRjIiKCykFFO9dgDS8FrbuZFaJxZxagrlDkI+0cp+EJlDZgsn8u3qLcNCx10b+owQdhW2ZjO3mNmi9hEAuDOwG+b81qJLVxdYIk1+ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2026 12:51:30.5466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e60d3381-2d93-4ab8-a1d1-08ded901cde7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000044A5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8726 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org wave_coordinates::to_string() produces a string in the following format: AMDGPU Wave a:q:d:w (x,y,z)/i Split the method into smaller pieces: a:q:d:w : hierarchy_str (x,y,z) : workgroup_coord_str (x,y,z)/i : dispatch_pos_str This is a refactoring to allow reusing pieces. Currently the reuse opportunity exists in the downstream debugger. --- gdb/amd-dbgapi-target.c | 55 +++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/gdb/amd-dbgapi-target.c b/gdb/amd-dbgapi-target.c index 923b790664e..33512695fb5 100644 --- a/gdb/amd-dbgapi-target.c +++ b/gdb/amd-dbgapi-target.c @@ -147,6 +147,17 @@ struct wave_coordinates : wave_id (wave_id) {} + /* Return the string showing the agent -> queue -> dispatch -> wave + hierarchy. */ + std::string hierarchy_str () const; + + /* Return the workgroup coordinates as a string. */ + std::string workgroup_coord_str () const; + + /* Return the dispatch position string for the wave this + wave_coordinates is for. */ + std::string dispatch_pos_str () const; + /* Return the target ID string for the wave this wave_coordinates is for. */ std::string to_string () const; @@ -387,13 +398,12 @@ get_amd_dbgapi_inferior_info (inferior *inferior) static async_event_handler *amd_dbgapi_async_event_handler = nullptr; std::string -wave_coordinates::to_string () const +wave_coordinates::hierarchy_str () const { - std::string str = "AMDGPU Wave"; - - str += (agent_id != AMD_DBGAPI_AGENT_NONE - ? string_printf (" %s", pulongest (agent_id.handle)) - : " ?"); + std::string str + = (agent_id != AMD_DBGAPI_AGENT_NONE + ? string_printf (" %s", pulongest (agent_id.handle)) + : "?"); str += (queue_id != AMD_DBGAPI_QUEUE_NONE ? string_printf (":%s", pulongest (queue_id.handle)) @@ -405,11 +415,25 @@ wave_coordinates::to_string () const str += string_printf (":%s", pulongest (wave_id.handle)); - str += (group_ids[0] != UINT32_MAX - ? string_printf (" (%u,%u,%u)", group_ids[0], group_ids[1], - group_ids[2]) - : " (?,?,?)"); + return str; +} + +std::string +wave_coordinates::workgroup_coord_str () const +{ + std::string str + = (group_ids[0] != UINT32_MAX + ? string_printf ("(%u,%u,%u)", group_ids[0], group_ids[1], + group_ids[2]) + : "(?,?,?)"); + return str; +} + +std::string +wave_coordinates::dispatch_pos_str () const +{ + std::string str = workgroup_coord_str (); str += (wave_in_group != UINT32_MAX ? string_printf ("/%u", wave_in_group) : "/?"); @@ -417,6 +441,17 @@ wave_coordinates::to_string () const return str; } +std::string +wave_coordinates::to_string () const +{ + std::string str = "AMDGPU Wave"; + + str += " " + hierarchy_str (); + str += " " + dispatch_pos_str (); + + return str; +} + /* Read in wave_info for WAVE_ID. */ void -- 2.34.1