git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AArch64] Add spellchecking hints for -march,-mcpu,-mtune and their attributes 

* config/aarch64/aarch64.c (aarch64_print_hint_for_core_or_arch):
	New function.
	(aarch64_print_hint_for_core): Likewise.
	(aarch64_print_hint_for_arch): Likewise.
	(aarch64_validate_march): Use it.  Fix indentation in type signature.
	(aarch64_validate_mcpu): Use aarch64_print_hint_for_core_or_arch.
	(aarch64_validate_mtune): Likewise.
	(aarch64_handle_attr_arch): Likewise.
	(aarch64_handle_attr_cpu): Likewise.
	(aarch64_handle_attr_tune): Likewise.

	* gcc.target/aarch64/spellcheck_1.c: New test.
	* gcc.target/aarch64/spellcheck_2.c: Likewise.
	* gcc.target/aarch64/spellcheck_3.c: Likewise.
	* gcc.target/aarch64/spellcheck_4.c: Likewise.
	* gcc.target/aarch64/spellcheck_5.c: Likewise.
	* gcc.target/aarch64/spellcheck_6.c: Likewise.

From-SVN: r241149
This commit is contained in:
Kyrylo Tkachov 2016-10-14 08:40:04 +00:00 committed by Kyrylo Tkachov
parent 4827fd102c
commit 01f440383c
9 changed files with 127 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/ChangeLog
View File

@ -1,3 +1,16 @@
2016-10-14 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* config/aarch64/aarch64.c (aarch64_print_hint_for_core_or_arch):
New function.
(aarch64_print_hint_for_core): Likewise.
(aarch64_print_hint_for_arch): Likewise.
(aarch64_validate_march): Use it. Fix indentation in type signature.
(aarch64_validate_mcpu): Use aarch64_print_hint_for_core_or_arch.
(aarch64_validate_mtune): Likewise.
(aarch64_handle_attr_arch): Likewise.
(aarch64_handle_attr_cpu): Likewise.
(aarch64_handle_attr_tune): Likewise.
2016-10-14 Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
* optabs.def: Remove optab function gen_int_libfunc for sdivmod_optab

46
gcc/config/aarch64/aarch64.c
View File

@ -8272,6 +8272,44 @@ aarch64_override_options_internal (struct gcc_options *opts)
aarch64_override_options_after_change_1 (opts);
}
/* Print a hint with a suggestion for a core or architecture name that
most closely resembles what the user passed in STR. ARCH is true if
the user is asking for an architecture name. ARCH is false if the user
is asking for a core name. */
static void
aarch64_print_hint_for_core_or_arch (const char *str, bool arch)
{
auto_vec<const char *> candidates;
const struct processor *entry = arch ? all_architectures : all_cores;
for (; entry->name != NULL; entry++)
candidates.safe_push (entry->name);
char *s;
const char *hint = candidates_list_and_hint (str, s, candidates);
if (hint)
inform (input_location, "valid arguments are: %s;"
" did you mean %qs?", s, hint);
XDELETEVEC (s);
}
/* Print a hint with a suggestion for a core name that most closely resembles
what the user passed in STR. */
inline static void
aarch64_print_hint_for_core (const char *str)
{
aarch64_print_hint_for_core_or_arch (str, false);
}
/* Print a hint with a suggestion for an architecture name that most closely
resembles what the user passed in STR. */
inline static void
aarch64_print_hint_for_arch (const char *str)
{
aarch64_print_hint_for_core_or_arch (str, true);
}
/* Validate a command-line -mcpu option. Parse the cpu and extensions (if any)
specified in STR and throw errors if appropriate. Put the results if
they are valid in RES and ISA_FLAGS. Return whether the option is
@ -8294,6 +8332,7 @@ aarch64_validate_mcpu (const char *str, const struct processor **res,
break;
case AARCH64_PARSE_INVALID_ARG:
error ("unknown value %qs for -mcpu", str);
aarch64_print_hint_for_core (str);
break;
case AARCH64_PARSE_INVALID_FEATURE:
error ("invalid feature modifier in -mcpu=%qs", str);
@ -8312,7 +8351,7 @@ aarch64_validate_mcpu (const char *str, const struct processor **res,
static bool
aarch64_validate_march (const char *str, const struct processor **res,
unsigned long *isa_flags)
unsigned long *isa_flags)
{
enum aarch64_parse_opt_result parse_res
= aarch64_parse_arch (str, res, isa_flags);
@ -8327,6 +8366,7 @@ aarch64_validate_march (const char *str, const struct processor **res,
break;
case AARCH64_PARSE_INVALID_ARG:
error ("unknown value %qs for -march", str);
aarch64_print_hint_for_arch (str);
break;
case AARCH64_PARSE_INVALID_FEATURE:
error ("invalid feature modifier in -march=%qs", str);
@ -8359,6 +8399,7 @@ aarch64_validate_mtune (const char *str, const struct processor **res)
break;
case AARCH64_PARSE_INVALID_ARG:
error ("unknown value %qs for -mtune", str);
aarch64_print_hint_for_core (str);
break;
default:
gcc_unreachable ();
@ -8730,6 +8771,7 @@ aarch64_handle_attr_arch (const char *str, const char *pragma_or_attr)
break;
case AARCH64_PARSE_INVALID_ARG:
error ("unknown value %qs for 'arch' target %s", str, pragma_or_attr);
aarch64_print_hint_for_arch (str);
break;
case AARCH64_PARSE_INVALID_FEATURE:
error ("invalid feature modifier %qs for 'arch' target %s",
@ -8770,6 +8812,7 @@ aarch64_handle_attr_cpu (const char *str, const char *pragma_or_attr)
break;
case AARCH64_PARSE_INVALID_ARG:
error ("unknown value %qs for 'cpu' target %s", str, pragma_or_attr);
aarch64_print_hint_for_core (str);
break;
case AARCH64_PARSE_INVALID_FEATURE:
error ("invalid feature modifier %qs for 'cpu' target %s",
@ -8804,6 +8847,7 @@ aarch64_handle_attr_tune (const char *str, const char *pragma_or_attr)
{
case AARCH64_PARSE_INVALID_ARG:
error ("unknown value %qs for 'tune' target %s", str, pragma_or_attr);
aarch64_print_hint_for_core (str);
break;
default:
gcc_unreachable ();

9
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2016-10-14 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* gcc.target/aarch64/spellcheck_1.c: New test.
* gcc.target/aarch64/spellcheck_2.c: Likewise.
* gcc.target/aarch64/spellcheck_3.c: Likewise.
* gcc.target/aarch64/spellcheck_4.c: Likewise.
* gcc.target/aarch64/spellcheck_5.c: Likewise.
* gcc.target/aarch64/spellcheck_6.c: Likewise.
2016-10-13 Andreas Schwab <schwab@linux-m68k.org>
* gcc.target/m68k/stack-limit-1.c: Expect warning on line 0.

9
gcc/testsuite/gcc.target/aarch64/spellcheck_1.c Normal file
View File

@ -0,0 +1,9 @@
/* { dg-do compile } */
__attribute__((target ("arch=armv8-a-typo"))) void
foo ()
{
}
/* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'armv8-a'?" "" { target *-*-* } 5 } */
/* { dg-error "unknown value 'armv8-a-typo' for 'arch' target attribute" "" { target *-*-* } 5 } */
/* { dg-error "target attribute 'arch=armv8-a-typo' is invalid" "" { target *-*-* } 5 } */

