From 67d56b272021363eb58c319ca3b73beba3a60817 Mon Sep 17 00:00:00 2001 From: Alex Coplan Date: Thu, 8 Apr 2021 09:36:57 +0100 Subject: [PATCH] arm: Various MVE vec_duplicate fixes [PR99647] This patch fixes various issues with vec_duplicate in the MVE patterns. Currently there are two patterns named *mve_mov. The second of these is really a vector duplicate rather than a move, so I've renamed it accordingly. As it stands, there are several issues with this pattern: 1. The MVE_types iterator has an entry for TImode, but vec_duplicate:TI is invalid. 2. The mode of the operand to vec_duplicate is SImode, but it should vary according to the vector mode iterator. 3. The second alternative of this pattern is bogus: it allows matching symbol_refs (the cause of the PR) and const_ints (which means that it matches (vec_duplicate (const_int ...)) which is non-canonical: such rtxes should be const_vectors instead and handled by the main vector move pattern). This patch fixes all of these issues, and removes the redundant *mve_vec_duplicate pattern. gcc/ChangeLog: PR target/99647 * config/arm/iterators.md (MVE_vecs): New. (V_elem): Also handle V2DF. * config/arm/mve.md (*mve_mov): Rename to ... (*mve_vdup): ... this. Remove second alternative since vec_duplicate of const_int is not canonical RTL, and we don't want to match symbol_refs. (*mve_vec_duplicate): Delete (pattern is redundant). gcc/testsuite/ChangeLog: PR target/99647 * gcc.c-torture/compile/pr99647.c: New test. --- gcc/config/arm/iterators.md | 8 +++--- gcc/config/arm/mve.md | 25 ++++++------------- gcc/testsuite/gcc.c-torture/compile/pr99647.c | 5 ++++ 3 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr99647.c diff --git a/gcc/config/arm/iterators.md b/gcc/config/arm/iterators.md index 43aab2346c4d..8fb723e65cd7 100644 --- a/gcc/config/arm/iterators.md +++ b/gcc/config/arm/iterators.md @@ -261,6 +261,7 @@ ;; MVE mode iterator. (define_mode_iterator MVE_types [V16QI V8HI V4SI V2DI TI V8HF V4SF V2DF]) +(define_mode_iterator MVE_vecs [V16QI V8HI V4SI V2DI V8HF V4SF V2DF]) (define_mode_iterator MVE_VLD_ST [V16QI V8HI V4SI V8HF V4SF]) (define_mode_iterator MVE_0 [V8HF V4SF]) (define_mode_iterator MVE_1 [V16QI V8HI V4SI V2DI]) @@ -567,9 +568,10 @@ (V4HI "HI") (V8HI "HI") (V4HF "HF") (V8HF "HF") (V4BF "BF") (V8BF "BF") - (V2SI "SI") (V4SI "SI") - (V2SF "SF") (V4SF "SF") - (DI "DI") (V2DI "DI")]) + (V2SI "SI") (V4SI "SI") + (V2SF "SF") (V4SF "SF") + (DI "DI") (V2DI "DI") + (V2DF "DF")]) ;; As above but in lower case. (define_mode_attr V_elem_l [(V8QI "qi") (V16QI "qi") diff --git a/gcc/config/arm/mve.md b/gcc/config/arm/mve.md index 135186371e74..7467d5f4d573 100644 --- a/gcc/config/arm/mve.md +++ b/gcc/config/arm/mve.md @@ -104,18 +104,14 @@ (set_attr "thumb2_pool_range" "*,*,*,*,1018,*,*,*,*") (set_attr "neg_pool_range" "*,*,*,*,996,*,*,*,*")]) -(define_insn "*mve_mov" - [(set (match_operand:MVE_types 0 "s_register_operand" "=w,w") - (vec_duplicate:MVE_types - (match_operand:SI 1 "nonmemory_operand" "r,i")))] +(define_insn "*mve_vdup" + [(set (match_operand:MVE_vecs 0 "s_register_operand" "=w") + (vec_duplicate:MVE_vecs + (match_operand: 1 "s_register_operand" "r")))] "TARGET_HAVE_MVE || TARGET_HAVE_MVE_FLOAT" -{ - if (which_alternative == 0) - return "vdup.\t%q0, %1"; - return "vmov.\t%q0, %1"; -} - [(set_attr "length" "4,4") - (set_attr "type" "mve_move,mve_move")]) + "vdup.\t%q0, %1" + [(set_attr "length" "4") + (set_attr "type" "mve_move")]) ;; ;; [vst4q]) @@ -10737,13 +10733,6 @@ [(set_attr "type" "mve_move") (set_attr "length" "8")]) -(define_insn "*mve_vec_duplicate" - [(set (match_operand:MVE_VLD_ST 0 "s_register_operand" "=w") - (vec_duplicate:MVE_VLD_ST (match_operand: 1 "general_operand" "r")))] - "TARGET_HAVE_MVE || TARGET_HAVE_MVE_FLOAT" - "vdup.\t%q0, %1" - [(set_attr "type" "mve_move")]) - ;; CDE instructions on MVE registers. (define_insn "arm_vcx1qv16qi" diff --git a/gcc/testsuite/gcc.c-torture/compile/pr99647.c b/gcc/testsuite/gcc.c-torture/compile/pr99647.c new file mode 100644 index 000000000000..701155dd8565 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr99647.c @@ -0,0 +1,5 @@ +/* { dg-do assemble } */ +typedef int __attribute((vector_size(16))) V; +V f(void) { + return (V){ (int)f, (int)f, (int)f, (int)f }; +}