From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id C3DC638618DE for ; Sun, 29 Oct 2023 22:25:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C3DC638618DE Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C3DC638618DE Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698618336; cv=none; b=HKoNWpvLH5Q4SbGmh/yqYzoas1la6EgGZMhUQkqy1tmVEauEExNI1pUbc3fL8Ml3fMbxoWphzkJFwUGbwSgtjBFNXv2GwCTbTGqaRnqLbKv5345pwS2pf2JCYKvV5YVeCmUkw9yrqhnoA5adBVWMEoFRfscGz4dsZac60LgAgDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698618336; c=relaxed/simple; bh=Q0si4m+/dH7nus4SDFZaQLOQlwAAu9CWDSf7zJaxXE0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=iZ8K5L5HbsTBUIM41KXv+YLnIum20U+bIERn2C51SICpH9qsNR5Eb0MbLZE5FFjNxRAlgSHBbApassApqfw81qwb8iRUlnXBiw++VV+HN07IjIxlzcYl6yX6JjaS4XHCDykbJvr9QVRHStP09ZqN5E0e6IbET+wJSnUOJEyU9bY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5aaebfac4b0so2211972a12.2 for ; Sun, 29 Oct 2023 15:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698618333; x=1699223133; darn=gcc.gnu.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=NyI1CBBraVMt6zYffYZJdQks1zpk/y9bv5rWpyjSOYY=; b=FcJmYwSv3pxMGDCzPflODFySORcOSrPtd8D9jWsQUXAM7Z1XeYbn+aShUHELKjmqgm RkFPTSnQNhWTLOe83xxuxzoX718TnyESLdxvYaFricpLQ0NXELtiMC72iTYHodn+goT1 27bOF6pN8VNbDqEqOR1POFx3W6lk161C7H56lj+MokCVRNsvBprxRNmEPMbaM8kuKpUZ l8l/f4RrCechZB5CGuP/WssN4AjVw3rA0L7uMwx23H4tgemmXU+/nZt4Ww/ru8KYgEZj SPPhSNJQ0OCAfI5h7iYSAxuPF4k8L6lcFDK7TM51yTW1xGG3FUHWWxKVN3KAzLRhDl6O 8Zfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698618333; x=1699223133; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NyI1CBBraVMt6zYffYZJdQks1zpk/y9bv5rWpyjSOYY=; b=ESWn76TDAjbF2MwLV2Oh0t2ns/+JSQmB2rbjZsnBPp4N6WWuJ0wRDw3PdL1Yv5+gaG MtbNoT+TkpuvYueBRP0dnwbemTySWhlAhzSjtY8XscjF1wHDQpSyHKs+PFZ1HbqItmwv 2xN9+1iR4EHmm/PPus3DJLsMb0vNngmVqVLpRMQHSZMWTYJBGqzHhiCUoWUOhSFN4IMo Xb5WN5Jemx4q7BR0OaP3jaTyTSMLCnK7MvCAX18ms0hcYZhEH0en0ZKjoaUOR5XACeV5 nioenmy3Es+d5UpONCs0qlGyjqGvBR7uDDLXTP8BMqtEvqBKcIylPcvrU4y8GfPThDdK I2lQ== X-Gm-Message-State: AOJu0Yzv3U7wPwwOprsF9iWytHSpSEPGDuRkS7TCEBNvlt/pnbhX239u 4buNKttqu4sQVUY6wkIj73c= X-Google-Smtp-Source: AGHT+IGxOYTeTnb0dUokFFfFjE8qWVjw682jtiOm918gEhqZnItl1MtBWgKUhaiVp76Buz42EdWuog== X-Received: by 2002:a17:902:db09:b0:1cc:3065:9167 with SMTP id m9-20020a170902db0900b001cc30659167mr3331599plx.23.1698618333419; Sun, 29 Oct 2023 15:25:33 -0700 (PDT) Received: from [172.31.0.109] ([136.36.130.248]) by smtp.gmail.com with ESMTPSA id a5-20020a170902ecc500b001ca4ad86369sm1799416plh.236.2023.10.29.15.25.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Oct 2023 15:25:32 -0700 (PDT) Message-ID: Date: Sun, 29 Oct 2023 16:25:27 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/2] riscv: thead: Add support for the XTheadFMemIdx ISA extension Content-Language: en-US To: Christoph Muellner , gcc-patches@gcc.gnu.org, Kito Cheng , Jim Wilson , Palmer Dabbelt , Andrew Waterman , Philipp Tomsich References: <20231020095348.2455729-1-christoph.muellner@vrull.eu> <20231020095348.2455729-3-christoph.muellner@vrull.eu> From: Jeff Law In-Reply-To: <20231020095348.2455729-3-christoph.muellner@vrull.eu> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_MANYTO,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,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 List-Id: On 10/20/23 03:53, Christoph Muellner wrote: > 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. Or alternately define secondary reloads so that you can get a scratch register to reload the address into a GPR. Your call on whether or not to try to implement that. I guess it largely depends on how likely it is you'll have one extension defined, but not the other. > > 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. > --- Same note as with the prior patch WRT wrapping assembly instructions when using scan-assembler. > 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) > @@ -755,6 +768,40 @@ th_memidx_output_index (rtx x, machine_mode mode, bool load) > return buf; > } > > +/* 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 x, machine_mode mode, bool load) > +{ > + struct riscv_address_info info; > + static char buf[128] = {0}; Same comment WRT static buffers as in the previous patch. OK for the trunk after fixing the testcases and potentially adjusting the static buffer. No need to get another review round, post for for the archiver and commit. jeff