aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@baylibre.com>2024-03-04 16:04:11 +0100
committerThomas Schwinge <tschwinge@baylibre.com>2024-04-08 22:08:00 +0200
commit3fa8bff30ab58bd8b8018764d390ec2fcc8153bb (patch)
tree0df9f55d67b08954e91c421d19aaa9774bd1d794
parenta02d7f0edc47495ffe456af7ab7718896e0a0c25 (diff)
downloadgcc-3fa8bff30ab58bd8b8018764d390ec2fcc8153bb.zip
gcc-3fa8bff30ab58bd8b8018764d390ec2fcc8153bb.tar.gz
gcc-3fa8bff30ab58bd8b8018764d390ec2fcc8153bb.tar.bz2
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.
-rw-r--r--gcc/doc/sourcebuild.texi6
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c2
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/asmgoto-5.c2
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/asmgoto-6.c3
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr98096.c2
-rw-r--r--gcc/testsuite/gcc.dg/pr100590.c2
-rw-r--r--gcc/testsuite/gcc.dg/pr107385.c2
-rw-r--r--gcc/testsuite/gcc.dg/pr108095.c2
-rw-r--r--gcc/testsuite/gcc.dg/pr110079.c2
-rw-r--r--gcc/testsuite/gcc.dg/pr97954.c2
-rw-r--r--gcc/testsuite/gcc.dg/torture/pr100329.c2
-rw-r--r--gcc/testsuite/gcc.dg/torture/pr100398.c2
-rw-r--r--gcc/testsuite/gcc.dg/torture/pr100519.c2
-rw-r--r--gcc/testsuite/gcc.dg/torture/pr110422.c2
-rw-r--r--gcc/testsuite/lib/target-supports.exp13
15 files changed, 31 insertions, 15 deletions
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 7ef82fc..7c0df90 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -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).
diff --git a/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c b/gcc/testsuite/gcc.c-torture/compile/asmgoto-2.c
index 43e597b..234c90e 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 e1574a2..af1ba5a 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 6799b83..cb3c7d7 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 bba3fa5..3a1b615 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 8d1e1a0..64cb717 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 0cc0655..690ad3c 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 0a487cf..115ea73 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 1682f9c..f87064d 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 { nvptx-*-* || lra } } } */
/* { 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 0be60f5..619bed3 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 2a4331b..5759131 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 4fc1168..eeeaf98 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 89dff66..b82ce46 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 2a653bd..34de7a2 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 4543558..49f2482 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -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).