| Message ID | 87ttkzompl.fsf@euler.schwinge.ddns.net |
|---|---|
| State | New |
| Headers | show |
| Series | New effective-target 'asm_goto_with_outputs' (was: [PATCH] testsuite: Fix up lra effective target) | expand |
On 3/21/24 5:20 AM, Thomas Schwinge wrote: > Hi! > > On 2024-02-16T10:48:53-0800, Mike Stump <mikestump@comcast.net> wrote: >> On Feb 16, 2024, at 2:16 AM, Jakub Jelinek <jakub@redhat.com> wrote: >>> >>> There is one special case, NVPTX, which is a TARGET_NO_REGISTER_ALLOCATION >>> target. I think claiming for it that it is a lra target is strange (even >>> though it effectively returns true for targetm.lra_p ()), unsure if it >>> supports asm goto with outputs or not, if it does and we want to test it, >>> perhaps we should introduce asm_goto_outputs effective target and use >>> lra || nvptx-*-* for that? >> >> Since the port people have to maintain that code in general, I usually leave it to them to try and select a cheap, maintainable way to manage it. >> >> If people want to pave the way, I'd tend to defer to them, having thought about more than I. > > Here I am. ;-) > > After commit e16f90be2dc8af6c371fe79044c3e668fa3dda62 > "testsuite: Fix up lra effective target", we get for nvptx target: > > -PASS: gcc.c-torture/compile/asmgoto-2.c -O0 (test for excess errors) > +ERROR: gcc.c-torture/compile/asmgoto-2.c -O0 : no files matched glob pattern "lra1020113.c.[0-9][0-9][0-9]r.reload" for " dg-do 2 compile { target lra } " > > Etc. > > That is, the current effective-target 'lra' is not suitable for nvptx -- > which, I suppose, is OK, given that nvptx neither uses LRA nor doesn't > use LRA. ;-) (Therefore, effective-target 'lra' shouldn't get used in > test cases that are active for nvptx.) > > However, nvptx appears to support 'asm goto' with outputs, including the > new execution test case: > > PASS: gcc.dg/pr107385.c execution test > > I'm attaching "[WIP] New effective-target 'asm_goto_with_outputs'", which > does address the effective-target check for nvptx, and otherwise does > 's%lra%asm_goto_with_outputs'. (I have not yet actually merged > 'check_effective_target_lra' into > 'check_effective_target_asm_goto_with_outputs'.) > > I have verified that all current effective-target 'lra' test cases > actually use 'asm goto' with outputs, there is just one exception: > 'gcc.dg/pr110079.c' (see > <https://inbox.sourceware.org/Zel5TMMr/3BHgl0g@tucnak> > "bb-reorder: Fix -freorder-blocks-and-partition ICEs on aarch64 with asm goto [PR110079]", > <https://gcc.gnu.org/PR110079> > "ICE with -freorder-blocks-and-partition and inline-asm goto"). That > test case, 'gcc.dg/pr110079.c', currently uses 'target lra', and uses > 'asm goto' -- but not with outputs, so is 'asm_goto_with_outputs' not > really applicable? The test case does PASS for nvptx target (but I've > not verified what it's actually doing/testing). How to handle that one? I'd just make target_lra return false for nvptx rather than creating a new selector -- I'm not aware of any features other than asm goto that LRA provides that aren't supported reload. Or perhaps rename the selector entirely to target_asm_goto? jeff
On Fri, Mar 22, 2024 at 12:17:03PM -0600, Jeff Law wrote: > I'd just make target_lra return false for nvptx rather than creating a new The lra effective target currently though doesn't check if asm goto can have outputs, but rather if the target is using lra. > selector -- I'm not aware of any features other than asm goto that LRA > provides that aren't supported reload. > > Or perhaps rename the selector entirely to target_asm_goto? In that case we should just test if asm goto with outputs is allowed in a cached snippet, rather than testing if there is LRA in the ra dumps. Jakub
On 3/22/24 12:24 PM, Jakub Jelinek wrote: > On Fri, Mar 22, 2024 at 12:17:03PM -0600, Jeff Law wrote: >> I'd just make target_lra return false for nvptx rather than creating a new > > The lra effective target currently though doesn't check if asm goto can have > outputs, but rather if the target is using lra. Right. It's not 100% precise as we lose one testcase for nvptx. THat's a tradeoff I'd be willing to make. > >> selector -- I'm not aware of any features other than asm goto that LRA >> provides that aren't supported reload. >> >> Or perhaps rename the selector entirely to target_asm_goto? > > In that case we should just test if asm goto with outputs is allowed > in a cached snippet, rather than testing if there is LRA in the ra dumps. I won't lose any sleep with that approach, I just don't see that it adds a lot of value. jeff
From d9f8faaa5026bb970b3246235eb22bf9b5e9fe3a Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@baylibre.com>
Date: Mon, 4 Mar 2024 16:04:11 +0100
Subject: [PATCH] [WIP] New effective-target 'asm_goto_with_outputs'
After commit e16f90be2dc8af6c371fe79044c3e668fa3dda62
"testsuite: Fix up lra effective target", we get for nvptx target:
-PASS: gcc.c-torture/compile/asmgoto-2.c -O0 (test for excess errors)
+ERROR: gcc.c-torture/compile/asmgoto-2.c -O0 : no files matched glob pattern "lra1020113.c.[0-9][0-9][0-9]r.reload" for " dg-do 2 compile { target lra } "
Etc.
However, nvptx appears to support 'asm goto' with outputs, including the
new execution test case:
PASS: gcc.dg/pr107385.c execution test
TODO gcc/testsuite/gcc.dg/pr110079.c
doesn't using 'asm_goto' with outputs, but is PASS for nvptx, and would ERROR for 'target lra'.
---
gcc/doc/sourcebuild.texi | 3 +++
gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c | 2 +-
gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c | 2 +-
gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c | 3 +--
gcc/testsuite/gcc.c-torture/compile/pr98096.c | 2 +-
gcc/testsuite/gcc.dg/pr100590.c | 2 +-
gcc/testsuite/gcc.dg/pr107385.c | 2 +-
gcc/testsuite/gcc.dg/pr108095.c | 2 +-
gcc/testsuite/gcc.dg/pr110079.c | 2 +-
gcc/testsuite/gcc.dg/pr97954.c | 2 +-
gcc/testsuite/gcc.dg/torture/pr100329.c | 2 +-
gcc/testsuite/gcc.dg/torture/pr100398.c | 2 +-
gcc/testsuite/gcc.dg/torture/pr100519.c | 2 +-
gcc/testsuite/gcc.dg/torture/pr110422.c | 2 +-
gcc/testsuite/lib/target-supports.exp | 9 +++++++++
15 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index b56b9c39733..a176a3c864f 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -2863,6 +2863,9 @@ Target supports weak undefined symbols
@item R_flag_in_section
Target supports the 'R' flag in .section directive in assembly inputs.
+@item asm_goto_with_outputs
+Target supports 'asm goto' with outputs.
+
@item automatic_stack_alignment
Target supports automatic stack alignment.
diff --git a/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c b/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c
index 43e597bc59f..234c90e5295 100644
--- a/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c
+++ b/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c
@@ -1,5 +1,5 @@
/* This test should be switched off for a new target with less than 4 allocatable registers */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
int
foo (void)
{
diff --git a/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c b/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c
index e1574a2903a..af1ba5a7001 100644
--- a/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c
+++ b/gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c
@@ -1,5 +1,5 @@
/* Test to generate output reload in asm goto on x86_64. */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* { dg-skip-if "no O0" { { i?86-*-* x86_64-*-* } && { ! ia32 } } { "-O0" } { "" } } */
#if defined __x86_64__
diff --git a/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c b/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c
index 6799b83c20a..cb3c7d711a6 100644
--- a/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c
+++ b/gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c
@@ -1,5 +1,4 @@
-
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* PR middle-end/110420 */
/* PR middle-end/103979 */
/* PR middle-end/98619 */
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr98096.c b/gcc/testsuite/gcc.c-torture/compile/pr98096.c
index bba3fa5c619..3a1b6159c2e 100644
--- a/gcc/testsuite/gcc.c-torture/compile/pr98096.c
+++ b/gcc/testsuite/gcc.c-torture/compile/pr98096.c
@@ -1,6 +1,6 @@
/* Test for correct naming of label operands in asm goto in case of presence of
input/output operands. */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
int i, j;
int f(void) {
asm goto ("# %0 %2" : "+r" (i) ::: jmp);
diff --git a/gcc/testsuite/gcc.dg/pr100590.c b/gcc/testsuite/gcc.dg/pr100590.c
index 8d1e1a0d306..64cb717ed0e 100644
--- a/gcc/testsuite/gcc.dg/pr100590.c
+++ b/gcc/testsuite/gcc.dg/pr100590.c
@@ -1,5 +1,5 @@
/* PR rtl-optimization/100590 */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* { dg-options "-O1 -fno-dce -w" } */
int
diff --git a/gcc/testsuite/gcc.dg/pr107385.c b/gcc/testsuite/gcc.dg/pr107385.c
index 0cc0655d848..690ad3c1b5e 100644
--- a/gcc/testsuite/gcc.dg/pr107385.c
+++ b/gcc/testsuite/gcc.dg/pr107385.c
@@ -1,5 +1,5 @@
/* PR middle-end/107385 */
-/* { dg-do run { target lra } } */
+/* { dg-do run { target asm_goto_with_outputs } } */
/* { dg-options "-O2" } */
__attribute__((noipa)) int
diff --git a/gcc/testsuite/gcc.dg/pr108095.c b/gcc/testsuite/gcc.dg/pr108095.c
index 0a487cf614a..115ea73e39b 100644
--- a/gcc/testsuite/gcc.dg/pr108095.c
+++ b/gcc/testsuite/gcc.dg/pr108095.c
@@ -1,5 +1,5 @@
/* PR tree-optimization/108095 */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* { dg-options "-Os -g" } */
int v;
diff --git a/gcc/testsuite/gcc.dg/pr110079.c b/gcc/testsuite/gcc.dg/pr110079.c
index 1682f9c2344..e8ec6666b23 100644
--- a/gcc/testsuite/gcc.dg/pr110079.c
+++ b/gcc/testsuite/gcc.dg/pr110079.c
@@ -1,5 +1,5 @@
/* PR rtl-optimization/110079 */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* { dg-options "-O2" } */
/* { dg-additional-options "-freorder-blocks-and-partition" { target freorder } } */
diff --git a/gcc/testsuite/gcc.dg/pr97954.c b/gcc/testsuite/gcc.dg/pr97954.c
index 0be60f500b6..619bed3b40c 100644
--- a/gcc/testsuite/gcc.dg/pr97954.c
+++ b/gcc/testsuite/gcc.dg/pr97954.c
@@ -1,5 +1,5 @@
/* PR rtl-optimization/97954 */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* { dg-options "-O2" } */
int
diff --git a/gcc/testsuite/gcc.dg/torture/pr100329.c b/gcc/testsuite/gcc.dg/torture/pr100329.c
index 2a4331ba712..5759131a6ca 100644
--- a/gcc/testsuite/gcc.dg/torture/pr100329.c
+++ b/gcc/testsuite/gcc.dg/torture/pr100329.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* { dg-additional-options "--param tree-reassoc-width=2" } */
unsigned int a0;
diff --git a/gcc/testsuite/gcc.dg/torture/pr100398.c b/gcc/testsuite/gcc.dg/torture/pr100398.c
index 4fc1168d22f..eeeaf98e15b 100644
--- a/gcc/testsuite/gcc.dg/torture/pr100398.c
+++ b/gcc/testsuite/gcc.dg/torture/pr100398.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
int
test5_limit (void)
diff --git a/gcc/testsuite/gcc.dg/torture/pr100519.c b/gcc/testsuite/gcc.dg/torture/pr100519.c
index 89dff668a97..b82ce46c529 100644
--- a/gcc/testsuite/gcc.dg/torture/pr100519.c
+++ b/gcc/testsuite/gcc.dg/torture/pr100519.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
/* { dg-additional-options "--param tree-reassoc-width=2" } */
unsigned int foo_a1, foo_a2;
diff --git a/gcc/testsuite/gcc.dg/torture/pr110422.c b/gcc/testsuite/gcc.dg/torture/pr110422.c
index 2a653bdfce3..34de7a2980f 100644
--- a/gcc/testsuite/gcc.dg/torture/pr110422.c
+++ b/gcc/testsuite/gcc.dg/torture/pr110422.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
struct T { int x; };
int foo(void) {
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 5a1f0ed5a28..158dc51a71f 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -13211,6 +13211,15 @@ proc check_effective_target_lra { } {
} {-O2 -fdump-rtl-reload-details}] ;# LRA notes requires a detailed dump.
}
+# Return 1 if 'asm goto' with outputs is supported, 0 otherwise.
+
+proc check_effective_target_asm_goto_with_outputs { } {
+ if { [istarget nvptx-*-*] } {
+ return 1
+ }
+ return [check_effective_target_lra]
+}
+
# Test whether optimizations are enabled ('__OPTIMIZE__') per the
# 'current_compiler_flags' (thus don't cache).
--
2.34.1