diff mbox

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

Message ID 56E05616.7070605@arm.com
State New
Headers show

Commit Message

Andre Vieira (lists) March 9, 2016, 4:57 p.m. UTC
On 08/03/16 14:56, Kyrill Tkachov wrote:
> 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
>>
> 
Hi there,

Sorry for missing those too.

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

* gcc.target/arm/pr45701-1.c: Escape brackets.
* gcc.target/arm/pr45701-2.c: Likewise.

Comments

Mike Stump March 9, 2016, 5:03 p.m. UTC | #1
On Mar 9, 2016, at 8:57 AM, Andre Vieira (lists) <Andre.SimoesDiasVieira@arm.com> wrote:
>> I'm seeing a DejaGNU error while testing
>> RUNTESTFLAGS="arm.exp=pr45701-*.c":
>> ERROR: (DejaGnu) proc "^-" does not exist.

> 2016-03-09 Andre Vieira <andre.simoesdiasvieira@arm.com>
> 
> * gcc.target/arm/pr45701-1.c: Escape brackets.

Be sure to run test cases with dejagnu before check in.
Kyrill Tkachov March 10, 2016, 9:17 a.m. UTC | #2
On 09/03/16 16:57, Andre Vieira (lists) wrote:
> On 08/03/16 14:56, Kyrill Tkachov wrote:
>> 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
>>>
> Hi there,
>
> Sorry for missing those too.

Looks ok.
Thanks,
Kyrill

> 2016-03-09 Andre Vieira <andre.simoesdiasvieira@arm.com>
>
> * gcc.target/arm/pr45701-1.c: Escape brackets.
> * gcc.target/arm/pr45701-2.c: Likewise.
Andre Vieira (lists) March 10, 2016, 9:54 a.m. UTC | #3
On 09/03/16 17:03, Mike Stump wrote:
> On Mar 9, 2016, at 8:57 AM, Andre Vieira (lists) <Andre.SimoesDiasVieira@arm.com> wrote:
>>> I'm seeing a DejaGNU error while testing
>>> RUNTESTFLAGS="arm.exp=pr45701-*.c":
>>> ERROR: (DejaGnu) proc "^-" does not exist.
> 
>> 2016-03-09 Andre Vieira <andre.simoesdiasvieira@arm.com>
>>
>> * gcc.target/arm/pr45701-1.c: Escape brackets.
> 
> Be sure to run test cases with dejagnu before check in.
> 
Hi Mike,

I did run them but apparently tcl errors dont appear as a FAIL and I
failed to spot the tcl error message. Ill keep an eye out for those in
the future.

Cheers,
Andre
Andre Vieira (lists) March 10, 2016, 1:33 p.m. UTC | #4
On 09/03/16 16:57, Andre Vieira (lists) wrote:
> On 08/03/16 14:56, Kyrill Tkachov wrote:
>> 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
>>>
>>
> Hi there,
> 
> Sorry for missing those too.
> 
> 2016-03-09 Andre Vieira <andre.simoesdiasvieira@arm.com>
> 
> * gcc.target/arm/pr45701-1.c: Escape brackets.
> * 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

diff --git a/gcc/testsuite/gcc.target/arm/pr45701-1.c b/gcc/testsuite/gcc.target/arm/pr45701-1.c
index a5db56fc6f2f3cb334b514a72ff500308c361832..01db15abfd03eb916676e39b5db14a39596cbad6 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 765981b90db38f534e13e9e8a8f538c8408f798a..ce66d7509d1769fb96bb05e0d274be27e28a7188 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;