From patchwork Thu Dec 14 20:22:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 82173 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B3DCB3861881 for ; Thu, 14 Dec 2023 20:23:45 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by sourceware.org (Postfix) with ESMTPS id 7CBC738618D3 for ; Thu, 14 Dec 2023 20:23:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7CBC738618D3 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7CBC738618D3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702585385; cv=none; b=WPQ8BQImzNUQC8F5pPHBiVyKZhbhW62rjTvTWrUiRNV5tedGkRWLDxPlINMS77ONqhQ4uFA8LRrBPv3Y3Tt4CAknUo6Dfp1GUlPU4BJWIBbxo3TVcmaZTTtALJGf+5EgaTm2HHdjhTb4x1C2RiLzukGLRzlhPIy5lkN2oOaSXkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702585385; c=relaxed/simple; bh=5xGaqn1hOiWx3o1YRf5MFXN6z1PSSI6HRXa0NooZydg=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=bRFDfdt2bq5jRiPr5vHE7aUFCN3aQvqLE/CQjSW+nC5g97OErjyeOrYLlcK1i284G8vm2FLcrBcntHCesZS/+phoDmFic4ZTyKfwXI0mBJW6nFSHFWK07MuCq/DBgK1GtfD6iiuRGmYdZOzmqV5E6odqmB09z8om1lkAN8ifIKg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40c68c1990dso2702035e9.0 for ; Thu, 14 Dec 2023 12:23:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702585382; x=1703190182; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8yJKjDWNL/Zsu3xBwUCwPv0Bg1OJbakz819JYuRx9BQ=; b=t3M2wjq6O5L/+xZaKMvode6MzUyw5qGVQgsyTTbzjoKWaIZ/4sYc/ex3ALTHofsOmN pK4ZG6osjqonggTJXa2CzRo9HR8Xzs9li4l0FMxprxFqvtLsT6kLJCACEIqqElxZkYUS 4DWUfTV7k+w6FOZTqcPskHsK5i7Jl7fjonudQ9bLPXIFOqrDvPpjILggGX4mlazlolAZ HLyXh0Ii7xGvVrLqQaFAUCttk1LF7qDyK9miU0vG8pPrMDLuUuM3eJetuYsfmV0kCRhz X3259cROZ6hgQzQZ/1zvHq0mJ/fgiXwVK0/+6jZbR9+iWDRbyUXb911Saa83MxXIvKhZ kZeA== X-Gm-Message-State: AOJu0Yyxb3hy5l7GoYss91dVEn5pMAFRufnQpLnA96zSkC0FgVSeDX7p 9fzX1cLoM+KIaINOl4tudoTdT25yn9yT+Q== X-Google-Smtp-Source: AGHT+IGi0tSU/2SlNPtJI0wOSY0ZQaGGm4EyXILGqjE5XXGwWLwBJvEA5t2NegxPAvnv0cJCXSxeQQ== X-Received: by 2002:a05:600c:2942:b0:40c:357e:27b with SMTP id n2-20020a05600c294200b0040c357e027bmr3450970wmd.162.1702585382061; Thu, 14 Dec 2023 12:23:02 -0800 (PST) Received: from localhost ([2001:8a0:f923:4f00:2646:535c:5a04:e380]) by smtp.gmail.com with UTF8SMTPSA id p32-20020a05600c1da000b0040b360cc65csm26356106wms.0.2023.12.14.12.23.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 Dec 2023 12:23:01 -0800 (PST) From: Pedro Alves To: gdb-patches@sourceware.org Cc: Laurent Morichetti , Simon Marchi Subject: [PATCH 7/8] Add tests for s_endpgm handling Date: Thu, 14 Dec 2023 20:22:37 +0000 Message-ID: <20231214202238.1065676-8-pedro@palves.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214202238.1065676-1-pedro@palves.net> References: <20231214202238.1065676-1-pedro@palves.net> MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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+patchwork=sourceware.org@sourceware.org [Not for commit. This won't work with current upstream, unfortunately.] Check that a wave can halt at an s_endpgm instruction by single-stepping or displaced stepping the instruction preceding the s_endpgm. Check that a wave can single-step s_endpgm, and that it can step over a breakpoint placed at an s_endpgm by displaced-stepping the instruction. Test all three cases: - no step-over (stepping without a breakpoint installed) - in-line step-over - displaced step-over Check the same with "set scheduler-locking on". Check that GDB always prints the exited wave's ID when aborting a command due to thread exit, and that it prints a valid ID with no "?" in it. This is named gdb.rocm/step-over-kernel-exit.cpp and not gdb.rocm/s_endpgm.cpp because we will most probably want to extend this to test s_sendmsg deallow vgprs before s_endpgm as well. Co-Authored-By: Laurent Morichetti Co-Authored-By: Simon Marchi Change-Id: I6db617ac009383698e1c66744d68e70b1d1ca90f --- .../gdb.rocm/step-over-kernel-exit.cpp | 48 ++++++++ .../gdb.rocm/step-over-kernel-exit.exp | 108 ++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 gdb/testsuite/gdb.rocm/step-over-kernel-exit.cpp create mode 100644 gdb/testsuite/gdb.rocm/step-over-kernel-exit.exp diff --git a/gdb/testsuite/gdb.rocm/step-over-kernel-exit.cpp b/gdb/testsuite/gdb.rocm/step-over-kernel-exit.cpp new file mode 100644 index 00000000000..61f1b431df1 --- /dev/null +++ b/gdb/testsuite/gdb.rocm/step-over-kernel-exit.cpp @@ -0,0 +1,48 @@ +/* Copyright (C) 2023 Free Software Foundation, Inc. + Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include +#include + +#define CHECK(cmd) \ + do \ + { \ + hipError_t error = cmd; \ + if (error != hipSuccess) \ + { \ + fprintf (stderr, "error: '%s'(%d) at %s:%d\n", \ + hipGetErrorString (error), error, \ + __FILE__, __LINE__); \ + exit (EXIT_FAILURE); \ + } \ + } while (0) + +__global__ void +kernel () +{ + asm ("before_s_endpgm_insn: s_nop 0"); + asm ("s_endpgm_insn: s_endpgm"); /* set breakpoint here */ +} + +int +main (int argc, char **argv) +{ + kernel<<<1, 1>>> (); + CHECK (hipDeviceSynchronize ()); +} diff --git a/gdb/testsuite/gdb.rocm/step-over-kernel-exit.exp b/gdb/testsuite/gdb.rocm/step-over-kernel-exit.exp new file mode 100644 index 00000000000..484298ffa3e --- /dev/null +++ b/gdb/testsuite/gdb.rocm/step-over-kernel-exit.exp @@ -0,0 +1,108 @@ +# Copyright (C) 2023 Free Software Foundation, Inc. +# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. + +# This file is part of GDB. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test stopping at and single-stepping and displaced-stepping an +# s_endpgm instruction. + +load_lib rocm.exp + +standard_testfile .cpp + +require allow_hipcc_tests + +if { [build_executable "failed to prepare" \ + $testfile $srcfile {debug hip}] == -1 } { + return -1 +} + +# Test stepping over an s_endpgm instruction. +# +# STEP_OVER_MODE can be one of: +# +# - none: don't put a breakpoint on the s_endpgm instruction. + +# - inline: put a breakpoint on the s_endpgm instruction, and use +# in-line stepping to step over it (disable displaced-stepping). + +# - displaced: same, but use displaced stepping. +# +# SCHEDLOCK can be "on" or "off". + +proc do_test { step_over_mode schedlock } { + with_rocm_gpu_lock { + clean_restart $::binfile + + if { $step_over_mode == "none" } { + # Nothing to do. + } elseif { $step_over_mode == "inline" } { + gdb_test_no_output "set displaced-stepping off" + } elseif { $step_over_mode == "displaced" } { + gdb_test_no_output "set displaced-stepping on" + } else { + error "Invalid step_over_mode value: $step_over_mode" + } + + if ![runto_main] { + fail "can't run to main" + return -1 + } + + # Put a breakpoint on the instruction before s_endpgm, + # continue to it. + gdb_breakpoint "before_s_endpgm_insn" allow-pending + gdb_continue_to_breakpoint "before_s_endpgm_insn" + + gdb_test_no_output "set scheduler-locking $schedlock" + + gdb_test "stepi" \ + "\"s_endpgm_insn: s_endpgm\".*" \ + "single-step instruction before s_endpgm" + + gdb_test "x/i \$pc" \ + "$::hex <\[^\r\n\]*>:\[ \t\]+s_endpgm.*" \ + "stopped at s_endpgm" + + # If testing a step-over is requested, place a breakpoint at + # the current instruction to force a step-over. + if { $step_over_mode != "none" } { + gdb_test "break s_endpgm_insn" "Breakpoint $::decimal at $::hex.*" + } + + set d $::decimal + set wave_target_id_re "AMDGPU Wave $d:$d:$d:1 \\(0,0,0\\)/0" + + set selected_thread_before \ + [get_integer_valueof "\$_thread" 0 "get selected thread before"] + + gdb_test "stepi" \ + "\r\n\[$wave_target_id_re exited\]\r\nCommand aborted, thread exited\\." \ + "single-step s_endpgm" + + # Check that the selected thread didn't change, and that GDB + # manages to print the exited wave's target ID properly. + gdb_test "thread" \ + "\r\n\[Current thread is $selected_thread_before \\($wave_target_id_re\\) \\(exited\\)\]" \ + "exited wave target id" + } +} + +foreach_with_prefix step_over_mode {none inline displaced} { + foreach_with_prefix schedlock {off on} { + do_test $step_over_mode $schedlock + } +}