From bf5582c356eb795ab8dfbe1b1df6b9571ec1bd81 Mon Sep 17 00:00:00 2001 From: Mihail Ionescu Date: Fri, 21 Feb 2020 15:21:23 +0000 Subject: [PATCH] [PATCH, GCC/ARM] Fix MVE scalar shift tests *** gcc/ChangeLog *** 2020-02-21 Mihail-Calin Ionescu * config/arm/arm.md: Prevent scalar shifts from being used when big endian is enabled. *** gcc/testsuite/ChangeLog *** 2020-02-21 Mihail-Calin Ionescu * gcc.target/arm/armv8_1m-shift-imm-1.c: Add MVE target checks. * gcc.target/arm/armv8_1m-shift-reg-1.c: Likewise. * lib/target-supports.exp (check_effective_target_arm_v8_1m_mve_ok_nocache): New. (check_effective_target_arm_v8_1m_mve_ok): New. (add_options_for_v8_1m_mve): New. --- gcc/ChangeLog | 5 +++ gcc/config/arm/arm.md | 6 +-- gcc/testsuite/ChangeLog | 9 ++++ .../gcc.target/arm/armv8_1m-shift-imm-1.c | 4 +- .../gcc.target/arm/armv8_1m-shift-reg-1.c | 4 +- gcc/testsuite/lib/target-supports.exp | 42 +++++++++++++++++++ 6 files changed, 65 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 85630f3613f..3d4d799ed5d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2020-02-21 Mihail-Calin Ionescu + + * config/arm/arm.md: Prevent scalar shifts from being used when big + endian is enabled. + 2020-02-21 Jan Hubicka Richard Biener diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index ab277996462..951596217ad 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -4399,7 +4399,7 @@ (match_operand:SI 2 "reg_or_int_operand")))] "TARGET_32BIT" " - if (TARGET_HAVE_MVE) + if (TARGET_HAVE_MVE && !BYTES_BIG_ENDIAN) { if (!reg_or_int_operand (operands[2], SImode)) operands[2] = force_reg (SImode, operands[2]); @@ -4443,7 +4443,7 @@ "TARGET_32BIT" " /* Armv8.1-M Mainline double shifts are not expanded. */ - if (TARGET_HAVE_MVE + if (TARGET_HAVE_MVE && !BYTES_BIG_ENDIAN && arm_reg_or_long_shift_imm (operands[2], GET_MODE (operands[2]))) { if (!reg_overlap_mentioned_p(operands[0], operands[1])) @@ -4478,7 +4478,7 @@ "TARGET_32BIT" " /* Armv8.1-M Mainline double shifts are not expanded. */ - if (TARGET_HAVE_MVE + if (TARGET_HAVE_MVE && !BYTES_BIG_ENDIAN && long_shift_imm (operands[2], GET_MODE (operands[2]))) { if (!reg_overlap_mentioned_p(operands[0], operands[1])) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5f3d619c0b2..02fa22ef23c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2020-02-21 Mihail-Calin Ionescu + + * gcc.target/arm/armv8_1m-shift-imm-1.c: Add MVE target checks. + * gcc.target/arm/armv8_1m-shift-reg-1.c: Likewise. + * lib/target-supports.exp + (check_effective_target_arm_v8_1m_mve_ok_nocache): New. + (check_effective_target_arm_v8_1m_mve_ok): New. + (add_options_for_v8_1m_mve): New. + 2020-02-21 Uroš Bizjak * gcc.dg/vect/vect-epilogues.c (scan-tree-dump): Require diff --git a/gcc/testsuite/gcc.target/arm/armv8_1m-shift-imm-1.c b/gcc/testsuite/gcc.target/arm/armv8_1m-shift-imm-1.c index 5ffa3769e6b..883fbb092b1 100644 --- a/gcc/testsuite/gcc.target/arm/armv8_1m-shift-imm-1.c +++ b/gcc/testsuite/gcc.target/arm/armv8_1m-shift-imm-1.c @@ -1,5 +1,7 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -march=armv8.1-m.main+mve -mfloat-abi=softfp" } */ +/* { dg-options "-O2 -mfloat-abi=softfp -mlittle-endian" } */ +/* { dg-require-effective-target arm_v8_1m_mve_ok } */ +/* { dg-add-options arm_v8_1m_mve } */ long long longval1; long long unsigned longval2; diff --git a/gcc/testsuite/gcc.target/arm/armv8_1m-shift-reg-1.c b/gcc/testsuite/gcc.target/arm/armv8_1m-shift-reg-1.c index a97e9d687ef..e125ff83c22 100644 --- a/gcc/testsuite/gcc.target/arm/armv8_1m-shift-reg-1.c +++ b/gcc/testsuite/gcc.target/arm/armv8_1m-shift-reg-1.c @@ -1,5 +1,7 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -march=armv8.1-m.main+mve -mfloat-abi=softfp" } */ +/* { dg-options "-O2 -mfloat-abi=softfp -mlittle-endian" } */ +/* { dg-require-effective-target arm_v8_1m_mve_ok } */ +/* { dg-add-options arm_v8_1m_mve } */ long long longval2; int intval2; diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index ec462315860..9592c539c11 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -4828,6 +4828,48 @@ proc check_effective_target_arm_v8_2a_dotprod_neon_ok_nocache { } { return 0; } +# Return 1 if the target supports ARMv8.1-M MVE +# instructions, 0 otherwise. The test is valid for ARM. +# Record the command line options needed. + +proc check_effective_target_arm_v8_1m_mve_ok_nocache { } { + global et_arm_v8_1m_mve_flags + set et_arm_v8_1m_mve_flags "" + + if { ![istarget arm*-*-*] } { + return 0; + } + + # Iterate through sets of options to find the compiler flags that + # need to be added to the -march option. + foreach flags {"" "-mfloat-abi=softfp -mfpu=auto" "-mfloat-abi=hard -mfpu=auto"} { + if { [check_no_compiler_messages_nocache \ + arm_v8_1m_mve_ok object { + #if !defined (__ARM_FEATURE_MVE) + #error "__ARM_FEATURE_MVE not defined" + #endif + } "$flags -mthumb"] } { + set et_arm_v8_1m_mve_flags "$flags -mthumb" + return 1 + } + } + + return 0; +} + +proc check_effective_target_arm_v8_1m_mve_ok { } { + return [check_cached_effective_target arm_v8_1m_mve_ok \ + check_effective_target_arm_v8_1m_mve_ok_nocache] +} + +proc add_options_for_arm_v8_1m_mve { flags } { + if { ! [check_effective_target_arm_v8_1m_mve_ok] } { + return "$flags" + } + global et_arm_v8_1m_mve_flags + return "$flags $et_arm_v8_1m_mve_flags" +} + proc check_effective_target_arm_v8_2a_dotprod_neon_ok { } { return [check_cached_effective_target arm_v8_2a_dotprod_neon_ok \ check_effective_target_arm_v8_2a_dotprod_neon_ok_nocache] -- 2.30.2