[AArch64,committed] Fix gcc.target/aarch64/vec_init_1.c for tiny and large mcmodels

Message ID 5B02EBA2.80204@foss.arm.com
State New
Headers show
  • [AArch64,committed] Fix gcc.target/aarch64/vec_init_1.c for tiny and large mcmodels
Related show

Commit Message

Kyrill Tkachov May 21, 2018, 3:54 p.m.
Hi all,

This recently-committed test fails the INS scan for tiny and large memory models.
That is because instead of the:
         adrp    x1, a
         adrp    x0, b
         movi    v0.4s, 0
         ldr     s2, [x1, #:lo12:a]
         ldr     s1, [x0, #:lo12:b]
         ins     v0.s[2], v2.s[0]
         ins     v0.s[3], v1.s[0]

That we generate for the default small model, we end up with a simple register
addressing mode with no addend/offset for the lane load:
         movi    v0.4s, 0
         adr     x1, a
         adr     x0, b
         ld1     {v0.s}[2], [x1]
         ld1     {v0.s}[3], [x0]


         movi    v0.4s, 0
         adrp    x0, .LC0
         ldr     x1, [x0, #:lo12:.LC0]
         adrp    x0, .LC1
         ldr     x0, [x0, #:lo12:.LC1]
         ld1     {v0.s}[2], [x1]
         ld1     {v0.s}[3], [x0]

So we end up merging the load and the lane insert.
This patch adjusts the testcase to scan for the right thing accordingly.
Checked that the testcase passes with -mcmodel=tiny, -mcmodel=small, -mcmodel=large.

Committing to trunk as obvious.


2018-05-21  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

     * gcc.target/aarch64/vec_init_1.c: Scan for LD1 instead of INS for
     tiny and large memory models.


commit fb56afe1f049ba92235c4c272bd39dc730ce5d1f
Author: kyrtka01 <kyrylo.tkachov@arm.com>
Date:   Mon May 21 15:39:05 2018 +0100

    [AArch64] Fix gcc.target/aarch64/vec_init_1.c for tiny and large mcmodels

diff --git a/gcc/testsuite/gcc.target/aarch64/vec_init_1.c b/gcc/testsuite/gcc.target/aarch64/vec_init_1.c
index e245dc1..c8b48da 100644
--- a/gcc/testsuite/gcc.target/aarch64/vec_init_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/vec_init_1.c
@@ -25,7 +25,11 @@  main (int argc, char **argv)
   return 0;
-/* { dg-final { scan-assembler-times "ins\\t" 2 } } */
+/* For memory models that don't have an addend on the lane value
+   load we can merge the load and lane insert into an LD1.
+   For others we expect LDR + INS sequences.  */
+/* { dg-final { scan-assembler-times "ld1\\t" 2 { target { aarch64_tiny || aarch64_large } } } } */
+/* { dg-final { scan-assembler-times "ins\\t" 2 { target aarch64_small } } } */
 /* What we want to check, is that make_vector does not stp the whole vector
    to the stack.  Unfortunately here we scan the body of main() too, which may
    be a bit fragile - the test is currently passing only because of the option