[AArch64,committed] Fix gcc.target/aarch64/spellcheck_1.c and spellcheck_4.c

Message ID 5BA0FE23.70006@foss.arm.com
State New
Headers show
Series
  • [AArch64,committed] Fix gcc.target/aarch64/spellcheck_1.c and spellcheck_4.c
Related show

Commit Message

Kyrill Tkachov Sept. 18, 2018, 1:31 p.m.
Hi all,

These two tests started failing after commit r264335 that adjusted the cutoff point at which the diagnostic suggestions machinery decides a suggestion is meaningful.
For these tests it means we no longer suggest anything as an alternative to "armv8-a-typo" as an "arch=" pargma value. We do still list the valid options, we just don't prefer one particular value over the others.

When I first wrote this test it wasn't with a particular architecture suggestion in mind, but rather to test that the suggestion machinery is being sanely invoked.
So this patch changes the dg-message check to treat the "did you mean...?" hunk as optional (in case the heuristics in the suggestions machinery change again).

With this patch the two tests PASS again on aarch64.

Committing to trunk as obvious.

Thanks,
Kyrill

2018-09-18  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

     * gcc.target/aarch64/spellcheck_1.c:
     Make architecture suggestion optional.
     * gcc.target/aarch64/spellcheck_4.c:
     Likewise.

Patch

diff --git a/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c b/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c
index f57e0c5463299ea1c2b369fb00ca3fc005cb567b..a0795c1cc532208fcb04ceefa6877deac4a2d749 100644
--- a/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c
@@ -3,7 +3,7 @@ 
 __attribute__((target ("arch=armv8-a-typo"))) void
 foo ()
 {
-  /* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'armv8-a'?"  "" { target *-*-* } .-1 } */
+  /* { dg-message "valid arguments are: \[^\n\r]*(; did you mean 'armv*'?)?"  "" { target *-*-* } .-1 } */
   /* { dg-error "invalid name \\(\"armv8-a-typo\"\\) in 'target\\(\"arch=\"\\)' pragma or attribute"  "" { target *-*-* } .-2 } */
   /* { dg-error "pragma or attribute 'target\\(\"arch=armv8-a-typo\"\\)' is not valid"  "" { target *-*-* } .-3 } */
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/spellcheck_4.c b/gcc/testsuite/gcc.target/aarch64/spellcheck_4.c
index 6f66fdc98e28d32dec46d79747cb31a94e9d7529..37c9d3c4d61607803641a42d24a135d28bf375bb 100644
--- a/gcc/testsuite/gcc.target/aarch64/spellcheck_4.c
+++ b/gcc/testsuite/gcc.target/aarch64/spellcheck_4.c
@@ -8,4 +8,4 @@  foo ()
 }
 
 /* { dg-error "unknown value 'armv8-a-typo' for -march"  "" { target *-*-* } 0 } */
-/* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'armv8-a'?"  "" { target *-*-* } 0 } */
+/* { dg-message "valid arguments are: \[^\n\r]*(; did you mean 'armv*'?)?"  "" { target *-*-* } 0 } */