The previous patches leave ld[234]_lane, st[234]_lane, and ld[234]r expanders
all nearly identical, so we can easily parameterize across the number of lanes
and combine them.
For the ld<VSTRUCT:nregs>_lane pattern, I switched from the VCONQ attribute to
just using the MODE attribute, this is identical for all the Q-register modes
over which we iterate.
bootstrapped and check-gcc on aarch64-none-linux-gnu
gcc/ChangeLog:
* config/aarch64/aarch64-simd.md (aarch64_ld2r<mode>,
aarch64_ld3r<mode>, aarch64_ld4r<mode>): Combine together, making...
(aarch64_simd_ld<VSTRUCT:nregs>r<VALLDIF:mode>): ...this.
(aarch64_ld2_lane<mode>, aarch64_ld3_lane<mode>,
aarch64_ld4_lane<mode>): Combine together, making...
(aarch64_ld<VSTRUCT:nregs>_lane<VALLDIF:mode>): ...this.
(aarch64_st2_lane<VALLDIF:mode>, aarch64_st3_lane<VQ:mode>,
aarch64_st4_lane<VQ:mode>): Combine together, making...
(aarch64_st<VSTRUCT:nregs>_lane<VALLDIF:mode>): ...this.
---
gcc/config/aarch64/aarch64-simd.md | 138 +++++++------------------------------
1 file changed, 23 insertions(+), 115 deletions(-)
diff --git a/gcc/config/aarch64/aarch64-simd.md
b/gcc/config/aarch64/aarch64-simd.md
index f239ee7..dbe5259 100644
--- a/gcc/config/aarch64/aarch64-simd.md
+++ b/gcc/config/aarch64/aarch64-simd.md
@@ -4381,42 +4381,18 @@
FAIL;
})
-(define_expand "aarch64_ld2r<mode>"
- [(match_operand:OI 0 "register_operand" "=w")
+(define_expand "aarch64_ld<VSTRUCT:nregs>r<VALLDIF:mode>"
+ [(match_operand:VSTRUCT 0 "register_operand" "=w")
(match_operand:DI 1 "register_operand" "w")
(unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
"TARGET_SIMD"
{
rtx mem = gen_rtx_MEM (BLKmode, operands[1]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 2);
+ set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<VALLDIF:MODE>mode))
+ * <VSTRUCT:nregs>);
- emit_insn (gen_aarch64_simd_ld2r<mode> (operands[0], mem));
- DONE;
-})
-
-(define_expand "aarch64_ld3r<mode>"
- [(match_operand:CI 0 "register_operand" "=w")
- (match_operand:DI 1 "register_operand" "w")
- (unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
- "TARGET_SIMD"
-{
- rtx mem = gen_rtx_MEM (BLKmode, operands[1]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 3);
-
- emit_insn (gen_aarch64_simd_ld3r<mode> (operands[0], mem));
- DONE;
-})
-
-(define_expand "aarch64_ld4r<mode>"
- [(match_operand:XI 0 "register_operand" "=w")
- (match_operand:DI 1 "register_operand" "w")
- (unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
- "TARGET_SIMD"
-{
- rtx mem = gen_rtx_MEM (BLKmode, operands[1]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 4);
-
- emit_insn (gen_aarch64_simd_ld4r<mode> (operands[0],mem));
+ emit_insn (gen_aarch64_simd_ld<VSTRUCT:nregs>r<VALLDIF:mode> (operands[0],
+ mem));
DONE;
})
@@ -4599,62 +4575,26 @@
DONE;
})
-(define_expand "aarch64_ld2_lane<mode>"
- [(match_operand:OI 0 "register_operand" "=w")
- (match_operand:DI 1 "register_operand" "w")
- (match_operand:OI 2 "register_operand" "0")
- (match_operand:SI 3 "immediate_operand" "i")
- (unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
- "TARGET_SIMD"
-{
- rtx mem = gen_rtx_MEM (BLKmode, operands[1]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 2);
-
- emit_insn (gen_aarch64_vec_load_lanesoi_lane<mode> (operands[0],
- mem,
- operands[2],
- operands[3]));
- DONE;
-})
-
-(define_expand "aarch64_ld3_lane<mode>"
- [(match_operand:CI 0 "register_operand" "=w")
+(define_expand "aarch64_ld<VSTRUCT:nregs>_lane<VALLDIF:mode>"
+ [(match_operand:VSTRUCT 0 "register_operand" "=w")
(match_operand:DI 1 "register_operand" "w")
- (match_operand:CI 2 "register_operand" "0")
+ (match_operand:VSTRUCT 2 "register_operand" "0")
(match_operand:SI 3 "immediate_operand" "i")
(unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
"TARGET_SIMD"
{
rtx mem = gen_rtx_MEM (BLKmode, operands[1]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 3);
-
- emit_insn (gen_aarch64_vec_load_lanesci_lane<mode> (operands[0],
- mem,
- operands[2],
- operands[3]));
+ set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<VALLDIF:MODE>mode))
+ * <VSTRUCT:nregs>);
+
+ aarch64_simd_lane_bounds (operands[3], 0,
+ GET_MODE_NUNITS (<VALLDIF:MODE>mode),
+ NULL);
+ emit_insn (gen_aarch64_vec_load_lanes<VSTRUCT:mode>_lane<VALLDIF:mode> (
+ operands[0], mem, operands[2], operands[3]));
DONE;
})
-(define_expand "aarch64_ld4_lane<mode>"
- [(match_operand:XI 0 "register_operand" "=w")
- (match_operand:DI 1 "register_operand" "w")
- (match_operand:XI 2 "register_operand" "0")
- (match_operand:SI 3 "immediate_operand" "i")
- (unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
- "TARGET_SIMD"
-{
- rtx mem = gen_rtx_MEM (BLKmode, operands[1]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 4);
-
- emit_insn (gen_aarch64_vec_load_lanesxi_lane<mode> (operands[0],
- mem,
- operands[2],
- operands[3]));
- DONE;
-})
-
-
-
;; Expanders for builtins to extract vector registers from large
;; opaque integer modes.
@@ -4882,51 +4822,19 @@
DONE;
})
-(define_expand "aarch64_st2_lane<mode>"
- [(match_operand:DI 0 "register_operand" "r")
- (match_operand:OI 1 "register_operand" "w")
- (unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)
- (match_operand:SI 2 "immediate_operand")]
- "TARGET_SIMD"
-{
- rtx mem = gen_rtx_MEM (BLKmode, operands[0]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 2);
-
- emit_insn (gen_aarch64_vec_store_lanesoi_lane<mode> (mem,
- operands[1],
- operands[2]));
- DONE;
-})
-
-(define_expand "aarch64_st3_lane<mode>"
- [(match_operand:DI 0 "register_operand" "r")
- (match_operand:CI 1 "register_operand" "w")
- (unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)
- (match_operand:SI 2 "immediate_operand")]
- "TARGET_SIMD"
-{
- rtx mem = gen_rtx_MEM (BLKmode, operands[0]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 3);
-
- emit_insn (gen_aarch64_vec_store_lanesci_lane<mode> (mem,
- operands[1],
- operands[2]));
- DONE;
-})
-
-(define_expand "aarch64_st4_lane<mode>"
+(define_expand "aarch64_st<VSTRUCT:nregs>_lane<VALLDIF:mode>"
[(match_operand:DI 0 "register_operand" "r")
- (match_operand:XI 1 "register_operand" "w")
+ (match_operand:VSTRUCT 1 "register_operand" "w")
(unspec:VALLDIF [(const_int 0)] UNSPEC_VSTRUCTDUMMY)
(match_operand:SI 2 "immediate_operand")]
"TARGET_SIMD"
{
rtx mem = gen_rtx_MEM (BLKmode, operands[0]);
- set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<MODE>mode)) * 4);
+ set_mem_size (mem, GET_MODE_SIZE (GET_MODE_INNER (<VALLDIF:MODE>mode))
+ * <VSTRUCT:nregs>);
- emit_insn (gen_aarch64_vec_store_lanesxi_lane<mode> (mem,
- operands[1],
- operands[2]));
+ emit_insn (gen_aarch64_vec_store_lanes<VSTRUCT:mode>_lane<VALLDIF:mode> (
+ mem, operands[1], operands[2]));
DONE;
})
--
1.9.1
