From: "Andre Vieira (lists)" <andre.simoesdiasvieira@arm.com>
To: gcc-patches@gcc.gnu.org
Subject: Re: [PATCH 9/9] arm: Auto-vectorization for MVE: vld4/vst4
Date: Tue, 4 May 2021 13:03:46 +0100 [thread overview]
Message-ID: <6c622137-dfaa-4a62-5a37-0a1f3f6ef5d5@arm.com> (raw)
In-Reply-To: <1619791790-628-9-git-send-email-christophe.lyon@linaro.org>
Hi Christophe,
The series LGTM but you'll need the approval of an arm port maintainer
before committing. I only did code-review, did not try to build/run tests.
Kind regards,
Andre
On 30/04/2021 15:09, Christophe Lyon via Gcc-patches wrote:
> This patch enables MVE vld4/vst4 instructions for auto-vectorization.
> We move the existing expanders from neon.md and enable them for MVE,
> calling the respective emitter.
>
> 2021-03-12 Christophe Lyon <christophe.lyon@linaro.org>
>
> gcc/
> * config/arm/neon.md (vec_load_lanesxi<mode>)
> (vec_store_lanexoi<mode>): Move ...
> * config/arm/vec-common.md: here.
>
> gcc/testsuite/
> * gcc.target/arm/simd/mve-vld4.c: New test, derived from
> slp-perm-3.c
> ---
> gcc/config/arm/neon.md | 20 ----
> gcc/config/arm/vec-common.md | 26 +++++
> gcc/testsuite/gcc.target/arm/simd/mve-vld4.c | 140 +++++++++++++++++++++++++++
> 3 files changed, 166 insertions(+), 20 deletions(-)
> create mode 100644 gcc/testsuite/gcc.target/arm/simd/mve-vld4.c
>
> diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
> index bc8775c..fb58baf 100644
> --- a/gcc/config/arm/neon.md
> +++ b/gcc/config/arm/neon.md
> @@ -5617,16 +5617,6 @@ (define_insn "neon_vld4<mode>"
> (const_string "neon_load4_4reg<q>")))]
> )
>
> -(define_expand "vec_load_lanesxi<mode>"
> - [(match_operand:XI 0 "s_register_operand")
> - (match_operand:XI 1 "neon_struct_operand")
> - (unspec:VQ2 [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
> - "TARGET_NEON"
> -{
> - emit_insn (gen_neon_vld4<mode> (operands[0], operands[1]));
> - DONE;
> -})
> -
> (define_expand "neon_vld4<mode>"
> [(match_operand:XI 0 "s_register_operand")
> (match_operand:XI 1 "neon_struct_operand")
> @@ -5818,16 +5808,6 @@ (define_insn "neon_vst4<mode>"
> (const_string "neon_store4_4reg<q>")))]
> )
>
> -(define_expand "vec_store_lanesxi<mode>"
> - [(match_operand:XI 0 "neon_struct_operand")
> - (match_operand:XI 1 "s_register_operand")
> - (unspec:VQ2 [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
> - "TARGET_NEON"
> -{
> - emit_insn (gen_neon_vst4<mode> (operands[0], operands[1]));
> - DONE;
> -})
> -
> (define_expand "neon_vst4<mode>"
> [(match_operand:XI 0 "neon_struct_operand")
> (match_operand:XI 1 "s_register_operand")
> diff --git a/gcc/config/arm/vec-common.md b/gcc/config/arm/vec-common.md
> index 7abefea..d46b78d 100644
> --- a/gcc/config/arm/vec-common.md
> +++ b/gcc/config/arm/vec-common.md
> @@ -512,3 +512,29 @@ (define_expand "vec_store_lanesoi<mode>"
> emit_insn (gen_mve_vst2q<mode> (operands[0], operands[1]));
> DONE;
> })
> +
> +(define_expand "vec_load_lanesxi<mode>"
> + [(match_operand:XI 0 "s_register_operand")
> + (match_operand:XI 1 "neon_struct_operand")
> + (unspec:VQ2 [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
> + "TARGET_NEON || TARGET_HAVE_MVE"
> +{
> + if (TARGET_NEON)
> + emit_insn (gen_neon_vld4<mode> (operands[0], operands[1]));
> + else
> + emit_insn (gen_mve_vld4q<mode> (operands[0], operands[1]));
> + DONE;
> +})
> +
> +(define_expand "vec_store_lanesxi<mode>"
> + [(match_operand:XI 0 "neon_struct_operand")
> + (match_operand:XI 1 "s_register_operand")
> + (unspec:VQ2 [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
> + "TARGET_NEON || TARGET_HAVE_MVE"
> +{
> + if (TARGET_NEON)
> + emit_insn (gen_neon_vst4<mode> (operands[0], operands[1]));
> + else
> + emit_insn (gen_mve_vst4q<mode> (operands[0], operands[1]));
> + DONE;
> +})
> diff --git a/gcc/testsuite/gcc.target/arm/simd/mve-vld4.c b/gcc/testsuite/gcc.target/arm/simd/mve-vld4.c
> new file mode 100644
> index 0000000..ce3e755
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/arm/simd/mve-vld4.c
> @@ -0,0 +1,140 @@
> +/* { dg-do assemble } */
> +/* { dg-require-effective-target arm_v8_1m_mve_fp_ok } */
> +/* { dg-add-options arm_v8_1m_mve_fp } */
> +/* { dg-additional-options "-O3" } */
> +
> +#include <stdint.h>
> +
> +#define M00 100
> +#define M10 216
> +#define M20 23
> +#define M30 237
> +#define M01 1322
> +#define M11 13
> +#define M21 27271
> +#define M31 2280
> +#define M02 74
> +#define M12 191
> +#define M22 500
> +#define M32 111
> +#define M03 134
> +#define M13 117
> +#define M23 11
> +#define M33 771
> +
> +#define N 128
> +
> +/* Integer tests. */
> +#define FUNC(SIGN, TYPE, BITS) \
> + void foo_##SIGN##BITS##x (TYPE##BITS##_t *__restrict__ pInput, \
> + TYPE##BITS##_t *__restrict__ pOutput) \
> + { \
> + unsigned int i; \
> + TYPE##BITS##_t a, b, c, d; \
> + \
> + for (i = 0; i < N / BITS; i++) \
> + { \
> + a = *pInput++; \
> + b = *pInput++; \
> + c = *pInput++; \
> + d = *pInput++; \
> + \
> + *pOutput++ = M00 * a + M01 * b + M02 * c + M03 * d; \
> + *pOutput++ = M10 * a + M11 * b + M12 * c + M13 * d; \
> + *pOutput++ = M20 * a + M21 * b + M22 * c + M23 * d; \
> + *pOutput++ = M30 * a + M31 * b + M32 * c + M33 * d; \
> + } \
> + }
> +
> +FUNC(s, int, 8)
> +FUNC(u, uint, 8)
> +FUNC(s, int, 16)
> +FUNC(u, uint, 16)
> +FUNC(s, int, 32)
> +FUNC(u, uint, 32)
> +
> +/* float test, keep the macro because it's similar to the above, but does not
> + need the ##BITS##_t. */
> +#define FUNC_FLOAT(SIGN, TYPE, BITS) \
> + void foo_##SIGN##BITS##x (TYPE *__restrict__ pInput, \
> + TYPE *__restrict__ pOutput) \
> + { \
> + unsigned int i; \
> + TYPE a, b, c, d; \
> + \
> + for (i = 0; i < N / BITS; i++) \
> + { \
> + a = *pInput++; \
> + b = *pInput++; \
> + c = *pInput++; \
> + d = *pInput++; \
> + \
> + *pOutput++ = M00 * a + M01 * b + M02 * c + M03 * d; \
> + *pOutput++ = M10 * a + M11 * b + M12 * c + M13 * d; \
> + *pOutput++ = M20 * a + M21 * b + M22 * c + M23 * d; \
> + *pOutput++ = M30 * a + M31 * b + M32 * c + M33 * d; \
> + } \
> + }
> +
> +FUNC_FLOAT(f, float, 32)
> +
> +/* __fp16 test, needs explicit casts to avoid conversions to floating-point and
> + failure to vectorize. */
> +__fp16 M00_fp16 = 100.0f16;
> +__fp16 M10_fp16 = 216.0f16;
> +__fp16 M20_fp16 = 23.0f16;
> +__fp16 M30_fp16 = 237.0f16;
> +__fp16 M01_fp16 = 1322.0f16;
> +__fp16 M11_fp16 = 13.0f16;
> +__fp16 M21_fp16 = 27271.0f16;
> +__fp16 M31_fp16 = 2280.0f16;
> +__fp16 M02_fp16 = 74.0f16;
> +__fp16 M12_fp16 = 191.0f16;
> +__fp16 M22_fp16 = 500.0f16;
> +__fp16 M32_fp16 = 111.0f16;
> +__fp16 M03_fp16 = 134.0f16;
> +__fp16 M13_fp16 = 117.0f16;
> +__fp16 M23_fp16 = 11.0f16;
> +__fp16 M33_fp16 = 771.0f16;
> +
> +#define FUNC_FLOAT_FP16(SIGN, TYPE, BITS) \
> + void foo_##SIGN##BITS##x (TYPE *__restrict__ pInput, \
> + TYPE *__restrict__ pOutput) \
> + { \
> + unsigned int i; \
> + TYPE a, b, c, d; \
> + \
> + for (i = 0; i < N / BITS; i++) \
> + { \
> + a = *pInput++; \
> + b = *pInput++; \
> + c = *pInput++; \
> + d = *pInput++; \
> + \
> + TYPE ab, cd; \
> + ab = (__fp16)(M00_fp16 * a) + (__fp16)(M01_fp16 * b); \
> + cd = (__fp16)(M02_fp16 * c) + (__fp16)(M03_fp16 * d); \
> + *pOutput++ = ab + cd; \
> + ab = (__fp16)(M10_fp16 * a) + (__fp16)(M11_fp16 * b); \
> + cd = (__fp16)(M12_fp16 * c) + (__fp16)(M13_fp16 * d); \
> + *pOutput++ = ab + cd; \
> + ab = (__fp16)(M20_fp16 * a) + (__fp16)(M21_fp16 * b); \
> + cd = (__fp16)(M22_fp16 * c) + (__fp16)(M23_fp16 * d); \
> + *pOutput++ = ab + cd; \
> + ab = (__fp16)(M30_fp16 * a) + (__fp16)(M31_fp16 * b); \
> + cd = (__fp16)(M32_fp16 * c) + (__fp16)(M33_fp16 * d); \
> + *pOutput++ = ab + cd; \
> + } \
> + }
> +
> +FUNC_FLOAT_FP16(f, __fp16, 16)
> +
> +/* vld4X.8 is used for signed and unsigned chars: 2 * 4. */
> +/* vld4X.16 is used for signed and unsigned shorts and __fp16: 3 * 4. */
> +/* vld4X.32 is used for signed and unsigned ints and float: 3 * 4. */
> +/* { dg-final { scan-assembler-times {vld4[0123].8\t.q[0-9]+, q[0-9]+, q[0-9]+, q[0-9]+., } 8 } } */
> +/* { dg-final { scan-assembler-times {vld4[0123].16\t.q[0-9]+, q[0-9]+, q[0-9]+, q[0-9]+., } 12 } } */
> +/* { dg-final { scan-assembler-times {vld4[0123].32\t.q[0-9]+, q[0-9]+, q[0-9]+, q[0-9]+., } 12 } } */
> +/* { dg-final { scan-assembler-times {vst4[0123].8\t.q[0-9]+, q[0-9]+, q[0-9]+, q[0-9]+., } 8 } } */
> +/* { dg-final { scan-assembler-times {vst4[0123].16\t.q[0-9]+, q[0-9]+, q[0-9]+, q[0-9]+., } 12 } } */
> +/* { dg-final { scan-assembler-times {vst4[0123].32\t.q[0-9]+, q[0-9]+, q[0-9]+, q[0-9]+., } 12 } } */
next prev parent reply other threads:[~2021-05-04 12:03 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 14:09 [PATCH 1/9] arm: MVE: Convert vcmp[eq|ne]* in arm_mve.h to use only 's' builtin version Christophe Lyon
2021-04-30 14:09 ` [PATCH 2/9] arm: MVE: Cleanup vcmpne/vcmpeq builtins Christophe Lyon
2021-05-10 11:57 ` Kyrylo Tkachov
2021-04-30 14:09 ` [PATCH 3/9] arm: MVE: Remove _s and _u suffixes from vcmp* builtins Christophe Lyon
2021-05-10 11:58 ` Kyrylo Tkachov
2021-04-30 14:09 ` [PATCH 4/9] arm: MVE: Factorize all vcmp* integer patterns Christophe Lyon
2021-05-10 11:59 ` Kyrylo Tkachov
2021-04-30 14:09 ` [PATCH 5/9] arm: MVE: Factorize vcmp_*f* Christophe Lyon
2021-05-10 11:59 ` Kyrylo Tkachov
2021-04-30 14:09 ` [PATCH 6/9] arm: Auto-vectorization for MVE: vcmp Christophe Lyon
2021-05-04 11:29 ` Andre Vieira (lists)
2021-05-04 13:41 ` Christophe Lyon
2021-05-05 14:08 ` Christophe Lyon
2021-05-17 9:54 ` Christophe Lyon
2021-05-17 10:35 ` Kyrylo Tkachov
2021-05-17 12:31 ` Christophe Lyon
2021-04-30 14:09 ` [PATCH 7/9] arm: Auto-vectorization for MVE: add __fp16 support to VCMP Christophe Lyon
2021-05-04 11:48 ` Andre Vieira (lists)
2021-05-04 13:43 ` Christophe Lyon
2021-05-04 17:03 ` Christophe Lyon
2021-05-05 14:09 ` Christophe Lyon
2021-05-17 9:54 ` Christophe Lyon
2021-05-17 10:49 ` Kyrylo Tkachov
2021-04-30 14:09 ` [PATCH 8/9] arm: Auto-vectorization for MVE: vld2/vst2 Christophe Lyon
2021-05-17 9:55 ` Christophe Lyon
2021-05-24 7:19 ` Christophe Lyon
2021-05-24 12:15 ` Kyrylo Tkachov
2021-04-30 14:09 ` [PATCH 9/9] arm: Auto-vectorization for MVE: vld4/vst4 Christophe Lyon
2021-05-04 12:03 ` Andre Vieira (lists) [this message]
2021-05-04 14:57 ` Christophe Lyon
2021-05-17 9:55 ` Christophe Lyon
2021-05-24 7:20 ` Christophe Lyon
2021-05-24 12:15 ` Kyrylo Tkachov
2021-05-10 11:21 ` [PATCH 1/9] arm: MVE: Convert vcmp[eq|ne]* in arm_mve.h to use only 's' builtin version Christophe Lyon
2021-05-10 11:54 ` Kyrylo Tkachov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6c622137-dfaa-4a62-5a37-0a1f3f6ef5d5@arm.com \
--to=andre.simoesdiasvieira@arm.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).