diff mbox

[Committed/AARCH64] Fix gcc.target/aarch64/test_frame_*.c testcases after ccmp patches

Message ID CA+=Sn1naNeipMc-4L3NpcJJuRu++F4xBBx2EDRn3Lqar0+rMEA@mail.gmail.com
State New
Headers show

Commit Message

Andrew Pinski Nov. 22, 2014, 11:41 p.m. UTC
Hi,
  After the conditional compare patches, the some of the
gcc.target/aarch64/test_frame_*.c testcases start to fail.  This was
due to no longer duplicating simple_return and causing the epilogue to
be duplicated.

This changes the testcases to expect the non duplicated epilogue.

Committed as obvious after a test of aarch64-elf.

Thanks,
Andrew Pinski

ChangeLog:
* gcc.target/aarch64/test_frame_1.c: Expect only two loads of x30 (in
the epilogue).
* gcc.target/aarch64/test_frame_6.c: Likewise.
* gcc.target/aarch64/test_frame_2.c: Expect only one pair load of x30
and x19 (in the epilogue).
* gcc.target/aarch64/test_frame_4.c: Likewise.
* gcc.target/aarch64/test_frame_7.c: Likewise.

Comments

Tejas Belagod Dec. 11, 2014, 6:06 p.m. UTC | #1
On 22/11/14 23:41, Andrew Pinski wrote:
> Hi,
>    After the conditional compare patches, the some of the
> gcc.target/aarch64/test_frame_*.c testcases start to fail.  This was
> due to no longer duplicating simple_return and causing the epilogue to
> be duplicated.
>
> This changes the testcases to expect the non duplicated epilogue.
>
> Committed as obvious after a test of aarch64-elf.
>
> Thanks,
> Andrew Pinski
>
> ChangeLog:
> * gcc.target/aarch64/test_frame_1.c: Expect only two loads of x30 (in
> the epilogue).
> * gcc.target/aarch64/test_frame_6.c: Likewise.
> * gcc.target/aarch64/test_frame_2.c: Expect only one pair load of x30
> and x19 (in the epilogue).
> * gcc.target/aarch64/test_frame_4.c: Likewise.
> * gcc.target/aarch64/test_frame_7.c: Likewise.
>

Hi Andrew,

I'm still seeing the original number of ldr x30 and ldp x19, x30 insns 
for these tests. What am I missing?

FAIL: gcc.target/aarch64/test_frame_1.c scan-assembler-times ldr\tx30, 
\\[sp\\], [0-9]+ 2
FAIL: gcc.target/aarch64/test_frame_2.c scan-assembler-times ldp\tx19, 
x30, \\[sp\\], [0-9]+ 1
FAIL: gcc.target/aarch64/test_frame_4.c scan-assembler-times ldp\tx19, 
x30, \\[sp\\], [0-9]+ 1
FAIL: gcc.target/aarch64/test_frame_6.c scan-assembler-times ldr\tx30, 
\\[sp\\], [0-9]+ 2
FAIL: gcc.target/aarch64/test_frame_7.c scan-assembler-times ldp\tx19, 
x30, \\[sp\\], [0-9]+ 1

Thanks,
Tejas,
Andrew Pinski Dec. 11, 2014, 6:12 p.m. UTC | #2
> On Dec 11, 2014, at 10:06 AM, Tejas Belagod <tejas.belagod@arm.com> wrote:
> 
>> On 22/11/14 23:41, Andrew Pinski wrote:
>> Hi,
>>   After the conditional compare patches, the some of the
>> gcc.target/aarch64/test_frame_*.c testcases start to fail.  This was
>> due to no longer duplicating simple_return and causing the epilogue to
>> be duplicated.
>> 
>> This changes the testcases to expect the non duplicated epilogue.
>> 
>> Committed as obvious after a test of aarch64-elf.
>> 
>> Thanks,
>> Andrew Pinski
>> 
>> ChangeLog:
>> * gcc.target/aarch64/test_frame_1.c: Expect only two loads of x30 (in
>> the epilogue).
>> * gcc.target/aarch64/test_frame_6.c: Likewise.
>> * gcc.target/aarch64/test_frame_2.c: Expect only one pair load of x30
>> and x19 (in the epilogue).
>> * gcc.target/aarch64/test_frame_4.c: Likewise.
>> * gcc.target/aarch64/test_frame_7.c: Likewise.
> 
> Hi Andrew,
> 
> I'm still seeing the original number of ldr x30 and ldp x19, x30 insns for these tests. What am I missing?

The ccmp patch had to be reverted. But this patch was forgotten when it was. Just revert the testcase patch. 


