Re: [PATCH, GCC/testsuite/ARM, ping] Skip optional_mthumb tests if GCC has a default mode

["Richard Earnshaw (lists)" <Richard dot Earnshaw at arm dot com>]

On 13/01/17 18:17, Thomas Preudhomme wrote:
> Ping ARM maintainers? (target independent part ACKed by Jeff)
> 
> Best regards,
> 
> Thomas
> 
> On 03/01/17 17:19, Thomas Preudhomme wrote:
>> Ping?
>>
>> Best regards,
>>
>> Thomas
>>
>> On 12/12/16 17:52, Thomas Preudhomme wrote:
>>> Hi,
>>>
>>> The logic to make -mthumb optional for Thumb-only devices is only
>>> executed when
>>> no -marm or -mthumb is given on the command-line. This includes
>>> configuring GCC
>>> with --with-mode= because this makes the option to be passed before
>>> any others.
>>> The optional_mthumb-* testcases are skipped when -marm or -mthumb is
>>> passed on
>>> the command line but not when GCC was configured with --with-mode.
>>> Not only are
>>> the tests meaningless in these configurations, they also spuriously
>>> FAIL if
>>> --with-mode=arm was used since the test are built for Thumb-only
>>> devices, as
>>> reported by Christophe Lyon in [1].
>>>
>>> [1] https://gcc.gnu.org/ml/gcc-patches/2016-11/msg02082.html
>>>
>>> This patch adds logic to target-support.exp to check how was GCC
>>> configured and
>>> changes the optional_mthumb testcases to be skipped if there is a
>>> default mode
>>> (--with-mode=). It also fixes a couple of typo on the selectors.
>>>
>>> ChangeLog entry is as follows:
>>>
>>>
>>> *** gcc/testsuite/ChangeLog ***
>>>
>>> 2016-12-09  Thomas Preud'homme  <thomas.preudhomme@arm.com>
>>>
>>>         * lib/target-supports.exp (check_configured_with): New
>>> procedure.
>>>         (check_effective_target_default_mode): new effective target.
>>>         * gcc.target/arm/optional_thumb-1.c: Skip if GCC was
>>> configured with a
>>>         default mode.  Fix dg-skip-if target selector syntax.
>>>         * gcc.target/arm/optional_thumb-2.c: Likewise.
>>>         * gcc.target/arm/optional_thumb-3.c: Fix dg-skip-if target
>>> selector
>>>         syntax.
>>>
>>>

OK.

R.

>>> Is this ok for stage3?
>>>
>>> Best regards,
>>>
>>> Thomas
> 
> skip_optional_mthumb_test_default_mode.patch
> 
> 
> diff --git a/gcc/testsuite/gcc.target/arm/optional_thumb-1.c b/gcc/testsuite/gcc.target/arm/optional_thumb-1.c
> index 23df62887ba4aaa1d8717a34ecda9a40246f0552..99cb0c3f33b601fff4493feef72765f7590e18f6 100644
> --- a/gcc/testsuite/gcc.target/arm/optional_thumb-1.c
> +++ b/gcc/testsuite/gcc.target/arm/optional_thumb-1.c
> @@ -1,5 +1,5 @@
> -/* { dg-do compile } */
> -/* { dg-skip-if "-marm/-mthumb/-march/-mcpu given" { *-*-*} { "-marm" "-mthumb" "-march=*" "-mcpu=*" } } */
> +/* { dg-do compile { target { ! default_mode } } } */
> +/* { dg-skip-if "-marm/-mthumb/-march/-mcpu given" { *-*-* } { "-marm" "-mthumb" "-march=*" "-mcpu=*" } } */
>  /* { dg-options "-march=armv6-m" } */
>  
>  /* Check that -mthumb is not needed when compiling for a Thumb-only target.  */
> diff --git a/gcc/testsuite/gcc.target/arm/optional_thumb-2.c b/gcc/testsuite/gcc.target/arm/optional_thumb-2.c
> index 4bd53a45eca97e62dd3b86d5a1a66c5ca21e7aad..280dfb3fec55570b6cfe934303c9bd3d50322b86 100644
> --- a/gcc/testsuite/gcc.target/arm/optional_thumb-2.c
> +++ b/gcc/testsuite/gcc.target/arm/optional_thumb-2.c
> @@ -1,5 +1,5 @@
> -/* { dg-do compile } */
> -/* { dg-skip-if "-marm/-mthumb/-march/-mcpu given" { *-*-*} { "-marm" "-mthumb" "-march=*" "-mcpu=*" } } */
> +/* { dg-do compile { target { ! default_mode } } } */
> +/* { dg-skip-if "-marm/-mthumb/-march/-mcpu given" { *-*-* } { "-marm" "-mthumb" "-march=*" "-mcpu=*" } } */
>  /* { dg-options "-mcpu=cortex-m4" } */
>  
>  /* Check that -mthumb is not needed when compiling for a Thumb-only target.  */
> diff --git a/gcc/testsuite/gcc.target/arm/optional_thumb-3.c b/gcc/testsuite/gcc.target/arm/optional_thumb-3.c
> index f1fd5c8840b191e600c20a7817c611bb9bb645df..d9150e09e475dfbeb7b0b0c153c913b1ad6f0777 100644
> --- a/gcc/testsuite/gcc.target/arm/optional_thumb-3.c
> +++ b/gcc/testsuite/gcc.target/arm/optional_thumb-3.c
> @@ -1,8 +1,8 @@
>  /* { dg-do compile } */
>  /* { dg-require-effective-target arm_cortex_m } */
> -/* { dg-skip-if "-mthumb given" { *-*-*} { "-mthumb" } } */
> +/* { dg-skip-if "-mthumb given" { *-*-* } { "-mthumb" } } */
>  /* { dg-options "-marm" } */
> -/* { dg-error "target CPU does not support ARM mode" "missing error with -marm on Thumb-only targets" { target *-*-*} 0 } */
> +/* { dg-error "target CPU does not support ARM mode" "missing error with -marm on Thumb-only targets" { target *-*-* } 0 } */
>  
>  /* Check that -marm gives an error when compiling for a Thumb-only target.  */
>  
> diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
> index 0fc0bafa67d8d34ec74ce2d1d7a2323a375615cc..f7511ef3aebca72c798496fb95ce43fcbbc08ed1 100644
> --- a/gcc/testsuite/lib/target-supports.exp
> +++ b/gcc/testsuite/lib/target-supports.exp
> @@ -252,6 +252,20 @@ proc check_runtime {prop args} {
>      }]
>  }
>  
> +# Return 1 if GCC was configured with $pattern.
> +proc check_configured_with { pattern } {
> +    global tool
> +
> +    set gcc_output [${tool}_target_compile "-v" "" "none" ""]
> +    if { [ regexp "Configured with: \[^\n\]*$pattern" $gcc_output ] } {
> +        verbose "Matched: $pattern" 2
> +        return 1
> +    }
> +
> +    verbose "Failed to match: $pattern" 2
> +    return 0
> +}
> +
>  ###############################
>  # proc check_weak_available { }
>  ###############################
> @@ -3797,6 +3811,12 @@ proc add_options_for_arm_arch_v7ve { flags } {
>      return "$flags -march=armv7ve"
>  }
>  
> +# Return 1 if GCC was configured with --with-mode=
> +proc check_effective_target_default_mode { } {
> +
> +    return [check_configured_with "with-mode="]
> +}
> +
>  # Return 1 if this is an ARM target where -marm causes ARM to be
>  # used (not Thumb)
>  
>