diff mbox

[2/2,ARM] Fix testcases after introduction of Cortex-R8

Message ID 56D6DADF.9020103@arm.com
State New
Headers show

Commit Message

Andre Vieira (lists) March 2, 2016, 12:21 p.m. UTC
Hi,

Tests used to check for "r8" which will not work because cortex-r8
string is now included in the assembly. Fixed by checking for "[^\-]r8".

Is this Ok?

Cheers,
Andre

gcc/testsuite/ChangeLog:

2016-03-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>

     * gcc.target/arm/pr45701-1.c: Change assembler scan to not
     trigger for cortex-r8, when scanning for register r8.
     * gcc.target/arm/pr45701-2.c: Likewise.

Comments

Kyrill Tkachov March 3, 2016, 11:28 a.m. UTC | #1
Hi Andre,

On 02/03/16 12:21, Andre Vieira (lists) wrote:
> Hi,
>
> Tests used to check for "r8" which will not work because cortex-r8
> string is now included in the assembly. Fixed by checking for "[^\-]r8".
>
> Is this Ok?
>
> Cheers,
> Andre
>
> gcc/testsuite/ChangeLog:
>
> 2016-03-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
>
>       * gcc.target/arm/pr45701-1.c: Change assembler scan to not
>       trigger for cortex-r8, when scanning for register r8.
>       * gcc.target/arm/pr45701-2.c: Likewise.

Ok.
Thanks,
Kyrill
Andre Vieira (lists) March 8, 2016, 11:05 a.m. UTC | #2
On 03/03/16 11:28, Kyrill Tkachov wrote:
> Hi Andre,
> 
> On 02/03/16 12:21, Andre Vieira (lists) wrote:
>> Hi,
>>
>> Tests used to check for "r8" which will not work because cortex-r8
>> string is now included in the assembly. Fixed by checking for "[^\-]r8".
>>
>> Is this Ok?
>>
>> Cheers,
>> Andre
>>
>> gcc/testsuite/ChangeLog:
>>
>> 2016-03-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
>>
>>       * gcc.target/arm/pr45701-1.c: Change assembler scan to not
>>       trigger for cortex-r8, when scanning for register r8.
>>       * gcc.target/arm/pr45701-2.c: Likewise.
> 
> Ok.
> Thanks,
> Kyrill
> 
Thomas commited on my behalf at revision r234040.

Had to rebase arm-tune.md and invoke.texi, these were all obvious changes.

Cheers,
Andre
Kyrill Tkachov March 8, 2016, 2:56 p.m. UTC | #3
Hi Andre,

On 08/03/16 11:05, Andre Vieira (lists) wrote:
> On 03/03/16 11:28, Kyrill Tkachov wrote:
>> Hi Andre,
>>
>> On 02/03/16 12:21, Andre Vieira (lists) wrote:
>>> Hi,
>>>
>>> Tests used to check for "r8" which will not work because cortex-r8
>>> string is now included in the assembly. Fixed by checking for "[^\-]r8".
>>>
>>> Is this Ok?
>>>
>>> Cheers,
>>> Andre
>>>
>>> gcc/testsuite/ChangeLog:
>>>
>>> 2016-03-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
>>>
>>>        * gcc.target/arm/pr45701-1.c: Change assembler scan to not
>>>        trigger for cortex-r8, when scanning for register r8.
>>>        * gcc.target/arm/pr45701-2.c: Likewise.
>> Ok.
>> Thanks,
>> Kyrill
>>
> Thomas commited on my behalf at revision r234040.
>
> Had to rebase arm-tune.md and invoke.texi, these were all obvious changes.

I'm seeing a DejaGNU error while testing RUNTESTFLAGS="arm.exp=pr45701-*.c":
ERROR: (DejaGnu) proc "^-" does not exist.
The error code is NONE
The info on the error is:
invalid command name "^-"
     while executing
"::tcl_unknown ^-"
     ("uplevel" body line 1)
     invoked from within
"uplevel 1 ::tcl_unknown $args"

That's due to the scan-assembler-not test:
/* { dg-final { scan-assembler-not "[^\-]r8" } } */

The '[' and ']' need to be escaped by a backslash.
Can you please post a patch to add the escapes.
Sorry for missing this in the original review...

Kyrill

> Cheers,
> Andre
>
Andre Vieira (lists) March 10, 2016, 1:32 p.m. UTC | #4
On 02/03/16 12:21, Andre Vieira (lists) wrote:
> Hi,
> 
> Tests used to check for "r8" which will not work because cortex-r8
> string is now included in the assembly. Fixed by checking for "[^\-]r8".
> 
> Is this Ok?
> 
> Cheers,
> Andre
> 
> gcc/testsuite/ChangeLog:
> 
> 2016-03-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
> 
>      * gcc.target/arm/pr45701-1.c: Change assembler scan to not
>      trigger for cortex-r8, when scanning for register r8.
>      * gcc.target/arm/pr45701-2.c: Likewise.
> 
Hi,

We decided to apply the following patch to the ARM embedded 5 branch.

Best regards,
Andre
diff mbox

Patch

From 57f8d328b7e20db4e3776eb5c4d8094d170836ba Mon Sep 17 00:00:00 2001
From: Andre Simoes Dias Vieira <andsim01@arm.com>
Date: Tue, 16 Feb 2016 12:01:48 +0000
Subject: [PATCH 2/5] Fix testcases for Cortex-R8

---
 gcc/testsuite/gcc.target/arm/pr45701-1.c | 2 +-
 gcc/testsuite/gcc.target/arm/pr45701-2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/gcc.target/arm/pr45701-1.c b/gcc/testsuite/gcc.target/arm/pr45701-1.c
index 454a087eedbabad95cd7144eb1bb49b591730e54..a5db56fc6f2f3cb334b514a72ff500308c361832 100644
--- a/gcc/testsuite/gcc.target/arm/pr45701-1.c
+++ b/gcc/testsuite/gcc.target/arm/pr45701-1.c
@@ -2,7 +2,7 @@ 
 /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */
 /* { dg-options "-mthumb -Os" }  */
 /* { dg-final { scan-assembler "push\t\{r3" } } */
-/* { dg-final { scan-assembler-not "r8" } } */
+/* { dg-final { scan-assembler-not "[^\-]r8" } } */
 
 extern int hist_verify;
 extern int a1;
diff --git a/gcc/testsuite/gcc.target/arm/pr45701-2.c b/gcc/testsuite/gcc.target/arm/pr45701-2.c
index afe0840d44b197ca6b1b6b316d9d21a97598837f..765981b90db38f534e13e9e8a8f538c8408f798a 100644
--- a/gcc/testsuite/gcc.target/arm/pr45701-2.c
+++ b/gcc/testsuite/gcc.target/arm/pr45701-2.c
@@ -2,7 +2,7 @@ 
 /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */
 /* { dg-options "-mthumb -Os" }  */
 /* { dg-final { scan-assembler "push\t\{r3" } } */
-/* { dg-final { scan-assembler-not "r8" } } */
+/* { dg-final { scan-assembler-not "[^\-]r8" } } */
 
 extern int hist_verify;
 extern int a1;
-- 
1.9.1