From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) by sourceware.org (Postfix) with ESMTPS id 8980C3856DDF for ; Fri, 5 May 2023 15:46:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8980C3856DDF Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-55b7630a736so28157657b3.1 for ; Fri, 05 May 2023 08:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1683301571; x=1685893571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xWKdAUiACWg6Q1/rWmeh3GKhsdh1Weq67zXUUokOQN4=; b=XypmcJGfQdLvP4dQ5IlInCmLdehxcQEEfAFs8KozURq6PL+tkAtMbEwLdKdBB6dPWi mPVpUKr4UfmkpEeIqJgmycWGHzKpLvfIQ1/0CbBW3XZPsJ3JcD1xRWUqmgQq2ecOOWxM 36RKGlaUqTzyxttEVyJ4FGSw0Ii8+55nb6LaLgkg80LLKE0YP1cjc5OAQ2s+OBOT4Wbe 6Bo95fxmZNr9c2TVGG7AN+HQbJN8BQbebagp+9ejUFURqtf1IWGJwNLRQnyjKbmrMzvM V448TWZAP+FxjdFqWwy+0niyXH6Qqox9FW9/4EUoqXWf191N8q5sYU/5wSKGq7es7Mur xCEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683301572; x=1685893572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xWKdAUiACWg6Q1/rWmeh3GKhsdh1Weq67zXUUokOQN4=; b=dStT8uPmYOHwzNDkUmYqqS90jEkvOXaHSiFslIjZmC7U+wMhJluj6tTTmgYZ0EkfYk fNzcOrrBnMXy6Lzqhfx83sqoznLG278WLavQrv5LUeRf+nh8sc4mkKrfDrR9VV4axBgL ClVpRA+STcIlS34mCOH6A/Ce4KbLkH+9pRV+9KWTuoMommbcPGHZKqcON1hwldwovEjD bsPiqG8yZvxwS6N7gNi4JK+E4mbVPgm05UUiJ/BuOY0uee6lmotLR64ADea/INA3YEBi rZDljeZWuwRBrhucSThPFDEYy2h1ZwX58axpmSfcoeZi7bMLws3iopesfG2YtcfiVB+E /FEA== X-Gm-Message-State: AC+VfDxbwzT4+FyUB39CJzbtEn56DhSmwqygSQ5nOqSTYsT27CZEb4/+ Rr158awzT9bWV77OJQ7ctwCVvZOYvea1bmNtbSisAw== X-Google-Smtp-Source: ACHHUZ6O7ezdfr22bUe4Cd0Y4xiMzROKetRl3i92AOSEvbhG++poXrcyyV0U1R9cW7OwSghJWQvItg== X-Received: by 2002:a0d:d84b:0:b0:55a:abf6:6210 with SMTP id a72-20020a0dd84b000000b0055aabf66210mr1904832ywe.5.1683301571669; Fri, 05 May 2023 08:46:11 -0700 (PDT) Received: from system76-pc.ba.rivosinc.com ([136.57.172.92]) by smtp.gmail.com with ESMTPSA id p203-20020a8174d4000000b0055a3420b25asm542446ywc.50.2023.05.05.08.46.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 08:46:11 -0700 (PDT) From: Michael Collison To: gcc-patches@gcc.gnu.org Subject: [PATCH v6 5/9] RISC-V:autovec: Add autovectorization patterns for binary integer & len_load/store Date: Fri, 5 May 2023 11:46:03 -0400 Message-Id: <20230505154607.1155567-6-collison@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230505154607.1155567-1-collison@rivosinc.com> References: <20230505154607.1155567-1-collison@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,KAM_ASCII_DIVIDERS,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 2023-04-25 Michael Collison Juzhe Zhong * config/riscv/riscv.md (riscv_vector_preferred_simd_mode): Include vector-iterators.md. * config/riscv/vector-auto.md: New file containing autovectorization patterns. * config/riscv/vector.md: Remove include of vector-iterators.md and include vector-auto.md. --- gcc/config/riscv/riscv.md | 1 + gcc/config/riscv/vector-auto.md | 74 +++++++++++++++++++++++++++++++++ gcc/config/riscv/vector.md | 4 +- 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 gcc/config/riscv/vector-auto.md diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md index c508ee3ad89..e9b49eda617 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -140,6 +140,7 @@ (include "predicates.md") (include "constraints.md") (include "iterators.md") +(include "vector-iterators.md") ;; .................... ;; diff --git a/gcc/config/riscv/vector-auto.md b/gcc/config/riscv/vector-auto.md new file mode 100644 index 00000000000..83d2ab6957a --- /dev/null +++ b/gcc/config/riscv/vector-auto.md @@ -0,0 +1,74 @@ +;; Machine description for RISC-V 'V' Extension for GNU compiler. +;; Copyright (C) 2022-2023 Free Software Foundation, Inc. +;; Contributed by Juzhe Zhong (juzhe.zhong@rivai.ai), RiVAI Technologies Ltd. +;; Contributed by Michael Collison (collison@rivosinc.com, Rivos Inc. + +;; This file is part of GCC. + +;; GCC is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3, or (at your option) +;; any later version. + +;; GCC is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GCC; see the file COPYING3. If not see +;; . + +;; len_load/len_store is a sub-optimal pattern for RVV auto-vectorization support. +;; We will replace them when len_maskload/len_maskstore is supported in loop vectorizer. +(define_expand "len_load_" + [(match_operand:V 0 "register_operand") + (match_operand:V 1 "memory_operand") + (match_operand 2 "vector_length_operand") + (match_operand 3 "const_0_operand")] + "TARGET_VECTOR" +{ + riscv_vector::emit_nonvlmax_op (code_for_pred_mov (mode), operands[0], + operands[1], operands[2], mode); + DONE; +}) + +(define_expand "len_store_" + [(match_operand:V 0 "memory_operand") + (match_operand:V 1 "register_operand") + (match_operand 2 "vector_length_operand") + (match_operand 3 "const_0_operand")] + "TARGET_VECTOR" +{ + riscv_vector::emit_nonvlmax_op (code_for_pred_mov (mode), operands[0], + operands[1], operands[2], mode); + DONE; +}) + +;; ------------------------------------------------------------------------- +;; ---- [INT] Vector binary patterns +;; ------------------------------------------------------------------------- + +(define_expand "3" + [(set (match_operand:VI 0 "register_operand") + (any_int_binop:VI (match_operand:VI 1 "") + (match_operand:VI 2 "")))] + "TARGET_VECTOR" +{ + using namespace riscv_vector; + + rtx merge = RVV_VUNDEF (mode); + rtx vl = gen_reg_rtx (Pmode); + emit_vlmax_vsetvl (mode, vl); + rtx mask_policy = get_mask_policy_no_pred (); + rtx tail_policy = get_tail_policy_no_pred (); + rtx mask = CONSTM1_RTX(mode); + rtx vlmax_avl_p = get_avl_type_rtx (NONVLMAX); + + emit_insn (gen_pred_ (operands[0], mask, merge, operands[1], operands[2], + vl, tail_policy, mask_policy, vlmax_avl_p)); + + DONE; +}) + + diff --git a/gcc/config/riscv/vector.md b/gcc/config/riscv/vector.md index 1642822d098..5c9252c281b 100644 --- a/gcc/config/riscv/vector.md +++ b/gcc/config/riscv/vector.md @@ -26,8 +26,6 @@ ;; - Auto-vectorization (TBD) ;; - Combine optimization (TBD) -(include "vector-iterators.md") - (define_constants [ (INVALID_ATTRIBUTE 255) (X0_REGNUM 0) @@ -368,6 +366,8 @@ (symbol_ref "INTVAL (operands[4])")] (const_int INVALID_ATTRIBUTE))) +(include "vector-auto.md") + ;; ----------------------------------------------------------------- ;; ---- Miscellaneous Operations ;; ----------------------------------------------------------------- -- 2.34.1