From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id B72283860C39 for ; Wed, 25 Nov 2020 13:54:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B72283860C39 Received: by mail-wm1-x32e.google.com with SMTP id x22so2072295wmc.5 for ; Wed, 25 Nov 2020 05:54:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=fsYaV/aLJ/bXVC9exkUsm4ykUcvkRJEK1Y7RC7+7tj8=; b=Gp0bplA8029m5qDrr9artOki3rkp3QMXQREsLtNdho9qALrJMHhVbwiKtUjtzrD7RE syILTFN/5cXhds81ba4PDW8MSs1lqh4bQpoffrCQWQdn2rOTCND2qd9QPN/eg3wCojVo f6Yf6BbM36yei5vlMk0DQNrtnMQThLd/jWcNbKuhGfmP3Zxq0k1CWLpLyNFJ4+FylxiJ SDHkS3//Y9Rt0Wx/mD7R+09F7yS8N76A1HMKT7EAqm2MmjTmt97O65Vi3OXS4ouoDbRO nUDondaPtD73BVce0TIezZkjJIMq6B/Y0WWPqcG83xmF+GId+kZo+z8gvCNP63VOQ/Y+ MYAw== X-Gm-Message-State: AOAM530JUHtjiOf/WMWk+Mlp9zIWZ+GrTb1BHJ0IlvHdYVwLOqcG6VBg YR6AzxLJKUzmADPRKIz9WDGxMTBfs4KV9w== X-Google-Smtp-Source: ABdhPJyUwSGqqjqujPNX+pEAQJtePjYKW7irqjZ7VdsvPDiM3xT+/J+CRAS5PWK/h9TTVwn7ck6+Kw== X-Received: by 2002:a1c:96c2:: with SMTP id y185mr4208793wmd.84.1606312472309; Wed, 25 Nov 2020 05:54:32 -0800 (PST) Received: from localhost.localdomain (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id 90sm4928477wrl.60.2020.11.25.05.54.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:54:31 -0800 (PST) From: Christophe Lyon To: gcc-patches@gcc.gnu.org Subject: [PATCH 3/7] arm: Auto-vectorization for MVE: veor Date: Wed, 25 Nov 2020 13:54:26 +0000 Message-Id: <1606312469-1370-3-git-send-email-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1606312469-1370-1-git-send-email-christophe.lyon@linaro.org> References: <1606312469-1370-1-git-send-email-christophe.lyon@linaro.org> X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2020 13:54:35 -0000 This patch enables MVE veorq instructions for auto-vectorization. MVE veorq insns in mve.md are modified to use xor instead of unspec expression to support xor3. The xor3 expander is added to vec-common.md 2020-11-12 Christophe Lyon gcc/ * config/arm/iterators.md (supf): Remove VEORQ_S and VEORQ_U. (VEORQ): Remove. * config/arm/mve.md (mve_veorq_u): New entry for veor instruction using expression xor. (mve_veorq_s): New expander. * config/arm/neon.md (xor3): Renamed into xor3_neon. * config/arm/unspscs.md (VEORQ_S, VEORQ_U): Remove. * config/arm/vec-common.md (xor3): New expander. gcc/testsuite/ * gcc.target/arm/simd/mve-veor.c: Add tests for veor. --- gcc/config/arm/iterators.md | 3 +-- gcc/config/arm/mve.md | 17 ++++++++++---- gcc/config/arm/neon.md | 2 +- gcc/config/arm/unspecs.md | 2 -- gcc/config/arm/vec-common.md | 15 ++++++++++++ gcc/testsuite/gcc.target/arm/simd/mve-veor.c | 34 ++++++++++++++++++++++++++++ 6 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/gcc.target/arm/simd/mve-veor.c diff --git a/gcc/config/arm/iterators.md b/gcc/config/arm/iterators.md index 5fcb7af..0195275 100644 --- a/gcc/config/arm/iterators.md +++ b/gcc/config/arm/iterators.md @@ -1237,7 +1237,7 @@ (define_int_attr supf [(VCVTQ_TO_F_S "s") (VCVTQ_TO_F_U "u") (VREV16Q_S "s") (VCADDQ_ROT270_U "u") (VCADDQ_ROT90_S "s") (VCMPEQQ_S "s") (VCMPEQQ_U "u") (VCADDQ_ROT90_U "u") (VCMPEQQ_N_S "s") (VCMPEQQ_N_U "u") (VCMPNEQ_N_S "s") - (VCMPNEQ_N_U "u") (VEORQ_S "s") (VEORQ_U "u") + (VCMPNEQ_N_U "u") (VHADDQ_N_S "s") (VHADDQ_N_U "u") (VHADDQ_S "s") (VHADDQ_U "u") (VHSUBQ_N_S "s") (VHSUBQ_N_U "u") (VHSUBQ_S "s") (VMAXQ_S "s") (VMAXQ_U "u") (VHSUBQ_U "u") @@ -1507,7 +1507,6 @@ (define_int_iterator VCADDQ_ROT90 [VCADDQ_ROT90_U VCADDQ_ROT90_S]) (define_int_iterator VCMPEQQ [VCMPEQQ_U VCMPEQQ_S]) (define_int_iterator VCMPEQQ_N [VCMPEQQ_N_S VCMPEQQ_N_U]) (define_int_iterator VCMPNEQ_N [VCMPNEQ_N_U VCMPNEQ_N_S]) -(define_int_iterator VEORQ [VEORQ_U VEORQ_S]) (define_int_iterator VHADDQ [VHADDQ_S VHADDQ_U]) (define_int_iterator VHADDQ_N [VHADDQ_N_U VHADDQ_N_S]) (define_int_iterator VHSUBQ [VHSUBQ_S VHSUBQ_U]) diff --git a/gcc/config/arm/mve.md b/gcc/config/arm/mve.md index 0f04044..a5f5d75 100644 --- a/gcc/config/arm/mve.md +++ b/gcc/config/arm/mve.md @@ -1204,17 +1204,24 @@ (define_insn "mve_vcmpneq_n_" ;; ;; [veorq_u, veorq_s]) ;; -(define_insn "mve_veorq_" +(define_insn "mve_veorq_u" [ (set (match_operand:MVE_2 0 "s_register_operand" "=w") - (unspec:MVE_2 [(match_operand:MVE_2 1 "s_register_operand" "w") - (match_operand:MVE_2 2 "s_register_operand" "w")] - VEORQ)) + (xor:MVE_2 (match_operand:MVE_2 1 "s_register_operand" "w") + (match_operand:MVE_2 2 "s_register_operand" "w"))) ] "TARGET_HAVE_MVE" - "veor %q0, %q1, %q2" + "veor\t%q0, %q1, %q2" [(set_attr "type" "mve_move") ]) +(define_expand "mve_veorq_s" + [ + (set (match_operand:MVE_2 0 "s_register_operand") + (xor:MVE_2 (match_operand:MVE_2 1 "s_register_operand") + (match_operand:MVE_2 2 "s_register_operand"))) + ] + "TARGET_HAVE_MVE" +) ;; ;; [vhaddq_n_u, vhaddq_n_s]) diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md index 669c34d..e1263b0 100644 --- a/gcc/config/arm/neon.md +++ b/gcc/config/arm/neon.md @@ -747,7 +747,7 @@ (define_insn "bic3_neon" [(set_attr "type" "neon_logic")] ) -(define_insn "xor3" +(define_insn "xor3_neon" [(set (match_operand:VDQ 0 "s_register_operand" "=w") (xor:VDQ (match_operand:VDQ 1 "s_register_operand" "w") (match_operand:VDQ 2 "s_register_operand" "w")))] diff --git a/gcc/config/arm/unspecs.md b/gcc/config/arm/unspecs.md index f111ad8..78313ea 100644 --- a/gcc/config/arm/unspecs.md +++ b/gcc/config/arm/unspecs.md @@ -608,7 +608,6 @@ (define_c_enum "unspec" [ VCMPEQQ_S VCMPEQQ_N_S VCMPNEQ_N_S - VEORQ_S VHADDQ_S VHADDQ_N_S VHSUBQ_S @@ -653,7 +652,6 @@ (define_c_enum "unspec" [ VCMPEQQ_U VCMPEQQ_N_U VCMPNEQ_N_U - VEORQ_U VHADDQ_U VHADDQ_N_U VHSUBQ_U diff --git a/gcc/config/arm/vec-common.md b/gcc/config/arm/vec-common.md index 413fb07..687134a 100644 --- a/gcc/config/arm/vec-common.md +++ b/gcc/config/arm/vec-common.md @@ -202,3 +202,18 @@ (define_expand "ior3" (match_operand:VNINOTM1 2 "neon_logic_op2" "")))] "TARGET_NEON" ) + +(define_expand "xor3" + [(set (match_operand:VNIM1 0 "s_register_operand" "") + (xor:VNIM1 (match_operand:VNIM1 1 "s_register_operand" "") + (match_operand:VNIM1 2 "s_register_operand" "")))] + "TARGET_NEON + || (TARGET_HAVE_MVE && VALID_MVE_SI_MODE (mode))" +) + +(define_expand "xor3" + [(set (match_operand:VNINOTM1 0 "s_register_operand" "") + (xor:VNINOTM1 (match_operand:VNINOTM1 1 "s_register_operand" "") + (match_operand:VNINOTM1 2 "s_register_operand" "")))] + "TARGET_NEON" +) diff --git a/gcc/testsuite/gcc.target/arm/simd/mve-veor.c b/gcc/testsuite/gcc.target/arm/simd/mve-veor.c new file mode 100644 index 0000000..5c534cc --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/simd/mve-veor.c @@ -0,0 +1,34 @@ +/* { dg-do assemble } */ +/* { dg-require-effective-target arm_v8_1m_mve_ok } */ +/* { dg-add-options arm_v8_1m_mve } */ +/* { dg-additional-options "-O3" } */ + +#include + +#define FUNC(SIGN, TYPE, BITS, NB, OP, NAME) \ + void test_ ## NAME ##_ ## SIGN ## BITS ## x ## NB (TYPE##BITS##_t * __restrict__ dest, TYPE##BITS##_t *a, TYPE##BITS##_t *b) { \ + int i; \ + for (i=0; i