9
gcc/testsuite/gcc.target/aarch64/spellcheck_2.c Normal file
View File

@ -0,0 +1,9 @@
/* { dg-do compile } */
__attribute__((target ("cpu=cortex-a57-typo"))) void
foo ()
{
}
/* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a57?" "" { target *-*-* } 5 } */
/* { dg-error "unknown value 'cortex-a57-typo' for 'cpu' target attribute" "" { target *-*-* } 5 } */
/* { dg-error "target attribute 'cpu=cortex-a57-typo' is invalid" "" { target *-*-* } 5 } */

9
gcc/testsuite/gcc.target/aarch64/spellcheck_3.c Normal file
View File

@ -0,0 +1,9 @@
/* { dg-do compile } */
__attribute__((target ("tune=cortex-a57-typo"))) void
foo ()
{
}
/* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a57?" "" { target *-*-* } 5 } */
/* { dg-error "unknown value 'cortex-a57-typo' for 'tune' target attribute" "" { target *-*-* } 5 } */
/* { dg-error "target attribute 'tune=cortex-a57-typo' is invalid" "" { target *-*-* } 5 } */

11
gcc/testsuite/gcc.target/aarch64/spellcheck_4.c Normal file
View File

@ -0,0 +1,11 @@
/* { dg-do compile } */
/* { dg-skip-if "" { *-*-* } { "-march=*" } { "" } } */
/* { dg-options "-march=armv8-a-typo" } */
void
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 } */

11
gcc/testsuite/gcc.target/aarch64/spellcheck_5.c Normal file
View File

@ -0,0 +1,11 @@
/* { dg-do compile } */
/* { dg-skip-if "" { *-*-* } { "-mcpu=*" } { "" } } */
/* { dg-options "-mcpu=cortex-a17" } */
void
foo ()
{
}
/* { dg-error "unknown value 'cortex-a17' for -mcpu" "" { target *-*-* } 0 } */
/* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a57'?" "" { target *-*-* } 0 } */

11
gcc/testsuite/gcc.target/aarch64/spellcheck_6.c Normal file
View File

@ -0,0 +1,11 @@
/* { dg-do compile } */
/* { dg-skip-if "" { *-*-* } { "-mtune=*" } { "" } } */
/* { dg-options "-mtune=cortex-a72-typo" } */
void
foo ()
{
}
/* { dg-error "unknown value 'cortex-a72-typo' for -mtune" "" { target *-*-* } 0 } */
/* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a72'?" "" { target *-*-* } 0 } */