From patchwork Tue Oct 31 17:11:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_M=C3=BCllner?= X-Patchwork-Id: 160284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b90f:0:b0:403:3b70:6f57 with SMTP id t15csp388323vqg; Tue, 31 Oct 2023 10:12:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCCXxUjET/dSDSdagfw3worwq5bldydbvYHrzk/sMKdK+F9TNkiG9Jy8PcFrVei6tMI5hH X-Received: by 2002:a05:620a:a14:b0:777:24f1:5e with SMTP id i20-20020a05620a0a1400b0077724f1005emr12703336qka.71.1698772321712; Tue, 31 Oct 2023 10:12:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698772321; cv=pass; d=google.com; s=arc-20160816; b=SeVaMnYTT12pCiQo4CTSnDBfATRfL03+y1aDGm0kSpQTvcTaMPzMjAxlARY6Fgyaky wQ1ISwsB7rHrGQbkwomuljU9cbsjiemugwrC4UV4rUtnLu8yV0yyZQI+evbWT93NC7Fv 0cj+nWb4NcZWRO7HEFbGSw6ARlFE03zC9dYtfnHdu/x7GM0gBcg0b+E+JHtcd9w+o0NW GJ6KwANXqh1Jjn2/+FBK+BP0aVUdv+TuBgp1MxM/MiVJ6v9dNbQWBjym2MHwhIwqT48h vqBmrL9Lm+bS1S0IMWpBV+R7r9kjjw5XXt+DtoVI6YWPEeBfu7dCpQWkuW6XtfxInEg5 Js+A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to: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:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=Ku/kqqoBYYxQak36yPlb3G2WwUCfrVU6dsbIrI+IVhQ=; fh=9oFhVPKihcNP6VY2Nsu6+FGvAEKY/HNABCPdk6S267g=; b=kcakG0cmvg/4sjKDq2N7en6PUUwo4pB90ddKfz5OaxdqtMnj+xmSdUonRgfsWl5HRr j1/CQxy7m2KY8GkD0ZmhYYK9bZckBruthHtU7lXvpQP+4dSY1igEohNcdJY4QvmVRBdt LpQgVvMQ7PWwuLcqobO9Ba6eXaVIrYcc3CdRX9SVIq9Hgfds0EIxgPrfdEWVtgxTaDt0 nJdw5blfhkpwq1Nq9/+waloJ4HcKFHJH+igZhDm5/gXxSzAKiC0L2RMAjOB7gEskd4rP MXyVs1JafOgasNd4UVgI2cwZH4G+Voh2nQtSe0/gA2fD1Yp6SWt/TOuaxy2USKWT3tSn iGLg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vrull.eu header.s=google header.b=Rsm02Ept; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id dz22-20020a05620a2b9600b0076cb7c7d9d1si1456810qkb.637.2023.10.31.10.12.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 10:12:01 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@vrull.eu header.s=google header.b=Rsm02Ept; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 6D296385C6FB for ; Tue, 31 Oct 2023 17:12:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by sourceware.org (Postfix) with ESMTPS id 3C1963857B93 for ; Tue, 31 Oct 2023 17:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C1963857B93 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3C1963857B93 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::530 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698772295; cv=none; b=PPLq8onE1YR5piitcIFpWdw6Ka5L2ktbSjrQ5kSuuVg0qpe9/EFLCcAqU5k/f2oSdm2ZUDZjvnlb7Ce2PjVnqKKke/PgnrZKHRTjDb16GayIfnM0KBvKqoKq2jFkAZ0jVkCWmupPLQyFFmlDiREkcwHavpj3Moq5ImrLks2gtr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698772295; c=relaxed/simple; bh=h+x91HbKJZP5VR2JuX1epFMpahbdBimLxl0od3neqqc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=CJq5NkzdkD+upBHeLhi86ymlzEjZnh8kIZbE2LH5yjTGuz5J1MWQPVWgETAKlWOrnyvhVHcl3QOI2c9UBtnis1TjStyW+Tbj3uHwR7wP+u6jd61CqPT52d/fQwNQovZBCs/sxPpcv+QOHwStEpOaMIBuFD1igrXBtirE7qUQGEU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-53e08e439c7so10140697a12.0 for ; Tue, 31 Oct 2023 10:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1698772289; x=1699377089; 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=Ku/kqqoBYYxQak36yPlb3G2WwUCfrVU6dsbIrI+IVhQ=; b=Rsm02Ept3HAtt3nW/YqCsIYFBerBre0XUc0rY2Re5u/aykSxFuNHxBVSbu7rlEi0lF 0k+kC9PBVtKoDivs3/p9Vw3kbfhe8Fm6PX30kkB/QYE8ds48U3ATsL0xmWzYVP0FMoyN N1i+PUdUic7p1ZXcQLzzEqUmFKYIdxB6VuFcJdabXceBlvi8yJMO11KPhwf3votn44TL YN2FLHd7XC3OHDRyxQscCvYmFc3oUgDAppBaYwoRMGvw8fCkWSLm5R+BT+Qr7gD3zTYl tRJ7PdpSdmailHqnv9Ii3GwEQjyr8ORzkqcsN9vdUO9iFUA9KaDZctVhnjq7SJDbktWN K2pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698772289; x=1699377089; 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=Ku/kqqoBYYxQak36yPlb3G2WwUCfrVU6dsbIrI+IVhQ=; b=wL3pIcvMtdmPZgxDwUyPoNea2HoWVHfhjIRQOMk5MTzg4sQjLjvzP7o5E/6EMitkgl KjNP2PIGdTan0i41xi/bvVFjVEnFR28Ug7jvEtb41M/0GMlpMU3s8p4LGGb0WnZYX77x GGUOmQF3OXUeUQmD5YwPPf8eUMFsnl/zVt7aPuXBQuIbWRvru++PUXbs6JZ3cZRC3s9w OEZFrYidSPM2FkDllRH4EbjDj8dI74vzkHDrKGtz0inAtRI5CGGif+Tbi9LVe3bXW1PQ SmIU5SiWs8IKaqXYjiDjkxX/cY1b4CsQzkih43WcHQIz4ky+pNb1kHYdKwddzWx3+Xw7 Bd5w== X-Gm-Message-State: AOJu0YyY3f/GdUPggkypl2KSYZHHPCEd+87f5yVLDXKzN8Q75i30MCLn SxZHTEnxIyCWLg+mIqjL4u3FpkNNJ2I6XBphcRw= X-Received: by 2002:a17:907:988:b0:9c7:49f5:343a with SMTP id bf8-20020a170907098800b009c749f5343amr10930460ejc.73.1698772289205; Tue, 31 Oct 2023 10:11:29 -0700 (PDT) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id v9-20020a17090606c900b0098f33157e7dsm1259227ejb.82.2023.10.31.10.11.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 10:11:28 -0700 (PDT) From: Christoph Muellner To: gcc-patches@gcc.gnu.org, Kito Cheng , Jim Wilson , Palmer Dabbelt , Andrew Waterman , Philipp Tomsich , Jeff Law Cc: =?utf-8?q?Christoph_M=C3=BCllner?= Subject: [committed 2/2] riscv: thead: Add support for the XTheadFMemIdx ISA extension Date: Tue, 31 Oct 2023 18:11:23 +0100 Message-ID: <20231031171123.569951-2-christoph.muellner@vrull.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231031171123.569951-1-christoph.muellner@vrull.eu> References: <20231031171123.569951-1-christoph.muellner@vrull.eu> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_MANYTO, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, URIBL_BLACK 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781291885561501072 X-GMAIL-MSGID: 1781291885561501072 From: Christoph Müllner The XTheadFMemIdx ISA extension provides additional load and store instructions for floating-point registers with new addressing modes. The following memory accesses types are supported: * load/store: [w,d] (single-precision FP, double-precision FP) The following addressing modes are supported: * register offset with additional immediate offset (4 instructions): flr, fsr * zero-extended register offset with additional immediate offset (4 instructions): flur, fsur These addressing modes are also part of the similar XTheadMemIdx ISA extension support, whose code is reused and extended to support floating-point registers. One challenge that this patch needs to solve are GP registers in FP-mode (e.g. "(reg:DF a2)"), which cannot be handled by the XTheadFMemIdx instructions. Such registers are the result of independent optimizations, which can happen after register allocation. This patch uses a simple but efficient method to address this: add a dependency for XTheadMemIdx to XTheadFMemIdx optimizations. This allows to use the instructions from XTheadMemIdx in case of such registers. The added tests ensure that this feature won't regress without notice. Testing: GCC regression test suite and SPEC CPU 2017 intrate (base&peak). Signed-off-by: Christoph Müllner gcc/ChangeLog: * config/riscv/riscv.cc (riscv_index_reg_class): Return GR_REGS for XTheadFMemIdx. (riscv_regno_ok_for_index_p): Add support for XTheadFMemIdx. * config/riscv/riscv.h (HARDFP_REG_P): New macro. * config/riscv/thead.cc (is_fmemidx_mode): New function. (th_memidx_classify_address_index): Add support for XTheadFMemIdx. (th_fmemidx_output_index): New function. (th_output_move): Add support for XTheadFMemIdx. * config/riscv/thead.md (TH_M_ANYF): New mode iterator. (TH_M_NOEXTF): Likewise. (*th_fmemidx_movsf_hardfloat): New INSN. (*th_fmemidx_movdf_hardfloat_rv64): Likewise. (*th_fmemidx_I_a): Likewise. (*th_fmemidx_I_c): Likewise. (*th_fmemidx_US_a): Likewise. (*th_fmemidx_US_c): Likewise. (*th_fmemidx_UZ_a): Likewise. (*th_fmemidx_UZ_c): Likewise. gcc/testsuite/ChangeLog: * gcc.target/riscv/xtheadfmemidx-index-update.c: New test. * gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c: New test. * gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c: New test. * gcc.target/riscv/xtheadfmemidx-index.c: New test. * gcc.target/riscv/xtheadfmemidx-uindex-update.c: New test. * gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c: New test. * gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c: New test. * gcc.target/riscv/xtheadfmemidx-uindex.c: New test. Signed-off-by: Christoph Müllner --- gcc/config/riscv/riscv.cc | 4 +- gcc/config/riscv/riscv.h | 2 + gcc/config/riscv/thead.cc | 69 +++++++- gcc/config/riscv/thead.md | 161 ++++++++++++++++++ .../riscv/xtheadfmemidx-index-update.c | 20 +++ .../xtheadfmemidx-index-xtheadbb-update.c | 20 +++ .../riscv/xtheadfmemidx-index-xtheadbb.c | 22 +++ .../gcc.target/riscv/xtheadfmemidx-index.c | 22 +++ .../riscv/xtheadfmemidx-uindex-update.c | 20 +++ .../xtheadfmemidx-uindex-xtheadbb-update.c | 20 +++ .../riscv/xtheadfmemidx-uindex-xtheadbb.c | 24 +++ .../gcc.target/riscv/xtheadfmemidx-uindex.c | 25 +++ 12 files changed, 404 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c create mode 100644 gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index de6d9734da0..0148a4f2e43 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -1084,7 +1084,7 @@ riscv_regno_mode_ok_for_base_p (int regno, enum reg_class riscv_index_reg_class () { - if (TARGET_XTHEADMEMIDX) + if (TARGET_XTHEADMEMIDX || TARGET_XTHEADFMEMIDX) return GR_REGS; return NO_REGS; @@ -1097,7 +1097,7 @@ riscv_index_reg_class () int riscv_regno_ok_for_index_p (int regno) { - if (TARGET_XTHEADMEMIDX) + if (TARGET_XTHEADMEMIDX || TARGET_XTHEADFMEMIDX) return riscv_regno_mode_ok_for_base_p (regno, VOIDmode, 1); return 0; diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h index eb162abcb92..1e9813b4f39 100644 --- a/gcc/config/riscv/riscv.h +++ b/gcc/config/riscv/riscv.h @@ -372,6 +372,8 @@ ASM_MISA_SPEC ((unsigned int) ((int) (REGNO) - GP_REG_FIRST) < GP_REG_NUM) #define FP_REG_P(REGNO) \ ((unsigned int) ((int) (REGNO) - FP_REG_FIRST) < FP_REG_NUM) +#define HARDFP_REG_P(REGNO) \ + ((REGNO) >= FP_REG_FIRST && (REGNO) <= FP_REG_LAST) #define V_REG_P(REGNO) \ ((unsigned int) ((int) (REGNO) - V_REG_FIRST) < V_REG_NUM) #define VL_REG_P(REGNO) ((REGNO) == VL_REGNUM) diff --git a/gcc/config/riscv/thead.cc b/gcc/config/riscv/thead.cc index 237d96ff4b7..a485fb1fba6 100644 --- a/gcc/config/riscv/thead.cc +++ b/gcc/config/riscv/thead.cc @@ -614,6 +614,18 @@ is_memidx_mode (machine_mode mode) return false; } +static bool +is_fmemidx_mode (machine_mode mode) +{ + if (mode == SFmode && TARGET_HARD_FLOAT) + return true; + + if (mode == DFmode && TARGET_DOUBLE_FLOAT) + return true; + + return false; +} + /* Return true if X is a valid address for T-Head's memory addressing modes with scaled register offsets for machine mode MODE. If it is, fill in INFO appropriately (if non-NULL). @@ -624,7 +636,8 @@ th_memidx_classify_address_index (struct riscv_address_info *info, rtx x, machine_mode mode, bool strict_p) { /* Ensure that the mode is supported. */ - if (!(TARGET_XTHEADMEMIDX && is_memidx_mode (mode))) + if (!(TARGET_XTHEADMEMIDX && is_memidx_mode (mode)) + && !(TARGET_XTHEADFMEMIDX && is_fmemidx_mode (mode))) return false; if (GET_CODE (x) != PLUS) @@ -781,6 +794,44 @@ th_memidx_output_index (rtx dest, rtx src, machine_mode mode, bool load) return ""; } +/* Provide a buffer for a th.flX/th.fluX/th.fsX/th.fsuX instruction + for the given MODE. If LOAD is true, a load instruction will be + provided (otherwise, a store instruction). If X is not suitable + return NULL. */ + +static const char * +th_fmemidx_output_index (rtx dest, rtx src, machine_mode mode, bool load) +{ + struct riscv_address_info info; + char format[24]; + rtx output_operands[2]; + rtx x = th_get_move_mem_addr (dest, src, load); + + /* Validate x. */ + if (!th_memidx_classify_address_index (&info, x, mode, false)) + return NULL; + + int index = exact_log2 (GET_MODE_SIZE (mode).to_constant ()) - 2; + bool uindex = info.type == ADDRESS_REG_UREG; + + const char *const insn[][2] = { + { + "th.fs%srw\t%%z1,%%0", + "th.fs%srd\t%%z1,%%0" + }, + { + "th.fl%srw\t%%0,%%1", + "th.fl%srd\t%%0,%%1" + } + }; + + snprintf (format, sizeof (format), insn[load][index], uindex ? "u" : ""); + output_operands[0] = dest; + output_operands[1] = src; + output_asm_insn (format, output_operands); + return ""; +} + /* Return true if X is a valid address for T-Head's memory addressing modes for machine mode MODE. If it is, fill in INFO appropriately (if non-NULL). If STRICT_P is true then REG_OK_STRICT is in effect. */ @@ -831,24 +882,36 @@ th_output_move (rtx dest, rtx src) if (dest_code == REG && src_code == MEM) { - if (GET_MODE_CLASS (mode) == MODE_INT) + if (GET_MODE_CLASS (mode) == MODE_INT + || (GET_MODE_CLASS (mode) == MODE_FLOAT && GP_REG_P (REGNO (dest)))) { if ((insn = th_memidx_output_index (dest, src, mode, true))) return insn; if ((insn = th_memidx_output_modify (dest, src, mode, true))) return insn; } + else if (GET_MODE_CLASS (mode) == MODE_FLOAT && HARDFP_REG_P (REGNO (dest))) + { + if ((insn = th_fmemidx_output_index (dest, src, mode, true))) + return insn; + } } else if (dest_code == MEM && (src_code == REG || src == CONST0_RTX (mode))) { if (GET_MODE_CLASS (mode) == MODE_INT - || src == CONST0_RTX (mode)) + || src == CONST0_RTX (mode) + || (GET_MODE_CLASS (mode) == MODE_FLOAT && GP_REG_P (REGNO (src)))) { if ((insn = th_memidx_output_index (dest, src, mode, false))) return insn; if ((insn = th_memidx_output_modify (dest, src, mode, false))) return insn; } + else if (GET_MODE_CLASS (mode) == MODE_FLOAT && HARDFP_REG_P (REGNO (src))) + { + if ((insn = th_fmemidx_output_index (dest, src, mode, false))) + return insn; + } } return NULL; } diff --git a/gcc/config/riscv/thead.md b/gcc/config/riscv/thead.md index dfcb6d926ec..2babfafb23c 100644 --- a/gcc/config/riscv/thead.md +++ b/gcc/config/riscv/thead.md @@ -587,15 +587,24 @@ (define_insn "*th_memidx_bb_extendqi2" [(set_attr "move_type" "shift_shift,load,load,load,load,load") (set_attr "mode" "")]) +;; All modes that are supported by XTheadMemIdx (define_mode_iterator TH_M_ANYI [(QI "TARGET_XTHEADMEMIDX") (HI "TARGET_XTHEADMEMIDX") (SI "TARGET_XTHEADMEMIDX") (DI "TARGET_64BIT && TARGET_XTHEADMEMIDX")]) +;; All modes that are supported by XTheadFMemIdx +(define_mode_iterator TH_M_ANYF [(SF "TARGET_HARD_FLOAT && TARGET_XTHEADFMEMIDX") + (DF "TARGET_DOUBLE_FLOAT && TARGET_XTHEADFMEMIDX")]) + ;; All non-extension modes that are supported by XTheadMemIdx (define_mode_iterator TH_M_NOEXTI [(SI "!TARGET_64BIT && TARGET_XTHEADMEMIDX") (DI "TARGET_64BIT && TARGET_XTHEADMEMIDX")]) +;; All non-extension modes that are supported by XTheadFMemIdx +(define_mode_iterator TH_M_NOEXTF [(SF "TARGET_HARD_FLOAT && TARGET_XTHEADFMEMIDX") + (DF "TARGET_DOUBLE_FLOAT && TARGET_XTHEADFMEMIDX")]) + ;; XTheadMemIdx optimizations ;; All optimizations attempt to improve the operand utilization of ;; XTheadMemIdx instructions, where one sign or zero extended @@ -812,4 +821,156 @@ (define_insn_and_split "*th_memidx_UZ_c" (match_dup 0))] ) +;; XTheadFMemIdx + +(define_insn "*th_fmemidx_movsf_hardfloat" + [(set (match_operand:SF 0 "nonimmediate_operand" "=f,th_m_mir,f,th_m_miu") + (match_operand:SF 1 "move_operand" " th_m_mir,f,th_m_miu,f"))] + "TARGET_HARD_FLOAT && TARGET_XTHEADFMEMIDX + && (register_operand (operands[0], SFmode) + || reg_or_0_operand (operands[1], SFmode))" + { return riscv_output_move (operands[0], operands[1]); } + [(set_attr "move_type" "fpload,fpstore,fpload,fpstore") + (set_attr "mode" "SF")]) + +(define_insn "*th_fmemidx_movdf_hardfloat_rv64" + [(set (match_operand:DF 0 "nonimmediate_operand" "=f,th_m_mir,f,th_m_miu") + (match_operand:DF 1 "move_operand" " th_m_mir,f,th_m_miu,f"))] + "TARGET_64BIT && TARGET_DOUBLE_FLOAT && TARGET_XTHEADFMEMIDX + && (register_operand (operands[0], DFmode) + || reg_or_0_operand (operands[1], DFmode))" + { return riscv_output_move (operands[0], operands[1]); } + [(set_attr "move_type" "fpload,fpstore,fpload,fpstore") + (set_attr "mode" "DF")]) + +;; XTheadFMemIdx optimizations +;; Similar like XTheadMemIdx optimizations, but less cases. +;; Note, that we might get GP registers in FP-mode (reg:DF a2) +;; which cannot be handled by the XTheadFMemIdx instructions. +;; This might even happend after register allocation. +;; We could implement splitters that undo the combiner results +;; if "after_reload && !HARDFP_REG_P (operands[0])", but this +;; raises even more questions (e.g. split into what?). +;; So let's solve this by simply requiring XTheadMemIdx +;; which provides the necessary instructions to cover this case. + +(define_insn_and_split "*th_fmemidx_I_a" + [(set (match_operand:TH_M_NOEXTF 0 "register_operand" "=f") + (mem:TH_M_NOEXTF (plus:X + (mult:X (match_operand:X 1 "register_operand" "r") + (match_operand:QI 2 "immediate_operand" "i")) + (match_operand:X 3 "register_operand" "r"))))] + "TARGET_XTHEADMEMIDX && TARGET_XTHEADFMEMIDX + && CONST_INT_P (operands[2]) + && pow2p_hwi (INTVAL (operands[2])) + && IN_RANGE (exact_log2 (INTVAL (operands[2])), 1, 3)" + "#" + "&& 1" + [(set (match_dup 0) + (mem:TH_M_NOEXTF (plus:X + (match_dup 3) + (ashift:X (match_dup 1) (match_dup 2)))))] + { operands[2] = GEN_INT (exact_log2 (INTVAL (operands [2]))); + } +) + +(define_insn_and_split "*th_fmemidx_I_c" + [(set (mem:TH_M_ANYF (plus:X + (mult:X (match_operand:X 1 "register_operand" "r") + (match_operand:QI 2 "immediate_operand" "i")) + (match_operand:X 3 "register_operand" "r"))) + (match_operand:TH_M_ANYF 0 "register_operand" "f"))] + "TARGET_XTHEADMEMIDX && TARGET_XTHEADFMEMIDX + && CONST_INT_P (operands[2]) + && pow2p_hwi (INTVAL (operands[2])) + && IN_RANGE (exact_log2 (INTVAL (operands[2])), 1, 3)" + "#" + "&& 1" + [(set (mem:TH_M_ANYF (plus:X + (match_dup 3) + (ashift:X (match_dup 1) (match_dup 2)))) + (match_dup 0))] + { operands[2] = GEN_INT (exact_log2 (INTVAL (operands [2]))); + } +) + +(define_insn_and_split "*th_fmemidx_US_a" + [(set (match_operand:TH_M_NOEXTF 0 "register_operand" "=f") + (mem:TH_M_NOEXTF (plus:DI + (and:DI + (mult:DI (match_operand:DI 1 "register_operand" "r") + (match_operand:QI 2 "immediate_operand" "i")) + (match_operand:DI 3 "immediate_operand" "i")) + (match_operand:DI 4 "register_operand" "r"))))] + "TARGET_64BIT && TARGET_XTHEADMEMIDX && TARGET_XTHEADFMEMIDX + && CONST_INT_P (operands[2]) + && pow2p_hwi (INTVAL (operands[2])) + && IN_RANGE (exact_log2 (INTVAL (operands[2])), 1, 3) + && CONST_INT_P (operands[3]) + && (INTVAL (operands[3]) >> exact_log2 (INTVAL (operands[2]))) == 0xffffffff" + "#" + "&& 1" + [(set (match_dup 0) + (mem:TH_M_NOEXTF (plus:DI + (match_dup 4) + (ashift:DI (zero_extend:DI (match_dup 1)) (match_dup 2)))))] + { operands[1] = gen_lowpart (SImode, operands[1]); + operands[2] = GEN_INT (exact_log2 (INTVAL (operands [2]))); + } +) + +(define_insn_and_split "*th_fmemidx_US_c" + [(set (mem:TH_M_ANYF (plus:DI + (and:DI + (mult:DI (match_operand:DI 1 "register_operand" "r") + (match_operand:QI 2 "immediate_operand" "i")) + (match_operand:DI 3 "immediate_operand" "i")) + (match_operand:DI 4 "register_operand" "r"))) + (match_operand:TH_M_ANYF 0 "register_operand" "f"))] + "TARGET_64BIT && TARGET_XTHEADMEMIDX && TARGET_XTHEADFMEMIDX + && CONST_INT_P (operands[2]) + && pow2p_hwi (INTVAL (operands[2])) + && IN_RANGE (exact_log2 (INTVAL (operands[2])), 1, 3) + && CONST_INT_P (operands[3]) + && (INTVAL (operands[3]) >> exact_log2 (INTVAL (operands[2]))) == 0xffffffff" + "#" + "&& 1" + [(set (mem:TH_M_ANYF (plus:DI + (match_dup 4) + (ashift:DI (zero_extend:DI (match_dup 1)) (match_dup 2)))) + (match_dup 0))] + { operands[1] = gen_lowpart (SImode, operands[1]); + operands[2] = GEN_INT (exact_log2 (INTVAL (operands [2]))); + } +) + +(define_insn_and_split "*th_fmemidx_UZ_a" + [(set (match_operand:TH_M_NOEXTF 0 "register_operand" "=f") + (mem:TH_M_NOEXTF (plus:DI + (zero_extend:DI (match_operand:SI 1 "register_operand" "r")) + (match_operand:DI 2 "register_operand" "r"))))] + "TARGET_64BIT && TARGET_XTHEADMEMIDX && TARGET_XTHEADFMEMIDX + && (!HARD_REGISTER_NUM_P (REGNO (operands[0])) || HARDFP_REG_P (REGNO (operands[0])))" + "#" + "&& 1" + [(set (match_dup 0) + (mem:TH_M_NOEXTF (plus:DI + (match_dup 2) + (zero_extend:DI (match_dup 1)))))] +) + +(define_insn_and_split "*th_fmemidx_UZ_c" + [(set (mem:TH_M_ANYF (plus:DI + (zero_extend:DI (match_operand:SI 1 "register_operand" "r")) + (match_operand:DI 2 "register_operand" "r"))) + (match_operand:TH_M_ANYF 0 "register_operand" "f"))] + "TARGET_64BIT && TARGET_XTHEADMEMIDX && TARGET_XTHEADFMEMIDX" + "#" + "&& 1" + [(set (mem:TH_M_ANYF (plus:DI + (match_dup 2) + (zero_extend:DI (match_dup 1)))) + (match_dup 0))] +) + (include "thead-peephole.md") diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c new file mode 100644 index 00000000000..24bbb63d174 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LR_REG_IMM_UPD(float, 0) +#if __riscv_xlen == 64 +LR_REG_IMM_UPD(double, 2) +#endif + +SR_REG_IMM_UPD(float, 1) +#if __riscv_xlen == 64 +SR_REG_IMM_UPD(double, 3) +#endif + +/* If the shifted value is used later, we cannot eliminate it. */ +/* { dg-final { scan-assembler-times {\mslli\M} 1 { target { rv32 } } } } */ +/* { dg-final { scan-assembler-times {\mslli\M} 3 { target { rv64 } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c new file mode 100644 index 00000000000..3b931a4b980 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LR_REG_IMM_UPD(float, 0) +#if __riscv_xlen == 64 +LR_REG_IMM_UPD(double, 2) +#endif + +SR_REG_IMM_UPD(float, 1) +#if __riscv_xlen == 64 +SR_REG_IMM_UPD(double, 3) +#endif + +/* If the shifted value is used later, we cannot eliminate it. */ +/* { dg-final { scan-assembler-times {\mslli\M} 1 { target { rv32 } } } } */ +/* { dg-final { scan-assembler-times {\mslli\M} 3 { target { rv64 } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c new file mode 100644 index 00000000000..48858605c24 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LR_REG_IMM(float, 0) +/* { dg-final { scan-assembler-times {\mth\.flrw\t[^\n\r]*0\M} 1 } } */ +#if __riscv_xlen == 64 +LR_REG_IMM(double, 2) +/* { dg-final { scan-assembler-times {\mth\.flrd\t[^\n\r]*2\M} 1 { target { rv64 } } } } */ +#endif + +SR_REG_IMM(float, 1) +/* { dg-final { scan-assembler-times {\mth\.fsrw\t[^\n\r]*1\M} 1 } } */ +#if __riscv_xlen == 64 +SR_REG_IMM(double, 3) +/* { dg-final { scan-assembler-times {\mth\.fsrd\t[^\n\r]*3\M} 1 { target { rv64 } } } } */ +#endif + +/* { dg-final { scan-assembler-not "slli" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c new file mode 100644 index 00000000000..1bb231a9e88 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LR_REG_IMM(float, 0) +/* { dg-final { scan-assembler-times {\mth\.flrw\t[^\n\r]*0\M} 1 } } */ +#if __riscv_xlen == 64 +LR_REG_IMM(double, 2) +/* { dg-final { scan-assembler-times {\mth\.flrd\t[^\n\r]*2\M} 1 { target { rv64 } } } } */ +#endif + +SR_REG_IMM(float, 1) +/* { dg-final { scan-assembler-times {\mth\.fsrw\t[^\n\r]*1\M} 1 } } */ +#if __riscv_xlen == 64 +SR_REG_IMM(double, 3) +/* { dg-final { scan-assembler-times {\mth\.fsrd\t[^\n\r]*3\M} 1 { target { rv64 } } } } */ +#endif + +/* { dg-final { scan-assembler-not {\mslli\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c new file mode 100644 index 00000000000..bc50fa799e0 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LRU_REG_IMM_UPD(float, 0) +#if __riscv_xlen == 64 +LRU_REG_IMM_UPD(double, 2) +#endif + +SRU_REG_IMM_UPD(float, 1) +#if __riscv_xlen == 64 +SRU_REG_IMM_UPD(double, 3) +#endif + +/* If the shifted value is used later, we cannot eliminate it. */ +/* { dg-final { scan-assembler-times {\mslli\M} 1 { target { rv32 } } } } */ +/* { dg-final { scan-assembler-times {\mslli\M} 3 { target { rv64 } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c new file mode 100644 index 00000000000..242be7af4a4 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LRU_REG_IMM_UPD(float, 0) +#if __riscv_xlen == 64 +LRU_REG_IMM_UPD(double, 2) +#endif + +SRU_REG_IMM_UPD(float, 1) +#if __riscv_xlen == 64 +SRU_REG_IMM_UPD(double, 3) +#endif + +/* If the shifted value is used later, we cannot eliminate it. */ +/* { dg-final { scan-assembler-times {\mslli\M} 1 { target { rv32 } } } } */ +/* { dg-final { scan-assembler-times {\mslli\M} 3 { target { rv64 } } } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c new file mode 100644 index 00000000000..e2a4f36796f --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LRU_REG_IMM(float, 0) +/* { dg-final { scan-assembler-times {\mth\.flurw\t[^\n\r]*0\M} 1 { target { rv64 } } } } */ +/* { dg-final { scan-assembler-times {\mth\.flrw\t[^\n\r]*0\M} 1 { target { rv32 } } } } */ +#if __riscv_xlen == 64 +LRU_REG_IMM(double, 2) +/* { dg-final { scan-assembler-times {\mth\.flurd\t[^\n\r]*2\M} 1 { target { rv64 } } } } */ +#endif + +SRU_REG_IMM(float, 1) +/* { dg-final { scan-assembler-times {\mth\.fsurw\t[^\n\r]*1\M} 1 { target { rv64 } } } } */ +/* { dg-final { scan-assembler-times {\mth\.fsrw\t[^\n\r]*1\M} 1 { target { rv32 } } } } */ +#if __riscv_xlen == 64 +SRU_REG_IMM(double, 3) +/* { dg-final { scan-assembler-times {\mth\.fsurd\t[^\n\r]*3\M} 1 { target { rv64 } } } } */ +#endif + +/* { dg-final { scan-assembler-not {\mslli\M} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c new file mode 100644 index 00000000000..32783ebed03 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 } } } */ +/* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" { target { rv32 } } } */ + +#include "xtheadmemidx-helpers.h" + +LRU_REG_IMM(float, 0) +/* { dg-final { scan-assembler-times {\mth\.flurw\t[^\n\r]*0\M} 1 { target { rv64 } } } } */ +/* { dg-final { scan-assembler-times {\mth\.flrw\t[^\n\r]*0\M} 1 { target { rv32 } } } } */ +#if __riscv_xlen == 64 +LRU_REG_IMM(double, 2) +/* { dg-final { scan-assembler-times {\mth\.flurd\t[^\n\r]*2\M} 1 { target { rv64 } } } } */ +#endif + +SRU_REG_IMM(float, 1) +/* { dg-final { scan-assembler-times {\mth\.fsurw\t[^\n\r]*1\M} 1 { target { rv64 } } } } */ +/* { dg-final { scan-assembler-times {\mth\.fsrw\t[^\n\r]*1\M} 1 { target { rv32 } } } } */ +#if __riscv_xlen == 64 +SRU_REG_IMM(double, 3) +/* { dg-final { scan-assembler-times {\mth\.fsurd\t[^\n\r]*3\M} 1 { target { rv64 } } } } */ +#endif + +/* { dg-final { scan-assembler-not {\mslli\M} } } */ +