From patchwork Mon Apr 15 15:56:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 88502 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 8E4DC3858C78 for ; Mon, 15 Apr 2024 15:57:04 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id D3EE33849AF3 for ; Mon, 15 Apr 2024 15:56:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D3EE33849AF3 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D3EE33849AF3 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; cv=none; b=IPHAWywQyPs8UqHNGx/u1f9Pw49T6BHfa90ff0sJ1d1fMDFDagbvSC/63+DgZ9uX2g54tGsFLZN513Y0xXwqP5BieyU34IJsv+PL7ZL8V1aFzuGPVaaSWVwhMfBWvfLnaNSjr/lc2pdjAPGp7KF5m+vnrsWNOFUH9EN55nX3HIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713196578; c=relaxed/simple; bh=xaR3YcmEuwU1rZO7/4NG2mK8nJZqY67Ei9Xb1vtKsNA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=ueynmtZbicfdFiUw8AP+iicT8W1nr2uxGki0DsxeWRUkE8twlzOx86afUP1QNKUfwYakPm7MOtoKMKrYj+k522xXbxdEF4xYn3Oo3ndmY2ECEGg9t0AO47zyzyRZWnNirYXA3SlRyZ7zFiedfz4WdRvqpy+XyiAnMBB9gRlZ/KI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 96C08372E6 for ; Mon, 15 Apr 2024 15:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=blEvK7H238Cbis1xn9n80VH/EALi4XsLGjBWNLQcDWK53+OQUrRQRB9B+1njkqFyenJ9yk emhu2yw9AGlK0faWC+bHO1fF+C0LGCnceLTFFuVxKPwkydRcCCEIW3a8RzIX6BMdgUOLsm adJBZ5pxnBE0qCzMcHrExDxW7cXDVDM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=00tddPbEw9saWmNplzR15rBcXN+a38mavvaYnBrQEu1ClBQAopKiCbV+kXwLsZGLGpG/Kh W8uT+kDZoGYqm6BQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=blEvK7H238Cbis1xn9n80VH/EALi4XsLGjBWNLQcDWK53+OQUrRQRB9B+1njkqFyenJ9yk emhu2yw9AGlK0faWC+bHO1fF+C0LGCnceLTFFuVxKPwkydRcCCEIW3a8RzIX6BMdgUOLsm adJBZ5pxnBE0qCzMcHrExDxW7cXDVDM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713196574; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s6RibtNVytSctH0ld00WZMr430imwdQEQleSjpA/UNc=; b=00tddPbEw9saWmNplzR15rBcXN+a38mavvaYnBrQEu1ClBQAopKiCbV+kXwLsZGLGpG/Kh W8uT+kDZoGYqm6BQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 807E81395B for ; Mon, 15 Apr 2024 15:56:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id UMUcHh5OHWaVRgAAD6G6ig (envelope-from ) for ; Mon, 15 Apr 2024 15:56:14 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 3/7] [gdb/testsuite] Factor out proc with_lock Date: Mon, 15 Apr 2024 17:56:23 +0200 Message-Id: <20240415155627.22108-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240415155627.22108-1-tdevries@suse.de> References: <20240415155627.22108-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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 Factor out proc with_lock from with_rocm_gpu_lock, and move required procs lock_file_acquire and lock_file_release to lib/gdb-utils.exp. Tested on aarch64-linux. --- gdb/testsuite/lib/gdb-utils.exp | 59 +++++++++++++++++++++++++++++++++ gdb/testsuite/lib/rocm.exp | 55 +----------------------------- 2 files changed, 60 insertions(+), 54 deletions(-) diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 34752081b60..4205f8d1a22 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -138,3 +138,62 @@ proc version_compare { l1 op l2 } { } return 1 } + +# Acquire lock file LOCKFILE. Tries forever until the lock file is +# successfully created. + +proc lock_file_acquire {lockfile} { + verbose -log "acquiring lock file: $::subdir/${::gdb_test_file_name}.exp" + while {true} { + if {![catch {open $lockfile {WRONLY CREAT EXCL}} rc]} { + set msg "locked by $::subdir/${::gdb_test_file_name}.exp" + verbose -log "lock file: $msg" + # For debugging, put info in the lockfile about who owns + # it. + puts $rc $msg + flush $rc + return [list $rc $lockfile] + } + after 10 + } +} + +# Release a lock file. + +proc lock_file_release {info} { + verbose -log "releasing lock file: $::subdir/${::gdb_test_file_name}.exp" + + if {![catch {fconfigure [lindex $info 0]}]} { + if {![catch { + close [lindex $info 0] + file delete -force [lindex $info 1] + } rc]} { + return "" + } else { + return -code error "Error releasing lockfile: '$rc'" + } + } else { + error "invalid lock" + } +} + +# Run body under lock LOCK_FILE. + +proc with_lock { lock_file body } { + if {[info exists ::GDB_PARALLEL]} { + set lock_rc [lock_file_acquire $lock_file] + } + + set code [catch {uplevel 1 $body} result] + + if {[info exists ::GDB_PARALLEL]} { + lock_file_release $lock_rc + } + + if {$code == 1} { + global errorInfo errorCode + return -code $code -errorinfo $errorInfo -errorcode $errorCode $result + } else { + return -code $code $result + } +} diff --git a/gdb/testsuite/lib/rocm.exp b/gdb/testsuite/lib/rocm.exp index ab21db6685c..7dd7ef3f3b5 100644 --- a/gdb/testsuite/lib/rocm.exp +++ b/gdb/testsuite/lib/rocm.exp @@ -108,68 +108,15 @@ gdb_caching_proc allow_hipcc_tests {} { # at a time. set gpu_lock_filename $objdir/gpu-parallel.lock -# Acquire lock file LOCKFILE. Tries forever until the lock file is -# successfully created. - -proc lock_file_acquire {lockfile} { - verbose -log "acquiring lock file: $::subdir/${::gdb_test_file_name}.exp" - while {true} { - if {![catch {open $lockfile {WRONLY CREAT EXCL}} rc]} { - set msg "locked by $::subdir/${::gdb_test_file_name}.exp" - verbose -log "lock file: $msg" - # For debugging, put info in the lockfile about who owns - # it. - puts $rc $msg - flush $rc - return [list $rc $lockfile] - } - after 10 - } -} - -# Release a lock file. - -proc lock_file_release {info} { - verbose -log "releasing lock file: $::subdir/${::gdb_test_file_name}.exp" - - if {![catch {fconfigure [lindex $info 0]}]} { - if {![catch { - close [lindex $info 0] - file delete -force [lindex $info 1] - } rc]} { - return "" - } else { - return -code error "Error releasing lockfile: '$rc'" - } - } else { - error "invalid lock" - } -} - # Run body under the GPU lock. Also calls gdb_exit before releasing # the GPU lock. proc with_rocm_gpu_lock { body } { - if {[info exists ::GDB_PARALLEL]} { - set lock_rc [lock_file_acquire $::gpu_lock_filename] - } - - set code [catch {uplevel 1 $body} result] + with_lock $::gpu_lock_filename $body # In case BODY returned early due to some testcase failing, and # left GDB running, debugging the GPU. gdb_exit - - if {[info exists ::GDB_PARALLEL]} { - lock_file_release $lock_rc - } - - if {$code == 1} { - global errorInfo errorCode - return -code $code -errorinfo $errorInfo -errorcode $errorCode $result - } else { - return -code $code $result - } } # Return true if all the devices support debugging multiple processes