From 6960bf558f2e6076c901cd57f2c24b5462d8d311 Mon Sep 17 00:00:00 2001 From: Alan Lawrence Date: Tue, 15 Sep 2015 12:11:27 +0000 Subject: [PATCH] [AArch64 array_mode 2/8] Remove VSTRUCT_DREG, use BLKmode for d-reg aarch64_st/ld expands * config/aarch64/aarch64-simd.md (aarch64_ld2_dreg VD & DX, aarch64_st2_dreg VD & DX ): Change all TImode operands to BLKmode. (aarch64_ld3_dreg VD & DX, aarch64_st3_dreg VD & DX): Change all EImode operands to BLKmode. (aarch64_ld4_dreg VD & DX, aarch64_st4_dreg VD & DX): Change all OImode operands to BLKmode. (aarch64_ld): Generate MEM rtx with BLKmode and call set_mem_size. (aarch64_st): Likewise * config/aarch64/iterators.md (VSTRUCT_DREG): Remove. From-SVN: r227782 --- gcc/ChangeLog | 16 ++++++++ gcc/config/aarch64/aarch64-simd.md | 62 ++++++++++++++++-------------- gcc/config/aarch64/iterators.md | 2 - 3 files changed, 50 insertions(+), 30 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95e2d320947..affc5bac428 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,19 @@ +2015-09-15 Alan Lawrence + + * config/aarch64/aarch64-simd.md + (aarch64_ld2_dreg VD & DX, aarch64_st2_dreg VD & DX ): + Change all TImode operands to BLKmode. + (aarch64_ld3_dreg VD & DX, aarch64_st3_dreg VD & DX): + Change all EImode operands to BLKmode. + (aarch64_ld4_dreg VD & DX, aarch64_st4_dreg VD & DX): + Change all OImode operands to BLKmode. + + (aarch64_ld): Generate MEM rtx with BLKmode + and call set_mem_size. + (aarch64_st): Likewise. + + * config/aarch64/iterators.md (VSTRUCT_DREG): Remove. + 2015-09-15 Alan Lawrence * config/aarch64/aarch64-simd.md (vec_store_lanesoi_lane): Rename diff --git a/gcc/config/aarch64/aarch64-simd.md b/gcc/config/aarch64/aarch64-simd.md index 67cb4c9bffd..20b9be9fd15 100644 --- a/gcc/config/aarch64/aarch64-simd.md +++ b/gcc/config/aarch64/aarch64-simd.md @@ -4425,8 +4425,9 @@ (subreg:OI (vec_concat: (vec_concat: - (unspec:VD [(match_operand:TI 1 "aarch64_simd_struct_operand" "Utv")] - UNSPEC_LD2) + (unspec:VD + [(match_operand:BLK 1 "aarch64_simd_struct_operand" "Utv")] + UNSPEC_LD2) (vec_duplicate:VD (const_int 0))) (vec_concat: (unspec:VD [(match_dup 1)] @@ -4442,8 +4443,9 @@ (subreg:OI (vec_concat: (vec_concat: - (unspec:DX [(match_operand:TI 1 "aarch64_simd_struct_operand" "Utv")] - UNSPEC_LD2) + (unspec:DX + [(match_operand:BLK 1 "aarch64_simd_struct_operand" "Utv")] + UNSPEC_LD2) (const_int 0)) (vec_concat: (unspec:DX [(match_dup 1)] @@ -4460,8 +4462,9 @@ (vec_concat: (vec_concat: (vec_concat: - (unspec:VD [(match_operand:EI 1 "aarch64_simd_struct_operand" "Utv")] - UNSPEC_LD3) + (unspec:VD + [(match_operand:BLK 1 "aarch64_simd_struct_operand" "Utv")] + UNSPEC_LD3) (vec_duplicate:VD (const_int 0))) (vec_concat: (unspec:VD [(match_dup 1)] @@ -4482,8 +4485,9 @@ (vec_concat: (vec_concat: (vec_concat: - (unspec:DX [(match_operand:EI 1 "aarch64_simd_struct_operand" "Utv")] - UNSPEC_LD3) + (unspec:DX + [(match_operand:BLK 1 "aarch64_simd_struct_operand" "Utv")] + UNSPEC_LD3) (const_int 0)) (vec_concat: (unspec:DX [(match_dup 1)] @@ -4504,8 +4508,9 @@ (vec_concat: (vec_concat: (vec_concat: - (unspec:VD [(match_operand:OI 1 "aarch64_simd_struct_operand" "Utv")] - UNSPEC_LD4) + (unspec:VD + [(match_operand:BLK 1 "aarch64_simd_struct_operand" "Utv")] + UNSPEC_LD4) (vec_duplicate:VD (const_int 0))) (vec_concat: (unspec:VD [(match_dup 1)] @@ -4531,8 +4536,9 @@ (vec_concat: (vec_concat: (vec_concat: - (unspec:DX [(match_operand:OI 1 "aarch64_simd_struct_operand" "Utv")] - UNSPEC_LD4) + (unspec:DX + [(match_operand:BLK 1 "aarch64_simd_struct_operand" "Utv")] + UNSPEC_LD4) (const_int 0)) (vec_concat: (unspec:DX [(match_dup 1)] @@ -4558,8 +4564,8 @@ (unspec:VDC [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] "TARGET_SIMD" { - machine_mode mode = mode; - rtx mem = gen_rtx_MEM (mode, operands[1]); + rtx mem = gen_rtx_MEM (BLKmode, operands[1]); + set_mem_size (mem, * 8); emit_insn (gen_aarch64_ld_dreg (operands[0], mem)); DONE; @@ -4791,8 +4797,8 @@ ) (define_insn "aarch64_st2_dreg" - [(set (match_operand:TI 0 "aarch64_simd_struct_operand" "=Utv") - (unspec:TI [(match_operand:OI 1 "register_operand" "w") + [(set (match_operand:BLK 0 "aarch64_simd_struct_operand" "=Utv") + (unspec:BLK [(match_operand:OI 1 "register_operand" "w") (unspec:VD [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] UNSPEC_ST2))] "TARGET_SIMD" @@ -4801,8 +4807,8 @@ ) (define_insn "aarch64_st2_dreg" - [(set (match_operand:TI 0 "aarch64_simd_struct_operand" "=Utv") - (unspec:TI [(match_operand:OI 1 "register_operand" "w") + [(set (match_operand:BLK 0 "aarch64_simd_struct_operand" "=Utv") + (unspec:BLK [(match_operand:OI 1 "register_operand" "w") (unspec:DX [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] UNSPEC_ST2))] "TARGET_SIMD" @@ -4811,8 +4817,8 @@ ) (define_insn "aarch64_st3_dreg" - [(set (match_operand:EI 0 "aarch64_simd_struct_operand" "=Utv") - (unspec:EI [(match_operand:CI 1 "register_operand" "w") + [(set (match_operand:BLK 0 "aarch64_simd_struct_operand" "=Utv") + (unspec:BLK [(match_operand:CI 1 "register_operand" "w") (unspec:VD [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] UNSPEC_ST3))] "TARGET_SIMD" @@ -4821,8 +4827,8 @@ ) (define_insn "aarch64_st3_dreg" - [(set (match_operand:EI 0 "aarch64_simd_struct_operand" "=Utv") - (unspec:EI [(match_operand:CI 1 "register_operand" "w") + [(set (match_operand:BLK 0 "aarch64_simd_struct_operand" "=Utv") + (unspec:BLK [(match_operand:CI 1 "register_operand" "w") (unspec:DX [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] UNSPEC_ST3))] "TARGET_SIMD" @@ -4831,8 +4837,8 @@ ) (define_insn "aarch64_st4_dreg" - [(set (match_operand:OI 0 "aarch64_simd_struct_operand" "=Utv") - (unspec:OI [(match_operand:XI 1 "register_operand" "w") + [(set (match_operand:BLK 0 "aarch64_simd_struct_operand" "=Utv") + (unspec:BLK [(match_operand:XI 1 "register_operand" "w") (unspec:VD [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] UNSPEC_ST4))] "TARGET_SIMD" @@ -4841,8 +4847,8 @@ ) (define_insn "aarch64_st4_dreg" - [(set (match_operand:OI 0 "aarch64_simd_struct_operand" "=Utv") - (unspec:OI [(match_operand:XI 1 "register_operand" "w") + [(set (match_operand:BLK 0 "aarch64_simd_struct_operand" "=Utv") + (unspec:BLK [(match_operand:XI 1 "register_operand" "w") (unspec:DX [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] UNSPEC_ST4))] "TARGET_SIMD" @@ -4856,8 +4862,8 @@ (unspec:VDC [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] "TARGET_SIMD" { - machine_mode mode = mode; - rtx mem = gen_rtx_MEM (mode, operands[0]); + rtx mem = gen_rtx_MEM (BLKmode, operands[0]); + set_mem_size (mem, * 8); emit_insn (gen_aarch64_st_dreg (mem, operands[1])); DONE; diff --git a/gcc/config/aarch64/iterators.md b/gcc/config/aarch64/iterators.md index 42cb97902e2..e311b88c3f8 100644 --- a/gcc/config/aarch64/iterators.md +++ b/gcc/config/aarch64/iterators.md @@ -594,8 +594,6 @@ (V2SI "V16SI") (V2SF "V16SF") (DI "V8DI") (DF "V8DF")]) -(define_mode_attr VSTRUCT_DREG [(OI "TI") (CI "EI") (XI "OI")]) - ;; Mode of pair of elements for each vector mode, to define transfer ;; size for structure lane/dup loads and stores. (define_mode_attr V_TWO_ELEM [(V8QI "HI") (V16QI "HI") -- 2.30.2