New effective-target 'asm_goto_with_outputs' (was: [PATCH] testsuite: Fix up lra effective target)
Checks
Commit Message
Hi!
On 2024-03-21T12:20:38+0100, I wrote:
> 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've now pushed a v2 version to trunk branch in
commit 3fa8bff30ab58bd8b8018764d390ec2fcc8153bb
"New effective-target 'asm_goto_with_outputs'", see attached.
Grüße
Thomas
From 3fa8bff30ab58bd8b8018764d390ec2fcc8153bb Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@baylibre.com>
Date: Mon, 4 Mar 2024 16:04:11 +0100
Subject: [PATCH] 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
Therefore, generally use new effective-target 'asm_goto_with_outputs' instead
of 'lra'. One exceptions is 'gcc.dg/pr110079.c', which doesn't use 'asm goto'
with outputs, and continues using effective-target 'lra', with special-casing
nvptx target, to avoid ERROR for 'lra'.
gcc/
* doc/sourcebuild.texi (Effective-Target Keywords): Document
'asm_goto_with_outputs'. Add comment to 'lra'.
gcc/testsuite/
* lib/target-supports.exp (check_effective_target_lra): Add
comment.
(check_effective_target_asm_goto_with_outputs): New.
* gcc.c-torture/compile/asmgoto-2.c: Use it.
* gcc.c-torture/compile/asmgoto-5.c: Likewise.
* gcc.c-torture/compile/asmgoto-6.c: Likewise.
* gcc.c-torture/compile/pr98096.c: Likewise.
* gcc.dg/pr100590.c: Likewise.
* gcc.dg/pr107385.c: Likewise.
* gcc.dg/pr108095.c: Likewise.
* gcc.dg/pr97954.c: Likewise.
* gcc.dg/torture/pr100329.c: Likewise.
* gcc.dg/torture/pr100398.c: Likewise.
* gcc.dg/torture/pr100519.c: Likewise.
* gcc.dg/torture/pr110422.c: Likewise.
* gcc.dg/pr110079.c: Special-case nvptx target.
---
gcc/doc/sourcebuild.texi | 6 ++++++
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 | 13 ++++++++++++-
15 files changed, 31 insertions(+), 15 deletions(-)
@@ -2871,6 +2871,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.
@@ -2945,6 +2948,9 @@ Target is using an LLVM assembler and/or linker, instead of GNU Binutils.
@item lra
Target supports local register allocator (LRA).
+This must not be called (results in @code{ERROR}) for targets that
+don't do register allocation, and therefore neither use nor don't use
+LRA.
@item lto
Compiler has been configured to support link-time optimization (LTO).
@@ -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)
{
@@ -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__
@@ -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 */
@@ -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);
@@ -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
@@ -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
@@ -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;
@@ -1,5 +1,5 @@
/* PR rtl-optimization/110079 */
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target { nvptx-*-* || lra } } } */
/* { dg-options "-O2" } */
/* { dg-additional-options "-freorder-blocks-and-partition" { target freorder } } */
@@ -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
@@ -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;
@@ -1,4 +1,4 @@
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
int
test5_limit (void)
@@ -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;
@@ -1,4 +1,4 @@
-/* { dg-do compile { target lra } } */
+/* { dg-do compile { target asm_goto_with_outputs } } */
struct T { int x; };
int foo(void) {
@@ -13204,7 +13204,9 @@ proc check_effective_target_powerpc_as_p10_htm { } {
}]
}
-# return 1 if LRA is supported.
+# Return 1 if LRA is supported. This must not be called (results in ERROR) for
+# targets that don't do register allocation, and therefore neither use nor
+# don't use LRA.
proc check_effective_target_lra { } {
# Start with heavily used targets which are known to always use LRA.
@@ -13220,6 +13222,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