From patchwork Fri Sep 8 18:16:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edwin Lu X-Patchwork-Id: 137772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp713915vqo; Fri, 8 Sep 2023 11:19:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYJec3UPomjmJH68RxsVr0sz4FyzSgTzqeQTpNFIwvnXBcuFrVXGri29p3dE3M+FxKfo1K X-Received: by 2002:a2e:9b4e:0:b0:2bc:39f5:ecb4 with SMTP id o14-20020a2e9b4e000000b002bc39f5ecb4mr2611014ljj.25.1694197143359; Fri, 08 Sep 2023 11:19:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694197143; cv=none; d=google.com; s=arc-20160816; b=ZW+1EHnxIlaK+ILD/thqjf9WJ0ArO6LUZxY9rhBj4xQsK2bjYeN1k6ZG7w2njfd8Sr 8SdtJ7lRNKxhLvpNPi4XZR/H8fPaX0W0DgF2JnCRbfztFpYkUilR/Fqo2dlCCMYZg24k qPKSaHjaMv6n698hR8JnSHbrsNZcpd4h6elVcTQTqwMgChdawxfeJi8sfHbGLkHFaRG6 32tv+jHO+Pr5MMRktgJsfVlUQE27+AouuGQ2jlPCD8VadjTkxUwXOSgaR8K3CILN5c16 ebwPZkdY04aGTNfyiqchJWmxA/dX+0BV3KjacaoFlu3fhs04XLmxO9iiio0ZTuOB1uHu ms9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:dmarc-filter:delivered-to; bh=OOqvWGR5YsQPgO2d/qUAwq4p1/WH/CUkJ8596XRE3cI=; fh=FJbxQR/u5tD8wyenJM73SKFkIvrOVh63uwew/lx6xYE=; b=zqJjMJiMBT2mBnXe0+PJydtXkJM4E6ld4HDTh+SpEPtCRpJGq3iRPrkJ2x0Dj1jyuR EdgBAkxDfPdxqZ5KfqkzYGObYjAI8jxCo3CC7vH8ARZGpq8iLTCnJl9tjGjclILtAFrr SIf+9uAyymAFZcoALGADKdtlku0k0BHJTT0WIXGeWXmbykZ5vHdoqKjglyjE/RSYpHsB v6kb4HPcbQo0FkY8HPyVeEfMjJVfidIuWxbmOUEtv8Nxn5t3Ppa85dyd3h11Di5KRQG/ N1W6yyO9dv6UFjoocKtlXtHt9cBSOkC9KVeg/Kumxgx/rZ9tGmZDOfud4noORCs9giyX GPAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Wu4oKO+y; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id rn28-20020a170906d93c00b009874409d1e9si1654321ejb.200.2023.09.08.11.19.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 11:19:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=fail header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Wu4oKO+y; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 013213855592 for ; Fri, 8 Sep 2023 18:17:41 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id A495F3857344 for ; Fri, 8 Sep 2023 18:17:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A495F3857344 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-pl1-x632.google.com with SMTP id d9443c01a7336-1c337aeefbdso21578865ad.0 for ; Fri, 08 Sep 2023 11:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1694197028; x=1694801828; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OOqvWGR5YsQPgO2d/qUAwq4p1/WH/CUkJ8596XRE3cI=; b=Wu4oKO+yQeNh5mHnsRF3+UFLDgo0eibP8U0xD1I2ECLIJCjaLfNs4jaAv0yIuW+o+C 7jHZoDLcYqPBequOvu7GPO5oPlpP9L/OGS4hfWkY6uzsVAbPjUmGohDgaFXWA4SCFyi9 jFLHHXAtDQ5ikKojwb0eqXArCFvgDp0WZa7eS3n/h86SCArdRrcN/0akviubp3EkNSZN z7udRPWQf1fKB1GiLyO+P/xmBWH/p0jUhlYH3OkhTFNBSw2TFPygdT3uZRj2iwFQOQwE E0BJg/44DtQsxWUFq8s1uTMPXx0e9Rn4gsfcYpv9WPX3RSdsmMw7ntvDFwY5uNnE8aEg tamQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694197028; x=1694801828; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OOqvWGR5YsQPgO2d/qUAwq4p1/WH/CUkJ8596XRE3cI=; b=JtW9mWJNyGe6nqVSxxKzRnvIi5ZrRhnrKyANeuMKa9Tk1A3iT6XYC3v1usV9dFcBD5 wYkBWwCtlMbDfu6noR/FK3qt20of/DV0GT8KT7uwKO2nAD4c1/Obl0QVLcwtg0x+aBbj OpMhYwAbN+pyOuOkvGMDkE1Y31iPu94ggIu3CFGl47FtKowiFK+t4HWlM182qXiK4bod yeWwjec0fmSOzPajT0Ul8hHqsgutzTLhOnbZOfJ4nId8+moljkB65n+DXp4DWSeG7jNK P/3Xi3OCdK6Jt1v5RBOnOcTiKrbGajS2Fzw6uAwWiuHUCq4z9V9JFu57u1QI7GtLUv2G OlEg== X-Gm-Message-State: AOJu0YwxoYJcLjPWuTuPF9Vf0LLOC4L+rWjJ2825o/GP8UxIM20aMKI7 FRZTwsyo/0kwl3JVNl2+Rai+sk1LkMk/pKnHsPg= X-Received: by 2002:a17:902:9888:b0:1c3:7762:2adc with SMTP id s8-20020a170902988800b001c377622adcmr3077819plp.7.1694197028476; Fri, 08 Sep 2023 11:17:08 -0700 (PDT) Received: from ewlu.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id j7-20020a170902da8700b001bdeedd8579sm1027393plx.252.2023.09.08.11.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 11:17:08 -0700 (PDT) From: Edwin Lu To: gcc-patches@gcc.gnu.org Subject: [PATCH v2 1/5] RISC-V: Update Types for Vector Instructions Date: Fri, 8 Sep 2023 11:16:45 -0700 Message-ID: <20230908181659.3345602-2-ewlu@rivosinc.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230908181659.3345602-1-ewlu@rivosinc.com> References: <20230908181659.3345602-1-ewlu@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gnu-toolchain@rivosinc.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776494463955722490 X-GMAIL-MSGID: 1776494463955722490 This patch adds types to vector instructions that were added after or were missed by the original patch https://gcc.gnu.org/pipermail/gcc-patches/2023-August/628594.html gcc/ChangeLog: * config/riscv/autovec-opt.md: Update types * config/riscv/autovec.md: likewise Signed-off-by: Edwin Lu --- Changes in V2: - Add types to insns missed by prev version --- gcc/config/riscv/autovec-opt.md | 72 ++++++++++++++++++++++----------- gcc/config/riscv/autovec.md | 52 ++++++++++++++++-------- 2 files changed, 83 insertions(+), 41 deletions(-) diff --git a/gcc/config/riscv/autovec-opt.md b/gcc/config/riscv/autovec-opt.md index 3aaee54f02a..58e80044f1e 100644 --- a/gcc/config/riscv/autovec-opt.md +++ b/gcc/config/riscv/autovec-opt.md @@ -628,7 +628,8 @@ (define_insn_and_split "*cond_abs" gen_int_mode (GET_MODE_NUNITS (mode), Pmode), const0_rtx)); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine vfsqrt.v and cond_mask (define_insn_and_split "*cond_" @@ -666,7 +667,8 @@ (define_insn_and_split "*copysign_neg" riscv_vector::emit_vlmax_insn (code_for_pred_ncopysign (mode), riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine sign_extend/zero_extend(vf2) and vcond_mask (define_insn_and_split "*cond_" @@ -685,7 +687,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine sign_extend/zero_extend(vf4) and vcond_mask (define_insn_and_split "*cond_" @@ -704,7 +707,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine sign_extend/zero_extend(vf8) and vcond_mask (define_insn_and_split "*cond_" @@ -723,7 +727,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine trunc(vf2) + vcond_mask (define_insn_and_split "*cond_trunc" @@ -743,7 +748,8 @@ (define_insn_and_split "*cond_trunc" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine FP extend(vf2) and vcond_mask (define_insn_and_split "*cond_extend" @@ -762,7 +768,8 @@ (define_insn_and_split "*cond_extend" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine FP trunc(vf2) + vcond_mask (define_insn_and_split "*cond_trunc" @@ -782,7 +789,8 @@ (define_insn_and_split "*cond_trunc" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine convert(FP->INT) + vcond_mask (define_insn_and_split "*cond_" @@ -802,7 +810,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine convert(INT->FP) + vcond_mask (define_insn_and_split "*cond_" @@ -822,7 +831,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine convert(FP->2xINT) + vcond_mask (define_insn_and_split "*cond_" @@ -842,7 +852,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine convert(INT->2xFP) + vcond_mask (define_insn_and_split "*cond_" @@ -862,7 +873,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine convert(2xFP->INT) + vcond_mask (define_insn_and_split "*cond_" @@ -882,7 +894,8 @@ (define_insn_and_split "*cond_" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; Combine convert(2xINT->FP) + vcond_mask (define_insn_and_split "*cond_2" @@ -902,7 +915,8 @@ (define_insn_and_split "*cond_2" gen_int_mode (GET_MODE_NUNITS (mode), Pmode)}; riscv_vector::expand_cond_len_unop (icode, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; ============================================================================= ;; Combine extend + binop to widen_binop @@ -925,7 +939,8 @@ (define_insn_and_split "*dual_widen_ mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vector")]) (define_insn_and_split "*single_widen_sub" [(set (match_operand:VWEXTI 0 "register_operand") @@ -942,7 +957,8 @@ (define_insn_and_split "*single_widen_sub" mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "viwalu")]) (define_insn_and_split "*single_widen_add" [(set (match_operand:VWEXTI 0 "register_operand") @@ -959,7 +975,8 @@ (define_insn_and_split "*single_widen_add" mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "viwalu")]) ;; This combine pattern does not correspond to an single instruction, ;; i.e. there is no vwmul.wv instruction. This is a temporary pattern @@ -985,7 +1002,8 @@ (define_insn_and_split "*single_widen_mult" insn_code icode = code_for_pred (MULT, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, ops); DONE; -}) +} +[(set_attr "type" "viwmul")]) (define_insn_and_split "*dual_widen_mulsu" [(set (match_operand:VWEXTI 0 "register_operand") @@ -1002,7 +1020,8 @@ (define_insn_and_split "*dual_widen_mulsu" insn_code icode = code_for_pred_widen_mulsu (mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vector")]) (define_insn_and_split "*dual_widen_mulus" [(set (match_operand:VWEXTI 0 "register_operand") @@ -1019,7 +1038,8 @@ (define_insn_and_split "*dual_widen_mulus" insn_code icode = code_for_pred_widen_mulsu (mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vector")]) (define_insn_and_split "*dual_widen_" [(set (match_operand:VWEXTF 0 "register_operand") @@ -1036,7 +1056,8 @@ (define_insn_and_split "*dual_widen_" insn_code icode = code_for_pred_dual_widen (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP_FRM_DYN, operands); DONE; -}) +} +[(set_attr "type" "vector")]) (define_insn_and_split "*single_widen_add" [(set (match_operand:VWEXTF 0 "register_operand") @@ -1052,7 +1073,8 @@ (define_insn_and_split "*single_widen_add" insn_code icode = code_for_pred_single_widen_add (mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP_FRM_DYN, operands); DONE; -}) +} +[(set_attr "type" "vfwalu")]) (define_insn_and_split "*single_widen_sub" [(set (match_operand:VWEXTF 0 "register_operand") @@ -1068,7 +1090,8 @@ (define_insn_and_split "*single_widen_sub" insn_code icode = code_for_pred_single_widen_sub (mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP_FRM_DYN, operands); DONE; -}) +} +[(set_attr "type" "vfwalu")]) ;; This combine pattern does not correspond to an single instruction, ;; i.e. there is no vfwmul.wv instruction. This is a temporary pattern @@ -1094,4 +1117,5 @@ (define_insn_and_split "*single_widen_mult" riscv_vector::emit_vlmax_insn (code_for_pred (MULT, mode), riscv_vector::BINARY_OP_FRM_DYN, ops); DONE; -}) +} +[(set_attr "type" "vfwmul")]) diff --git a/gcc/config/riscv/autovec.md b/gcc/config/riscv/autovec.md index 98cd0c07625..ed4f0f8607a 100644 --- a/gcc/config/riscv/autovec.md +++ b/gcc/config/riscv/autovec.md @@ -432,7 +432,8 @@ (define_insn_and_split "3" riscv_vector::emit_vlmax_insn (code_for_pred (, mode), riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vialu")]) ;; ------------------------------------------------------------------------- ;; ---- [INT] Binary shifts by scalar. @@ -561,6 +562,7 @@ (define_insn_and_split "@vcond_mask_" riscv_vector::MERGE_OP, operands); DONE; } + [(set_attr "type" "vector")] ) ;; ------------------------------------------------------------------------- @@ -648,7 +650,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred_vf4 (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vext")]) (define_insn_and_split "2" [(set (match_operand:VOEXTI 0 "register_operand") @@ -662,7 +665,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred_vf8 (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vext")]) ;; ------------------------------------------------------------------------- ;; ---- [INT] Truncation @@ -818,7 +822,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vfcvtftoi")]) ;; ------------------------------------------------------------------------- ;; ---- [FP<-INT] Conversions @@ -840,7 +845,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP_FRM_DYN, operands); DONE; -}) +} +[(set_attr "type" "vfcvtitof")]) ;; ========================================================================= ;; == Widening/narrowing Conversions @@ -865,7 +871,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred_widen (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vfwcvtftoi")]) ;; ------------------------------------------------------------------------- ;; ---- [FP<-INT] Widening Conversions @@ -886,7 +893,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred_widen (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vfwcvtitof")]) ;; ------------------------------------------------------------------------- ;; ---- [INT<-FP] Narrowing Conversions @@ -907,7 +915,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred_narrow (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vfncvtftoi")]) ;; ------------------------------------------------------------------------- ;; ---- [FP<-INT] Narrowing Conversions @@ -928,7 +937,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred_narrow (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP_FRM_DYN, operands); DONE; -}) +} +[(set_attr "type" "vfncvtitof")]) ;; ========================================================================= ;; == Unary arithmetic @@ -952,7 +962,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vialu")]) ;; ------------------------------------------------------------------------------- ;; - [INT] ABS expansion to vmslt and vneg. @@ -976,7 +987,8 @@ (define_insn_and_split "abs2" riscv_vector::emit_vlmax_insn (code_for_pred (NEG, mode), riscv_vector::UNARY_OP_TAMU, ops); DONE; -}) +} +[(set_attr "type" "vector")]) ;; ------------------------------------------------------------------------------- ;; ---- [FP] Unary operations @@ -996,7 +1008,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vector")]) ;; ------------------------------------------------------------------------------- ;; - [FP] Square root @@ -1016,7 +1029,8 @@ (define_insn_and_split "2" insn_code icode = code_for_pred (, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::UNARY_OP_FRM_DYN, operands); DONE; -}) +} +[(set_attr "type" "vfsqrt")]) ;; ========================================================================= ;; == Ternary arithmetic @@ -1480,7 +1494,8 @@ (define_insn_and_split "3" riscv_vector::emit_vlmax_insn (code_for_pred (, mode), riscv_vector::BINARY_OP_FRM_DYN, operands); DONE; -}) +} +[(set_attr "type" "vfalu")]) ;; ------------------------------------------------------------------------- ;; Includes: @@ -1500,7 +1515,8 @@ (define_insn_and_split "3" riscv_vector::emit_vlmax_insn (code_for_pred (, mode), riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vfminmax")]) ;; ------------------------------------------------------------------------------- ;; ---- [FP] Sign copying @@ -1566,7 +1582,8 @@ (define_insn_and_split "smul3_highpart" insn_code icode = code_for_pred_mulh (UNSPEC_VMULHS, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vimul")]) (define_insn_and_split "umul3_highpart" [(set (match_operand:VFULLI 0 "register_operand") @@ -1581,7 +1598,8 @@ (define_insn_and_split "umul3_highpart" insn_code icode = code_for_pred_mulh (UNSPEC_VMULHU, mode); riscv_vector::emit_vlmax_insn (icode, riscv_vector::BINARY_OP, operands); DONE; -}) +} +[(set_attr "type" "vimul")]) ;; ------------------------------------------------------------------------- ;; ---- [INT] Conditional unary operations From patchwork Fri Sep 8 18:16:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edwin Lu X-Patchwork-Id: 137774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp714219vqo; Fri, 8 Sep 2023 11:19:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZUlf33CTwWnxJm4eRMTjc5gM68TrOQdlMfGORpGlTXxtKPSNnQuD1TLqSqAyKCU77ymXM X-Received: by 2002:a17:907:2cef:b0:9a1:cccb:5429 with SMTP id hz15-20020a1709072cef00b009a1cccb5429mr2238987ejc.15.1694197184312; Fri, 08 Sep 2023 11:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694197184; cv=none; d=google.com; s=arc-20160816; b=H31BR6c2gjqE4uIcu6UKrJfMq4m+NjwlkN/cOYPcv4kS51mCh7UWic5XW4LpnRIEiD jgw5xlLVr66Ic+vuPS8qB4Z5pNkIu6IeVKkv94xA9cyayTAzkSae3imgHgOWAqukVPIA 0qTtjhBFftlqeTqN/NLfkJmeJY7n5SLj+l5BI1eo3CUzaYYkgWB+iu67XIjgz3yOM/ri ClRNZXCKtZS3NY0WKAYlFlgKwAk1rBdk+SmQUIiLFKQGN2g48USFcfHe+DiHmqtBlGJf DPug/aKc+12NXyrp2bP2PSUL+Pdf+vYROn+kbwHcdhOjgYLKz0YBxDoIIEgKotp8gqvo nlQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:dmarc-filter:delivered-to; bh=lr+bAPDStjdsNNVV8ToSJRtvYwJXvOh+DrnKj6z9wcA=; fh=FJbxQR/u5tD8wyenJM73SKFkIvrOVh63uwew/lx6xYE=; b=IXGgVPBkOOw8Un00YpFZqUd0mja/Q26m6md1oaP6gn7aFUSv024/PZWVJ+Rumra+Il +sGDeDUu6EknbP6sx3wz3it4HSDz1GYAukdDAOdjfEHUg1brusRXug4Y6n5qCNrXA54f fVVIAKbgWB3hbFDDyPU4NV2sBgZM4WqTmVWSzG4dPfMYEUbRpuQ3bVo9MVPl8R7Erbqb l8p4eEKKM5CT7A74bT17pdlBdx8mo/4TGCMAMkG1c1CsogKjDy446izS6OOfQ9PfhuHR 0p6FX5Lu66tSABVFr+51n2vjmHuSUYsXUADCyAnaPfLvhZGSX5cOtBOBrF0dmphOPPqI xhow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="O/AN8y1p"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id q22-20020a1709060e5600b0098e4aef078esi1861391eji.778.2023.09.08.11.19.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 11:19:44 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=fail header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="O/AN8y1p"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1227E38555B2 for ; Fri, 8 Sep 2023 18:17:52 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id C73943856DE7 for ; Fri, 8 Sep 2023 18:17:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C73943856DE7 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-pl1-x634.google.com with SMTP id d9443c01a7336-1bf7423ef3eso18906925ad.3 for ; Fri, 08 Sep 2023 11:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1694197031; x=1694801831; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lr+bAPDStjdsNNVV8ToSJRtvYwJXvOh+DrnKj6z9wcA=; b=O/AN8y1pAtkPWShB7eLvlQdM4EsPr78JUJnZoTt59rHbSHctKWeZL3G+LN7bVgHBqF igbsb39B8OCyNi9f6dW1Xq6lZeAVD4JvpAS/6oIYZ3iTJCmyOfiKNDBKjMvG6Ad33P7D FzCu2bvLVoJVHJW+dhEI3PR/SHstXViN5WGVIFFOgalNWPMHVuQstTopUppyWjSwzM/r sJ9iUwHk4Cf8X1lvit7s3uKy+Ql7eHiY4NHNQ1mmgdCvdS5OUARUcFvrFGOaxEWre3Kb JK/40kTxSeuM1pkhZyYxNWg5GZ6ax6tQnxOsrzFKRrhWLCl3gqfeo4f0tfjYu/O/K6A8 +aMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694197031; x=1694801831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lr+bAPDStjdsNNVV8ToSJRtvYwJXvOh+DrnKj6z9wcA=; b=dnUPIMg7duxAuS5bgj5Pgm5M7IYIvtYIP1HpGuwj5+5UcGZMxcrWmdM90nIsTM8GwD S5lW9ThxERS8eFAa6aRUC7dJyv7ic4p/2VzzMyj3oJOtej4sekZLICfstEeqcQKHL6i/ ULun66YT9X2bPofZDYbwvJELOXqJpajvVtTGTBGEdMip3eFXuiSVZrzKNrWx82O5g39x 59PH3ZN0jwCNwpiX5EOeVLab16YZFaIFEwPZ/LLrD2XNl/3aT07mpwFDEakNIm4nAVJj 69zELekWGHXqfRFZVYpKbxtECfX0A90DI7JQzStj6kzZZeqHwmj9aBkrH6bdpbj1AB2j DHiQ== X-Gm-Message-State: AOJu0Yxc3MNy20/Zcx1YOQVClhMsugIsNT5sWGhUILKbK6faXMjxtIub TUPPdlN0PQ5zRCaR3lppBFkccSonRvf5OdpVYDk= X-Received: by 2002:a17:902:d2d1:b0:1bc:7a4b:5c68 with SMTP id n17-20020a170902d2d100b001bc7a4b5c68mr3589844plc.39.1694197030646; Fri, 08 Sep 2023 11:17:10 -0700 (PDT) Received: from ewlu.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id j7-20020a170902da8700b001bdeedd8579sm1027393plx.252.2023.09.08.11.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 11:17:10 -0700 (PDT) From: Edwin Lu To: gcc-patches@gcc.gnu.org Subject: [PATCH v2 2/5] RISC-V: Add Types for Un-Typed zc Instructions Date: Fri, 8 Sep 2023 11:16:46 -0700 Message-ID: <20230908181659.3345602-3-ewlu@rivosinc.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230908181659.3345602-1-ewlu@rivosinc.com> References: <20230908181659.3345602-1-ewlu@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gnu-toolchain@rivosinc.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776494506836756386 X-GMAIL-MSGID: 1776494506836756386 This patch adds types to the untyped zc instructions. Creates a new types "pushpop" and "mvpair" for now gcc/ChangeLog: * config/riscv/riscv.md: Add "csr" type * config/riscv/zc.md: Update types Signed-off-by: Edwin Lu --- Changes in V2: - Change "csr" type to "pushpop" and "mvpair" --- gcc/config/riscv/riscv.md | 6 ++- gcc/config/riscv/zc.md | 102 +++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md index b630b51ee50..a6046c17fc3 100644 --- a/gcc/config/riscv/riscv.md +++ b/gcc/config/riscv/riscv.md @@ -316,6 +316,8 @@ (define_attr "ext_enabled" "no,yes" ;; condmove conditional moves ;; cbo cache block instructions ;; crypto cryptography instructions +;; pushpop zc push and pop instructions +;; mvpair zc move pair instructions ;; Classification of RVV instructions which will be added to each RVV .md pattern and used by scheduler. ;; rdvlenb vector byte length vlenb csrr read ;; rdvl vector length vl csrr read @@ -425,8 +427,8 @@ (define_attr "type" mtc,mfc,const,arith,logical,shift,slt,imul,idiv,move,fmove,fadd,fmul, fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,trap,ghost,bitmanip, rotate,clmul,min,max,minu,maxu,clz,ctz,cpop, - atomic,condmove,cbo,crypto,rdvlenb,rdvl,wrvxrm,wrfrm,rdfrm,vsetvl, - vlde,vste,vldm,vstm,vlds,vsts, + atomic,condmove,cbo,crypto,pushpop,mvpair,rdvlenb,rdvl,wrvxrm,wrfrm, + rdfrm,vsetvl,vlde,vste,vldm,vstm,vlds,vsts, vldux,vldox,vstux,vstox,vldff,vldr,vstr, vlsegde,vssegte,vlsegds,vssegts,vlsegdux,vlsegdox,vssegtux,vssegtox,vlsegdff, vialu,viwalu,vext,vicalu,vshift,vnshift,vicmp,viminmax, diff --git a/gcc/config/riscv/zc.md b/gcc/config/riscv/zc.md index 77b28adde95..18b3c30c342 100644 --- a/gcc/config/riscv/zc.md +++ b/gcc/config/riscv/zc.md @@ -27,7 +27,7 @@ (define_insn "@gpr_multi_pop_up_to_ra_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s0_" [(set (reg:X SP_REGNUM) @@ -41,7 +41,7 @@ (define_insn "@gpr_multi_pop_up_to_s0_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s1_" [(set (reg:X SP_REGNUM) @@ -58,7 +58,7 @@ (define_insn "@gpr_multi_pop_up_to_s1_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s1}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s2_" [(set (reg:X SP_REGNUM) @@ -78,7 +78,7 @@ (define_insn "@gpr_multi_pop_up_to_s2_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s2}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s3_" [(set (reg:X SP_REGNUM) @@ -101,7 +101,7 @@ (define_insn "@gpr_multi_pop_up_to_s3_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s3}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s4_" [(set (reg:X SP_REGNUM) @@ -127,7 +127,7 @@ (define_insn "@gpr_multi_pop_up_to_s4_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s4}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s5_" [(set (reg:X SP_REGNUM) @@ -156,7 +156,7 @@ (define_insn "@gpr_multi_pop_up_to_s5_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s5}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s6_" [(set (reg:X SP_REGNUM) @@ -188,7 +188,7 @@ (define_insn "@gpr_multi_pop_up_to_s6_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s6}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s7_" [(set (reg:X SP_REGNUM) @@ -223,7 +223,7 @@ (define_insn "@gpr_multi_pop_up_to_s7_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s7}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s8_" [(set (reg:X SP_REGNUM) @@ -261,7 +261,7 @@ (define_insn "@gpr_multi_pop_up_to_s8_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s8}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s9_" [(set (reg:X SP_REGNUM) @@ -302,7 +302,7 @@ (define_insn "@gpr_multi_pop_up_to_s9_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s9}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_pop_up_to_s11_" [(set (reg:X SP_REGNUM) @@ -349,7 +349,7 @@ (define_insn "@gpr_multi_pop_up_to_s11_" (const_int ))))] "TARGET_ZCMP" "cm.pop {ra, s0-s11}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_ra_" [(set (reg:X SP_REGNUM) @@ -362,7 +362,7 @@ (define_insn "@gpr_multi_popret_up_to_ra_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s0_" [(set (reg:X SP_REGNUM) @@ -378,7 +378,7 @@ (define_insn "@gpr_multi_popret_up_to_s0_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s1_" [(set (reg:X SP_REGNUM) @@ -397,7 +397,7 @@ (define_insn "@gpr_multi_popret_up_to_s1_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s1}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s2_" [(set (reg:X SP_REGNUM) @@ -419,7 +419,7 @@ (define_insn "@gpr_multi_popret_up_to_s2_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s2}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s3_" [(set (reg:X SP_REGNUM) @@ -444,7 +444,7 @@ (define_insn "@gpr_multi_popret_up_to_s3_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s3}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s4_" [(set (reg:X SP_REGNUM) @@ -472,7 +472,7 @@ (define_insn "@gpr_multi_popret_up_to_s4_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s4}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s5_" [(set (reg:X SP_REGNUM) @@ -503,7 +503,7 @@ (define_insn "@gpr_multi_popret_up_to_s5_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s5}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s6_" [(set (reg:X SP_REGNUM) @@ -537,7 +537,7 @@ (define_insn "@gpr_multi_popret_up_to_s6_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s6}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s7_" [(set (reg:X SP_REGNUM) @@ -574,7 +574,7 @@ (define_insn "@gpr_multi_popret_up_to_s7_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s7}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s8_" [(set (reg:X SP_REGNUM) @@ -614,7 +614,7 @@ (define_insn "@gpr_multi_popret_up_to_s8_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s8}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s9_" [(set (reg:X SP_REGNUM) @@ -657,7 +657,7 @@ (define_insn "@gpr_multi_popret_up_to_s9_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s9}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popret_up_to_s11_" [(set (reg:X SP_REGNUM) @@ -706,7 +706,7 @@ (define_insn "@gpr_multi_popret_up_to_s11_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popret {ra, s0-s11}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_ra_" [(set (reg:X SP_REGNUM) @@ -722,7 +722,7 @@ (define_insn "@gpr_multi_popretz_up_to_ra_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s0_" [(set (reg:X SP_REGNUM) @@ -741,7 +741,7 @@ (define_insn "@gpr_multi_popretz_up_to_s0_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s1_" [(set (reg:X SP_REGNUM) @@ -763,7 +763,7 @@ (define_insn "@gpr_multi_popretz_up_to_s1_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s1}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s2_" [(set (reg:X SP_REGNUM) @@ -788,7 +788,7 @@ (define_insn "@gpr_multi_popretz_up_to_s2_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s2}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s3_" [(set (reg:X SP_REGNUM) @@ -816,7 +816,7 @@ (define_insn "@gpr_multi_popretz_up_to_s3_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s3}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s4_" [(set (reg:X SP_REGNUM) @@ -847,7 +847,7 @@ (define_insn "@gpr_multi_popretz_up_to_s4_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s4}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s5_" [(set (reg:X SP_REGNUM) @@ -881,7 +881,7 @@ (define_insn "@gpr_multi_popretz_up_to_s5_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s5}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s6_" [(set (reg:X SP_REGNUM) @@ -918,7 +918,7 @@ (define_insn "@gpr_multi_popretz_up_to_s6_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s6}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s7_" [(set (reg:X SP_REGNUM) @@ -958,7 +958,7 @@ (define_insn "@gpr_multi_popretz_up_to_s7_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s7}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s8_" [(set (reg:X SP_REGNUM) @@ -1001,7 +1001,7 @@ (define_insn "@gpr_multi_popretz_up_to_s8_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s8}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s9_" [(set (reg:X SP_REGNUM) @@ -1047,7 +1047,7 @@ (define_insn "@gpr_multi_popretz_up_to_s9_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s9}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_popretz_up_to_s11_" [(set (reg:X SP_REGNUM) @@ -1099,7 +1099,7 @@ (define_insn "@gpr_multi_popretz_up_to_s11_" (use (reg:SI RETURN_ADDR_REGNUM))] "TARGET_ZCMP" "cm.popretz {ra, s0-s11}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_ra_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1110,7 +1110,7 @@ (define_insn "@gpr_multi_push_up_to_ra_" (match_operand 0 "stack_push_up_to_ra_operand" "I")))] "TARGET_ZCMP" "cm.push {ra}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s0_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1124,7 +1124,7 @@ (define_insn "@gpr_multi_push_up_to_s0_" (match_operand 0 "stack_push_up_to_s0_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s1_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1141,7 +1141,7 @@ (define_insn "@gpr_multi_push_up_to_s1_" (match_operand 0 "stack_push_up_to_s1_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s1}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s2_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1161,7 +1161,7 @@ (define_insn "@gpr_multi_push_up_to_s2_" (match_operand 0 "stack_push_up_to_s2_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s2}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s3_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1184,7 +1184,7 @@ (define_insn "@gpr_multi_push_up_to_s3_" (match_operand 0 "stack_push_up_to_s3_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s3}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s4_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1210,7 +1210,7 @@ (define_insn "@gpr_multi_push_up_to_s4_" (match_operand 0 "stack_push_up_to_s4_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s4}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s5_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1239,7 +1239,7 @@ (define_insn "@gpr_multi_push_up_to_s5_" (match_operand 0 "stack_push_up_to_s5_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s5}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s6_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1271,7 +1271,7 @@ (define_insn "@gpr_multi_push_up_to_s6_" (match_operand 0 "stack_push_up_to_s6_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s6}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s7_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1306,7 +1306,7 @@ (define_insn "@gpr_multi_push_up_to_s7_" (match_operand 0 "stack_push_up_to_s7_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s7}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s8_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1344,7 +1344,7 @@ (define_insn "@gpr_multi_push_up_to_s8_" (match_operand 0 "stack_push_up_to_s8_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s8}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s9_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1385,7 +1385,7 @@ (define_insn "@gpr_multi_push_up_to_s9_" (match_operand 0 "stack_push_up_to_s9_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s9}, %0" -) +[(set_attr "type" "pushpop")]) (define_insn "@gpr_multi_push_up_to_s11_" [(set (mem:X (plus:X (reg:X SP_REGNUM) @@ -1432,7 +1432,7 @@ (define_insn "@gpr_multi_push_up_to_s11_" (match_operand 0 "stack_push_up_to_s11_operand" "I")))] "TARGET_ZCMP" "cm.push {ra, s0-s11}, %0" -) +[(set_attr "type" "pushpop")]) ;; ZCMP mv (define_insn "*mva01s" @@ -1443,7 +1443,8 @@ (define_insn "*mva01s" "TARGET_ZCMP && (REGNO (operands[2]) != REGNO (operands[0]))" { return (REGNO (operands[0]) == A0_REGNUM)?"cm.mva01s\t%1,%3":"cm.mva01s\t%3,%1"; } - [(set_attr "mode" "")]) + [(set_attr "mode" "") + (set_attr "type" "mvpair")]) (define_insn "*mvsa01" [(set (match_operand:X 0 "zcmp_mv_sreg_operand" "=r") @@ -1454,4 +1455,5 @@ (define_insn "*mvsa01" && (REGNO (operands[0]) != REGNO (operands[2])) && (REGNO (operands[1]) != REGNO (operands[3]))" { return (REGNO (operands[1]) == A0_REGNUM)?"cm.mvsa01\t%0,%2":"cm.mvsa01\t%2,%0"; } - [(set_attr "mode" "")]) + [(set_attr "mode" "") + (set_attr "type" "mvpair")])