Thanks,
Andrew
> 
> FAIL: gcc.target/aarch64/test_frame_1.c scan-assembler-times ldr\tx30, \\[sp\\], [0-9]+ 2
> FAIL: gcc.target/aarch64/test_frame_2.c scan-assembler-times ldp\tx19, x30, \\[sp\\], [0-9]+ 1
> FAIL: gcc.target/aarch64/test_frame_4.c scan-assembler-times ldp\tx19, x30, \\[sp\\], [0-9]+ 1
> FAIL: gcc.target/aarch64/test_frame_6.c scan-assembler-times ldr\tx30, \\[sp\\], [0-9]+ 2
> FAIL: gcc.target/aarch64/test_frame_7.c scan-assembler-times ldp\tx19, x30, \\[sp\\], [0-9]+ 1
> 
> Thanks,
> Tejas,
> 
> 
> 
> 
> 
> 
>
diff mbox

Patch

Index: testsuite/gcc.target/aarch64/test_frame_1.c
===================================================================
--- testsuite/gcc.target/aarch64/test_frame_1.c	(revision 217974)
+++ testsuite/gcc.target/aarch64/test_frame_1.c	(working copy)
@@ -14,6 +14,6 @@  t_frame_pattern (test1, 200, )
 t_frame_run (test1)
 
 /* { dg-final { scan-assembler-times "str\tx30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */
-/* { dg-final { scan-assembler-times "ldr\tx30, \\\[sp\\\], \[0-9\]+" 3 } } */
+/* { dg-final { scan-assembler-times "ldr\tx30, \\\[sp\\\], \[0-9\]+" 2 } } */
 
 /* { dg-final { cleanup-saved-temps } } */
Index: testsuite/gcc.target/aarch64/test_frame_2.c
===================================================================
--- testsuite/gcc.target/aarch64/test_frame_2.c	(revision 217974)
+++ testsuite/gcc.target/aarch64/test_frame_2.c	(working copy)
@@ -15,6 +15,6 @@  t_frame_run (test2)
 
 
 /* { dg-final { scan-assembler-times "stp\tx19, x30, \\\[sp, -\[0-9\]+\\\]!" 1 } } */
-/* { dg-final { scan-assembler-times "ldp\tx19, x30, \\\[sp\\\], \[0-9\]+" 2 } } */
+/* { dg-final { scan-assembler-times "ldp\tx19, x30, \\\[sp\\\], \[0-9\]+" 1 } } */
 
 /* { dg-final { cleanup-saved-temps } } */
Index: testsuite/gcc.target/aarch64/test_frame_4.c
===================================================================
--- testsuite/gcc.target/aarch64/test_frame_4.c	(revision 217974)
+++ testsuite/gcc.target/aarch64/test_frame_4.c	(working copy)
@@ -14,6 +14,6 @@  t_frame_pattern (test4, 400, "x19")
 t_frame_run (test4)
 
 /* { dg-final { scan-assembler-times "stp\tx19, x30, \\\[sp, -\[0-9\]+\\\]!" 1 } } */
-/* { dg-final { scan-assembler-times "ldp\tx19, x30, \\\[sp\\\], \[0-9\]+" 2 } } */
+/* { dg-final { scan-assembler-times "ldp\tx19, x30, \\\[sp\\\], \[0-9\]+" 1 } } */
 
 /* { dg-final { cleanup-saved-temps } } */
Index: testsuite/gcc.target/aarch64/test_frame_6.c
===================================================================
--- testsuite/gcc.target/aarch64/test_frame_6.c	(revision 217974)
+++ testsuite/gcc.target/aarch64/test_frame_6.c	(working copy)
@@ -15,6 +15,6 @@  t_frame_pattern (test6, 700, )
 t_frame_run (test6)
 
 /* { dg-final { scan-assembler-times "str\tx30, \\\[sp, -\[0-9\]+\\\]!" 2 } } */
-/* { dg-final { scan-assembler-times "ldr\tx30, \\\[sp\\\], \[0-9\]+" 3 } } */
+/* { dg-final { scan-assembler-times "ldr\tx30, \\\[sp\\\], \[0-9\]+" 2 } } */
 
 /* { dg-final { cleanup-saved-temps } } */
Index: testsuite/gcc.target/aarch64/test_frame_7.c
===================================================================
--- testsuite/gcc.target/aarch64/test_frame_7.c	(revision 217974)
+++ testsuite/gcc.target/aarch64/test_frame_7.c	(working copy)
@@ -15,6 +15,6 @@  t_frame_pattern (test7, 700, "x19")
 t_frame_run (test7)
 
 /* { dg-final { scan-assembler-times "stp\tx19, x30, \\\[sp, -\[0-9\]+\\\]!" 1 } } */
-/* { dg-final { scan-assembler-times "ldp\tx19, x30, \\\[sp\\\], \[0-9\]+" 2 } } */
+/* { dg-final { scan-assembler-times "ldp\tx19, x30, \\\[sp\\\], \[0-9\]+" 1 } } */
 
 /* { dg-final { cleanup-saved-temps } } */