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.
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 } } */