* [PATCH] gdb/testsuite/lib/rocm: Fix with_rocm_gpu_lock
@ 2024-05-07 9:17 Lancelot SIX
2024-05-07 9:33 ` Tom de Vries
0 siblings, 1 reply; 3+ messages in thread
From: Lancelot SIX @ 2024-05-07 9:17 UTC (permalink / raw)
To: gdb-patches; +Cc: tdevries, Lancelot SIX
A recent commit refactored with_rocm_gpu_lock:
commit fbb0edfe60edf4ca01884151e6d9b1353aaa0a7e
Date: Sat May 4 10:41:09 2024 +0200
[gdb/testsuite] Factor out proc with_lock
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.
This causes regressions in gdb.rocm/*.exp (as well as in downstream
ROCgdb). The issue can be reproduced in the following minimal test:
load_lib rocm.exp
set foo hello
with_rocm_gpu_lock {
verbose -logs $foo
}
The issue is that the body to execute under the lock is executed in the
context of with_rocm_gpu_lock (uplevel 1 used in with_lock) instead of
in the context of the "original" caller.
This patch adjusted with_rocm_gpu_lock to account for the new extra
frame in the call stack between the caller of with_rocm_gpu_lock and
where the code execution is triggered.
Change-Id: I79ce2c9615012215867ed5bb60144abe7dce28fe
---
gdb/testsuite/lib/rocm.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdb/testsuite/lib/rocm.exp b/gdb/testsuite/lib/rocm.exp
index 2276bb3640e..b2db0d5c783 100644
--- a/gdb/testsuite/lib/rocm.exp
+++ b/gdb/testsuite/lib/rocm.exp
@@ -112,7 +112,7 @@ set gpu_lock_filename gpu-parallel.lock
# the GPU lock.
proc with_rocm_gpu_lock { body } {
- with_lock $::gpu_lock_filename $body
+ with_lock $::gpu_lock_filename {uplevel 1 $body}
# In case BODY returned early due to some testcase failing, and
# left GDB running, debugging the GPU.
base-commit: cdf5362f562ad605199f28db686f93251979ae5d
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gdb/testsuite/lib/rocm: Fix with_rocm_gpu_lock
2024-05-07 9:17 [PATCH] gdb/testsuite/lib/rocm: Fix with_rocm_gpu_lock Lancelot SIX
@ 2024-05-07 9:33 ` Tom de Vries
2024-05-07 9:37 ` Lancelot SIX
0 siblings, 1 reply; 3+ messages in thread
From: Tom de Vries @ 2024-05-07 9:33 UTC (permalink / raw)
To: Lancelot SIX, gdb-patches
On 5/7/24 11:17, Lancelot SIX wrote:
> A recent commit refactored with_rocm_gpu_lock:
>
> commit fbb0edfe60edf4ca01884151e6d9b1353aaa0a7e
> Date: Sat May 4 10:41:09 2024 +0200
>
> [gdb/testsuite] Factor out proc with_lock
>
> 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.
>
> This causes regressions in gdb.rocm/*.exp (as well as in downstream
> ROCgdb). The issue can be reproduced in the following minimal test:
>
> load_lib rocm.exp
> set foo hello
> with_rocm_gpu_lock {
> verbose -logs $foo
> }
>
> The issue is that the body to execute under the lock is executed in the
> context of with_rocm_gpu_lock (uplevel 1 used in with_lock) instead of
> in the context of the "original" caller.
>
> This patch adjusted with_rocm_gpu_lock to account for the new extra
> frame in the call stack between the caller of with_rocm_gpu_lock and
> where the code execution is triggered.
>
Hi Lancelot,
sorry for the breakage, thanks for fixing this.
LGTM.
Approved-By: Tom de Vries <tdevries@suse.de>
Thanks,
- Tom
> Change-Id: I79ce2c9615012215867ed5bb60144abe7dce28fe
> ---
> gdb/testsuite/lib/rocm.exp | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gdb/testsuite/lib/rocm.exp b/gdb/testsuite/lib/rocm.exp
> index 2276bb3640e..b2db0d5c783 100644
> --- a/gdb/testsuite/lib/rocm.exp
> +++ b/gdb/testsuite/lib/rocm.exp
> @@ -112,7 +112,7 @@ set gpu_lock_filename gpu-parallel.lock
> # the GPU lock.
>
> proc with_rocm_gpu_lock { body } {
> - with_lock $::gpu_lock_filename $body
> + with_lock $::gpu_lock_filename {uplevel 1 $body}
>
> # In case BODY returned early due to some testcase failing, and
> # left GDB running, debugging the GPU.
>
> base-commit: cdf5362f562ad605199f28db686f93251979ae5d
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gdb/testsuite/lib/rocm: Fix with_rocm_gpu_lock
2024-05-07 9:33 ` Tom de Vries
@ 2024-05-07 9:37 ` Lancelot SIX
0 siblings, 0 replies; 3+ messages in thread
From: Lancelot SIX @ 2024-05-07 9:37 UTC (permalink / raw)
To: Tom de Vries, gdb-patches
> sorry for the breakage, thanks for fixing this.
No problem, that was an easy fix.
>
> LGTM.
>
> Approved-By: Tom de Vries <tdevries@suse.de>
Thanks,
I have pushed this patch.
Best,
Lancelot.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-07 9:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-07 9:17 [PATCH] gdb/testsuite/lib/rocm: Fix with_rocm_gpu_lock Lancelot SIX
2024-05-07 9:33 ` Tom de Vries
2024-05-07 9:37 ` Lancelot SIX
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).