| Message ID | 6210fc0f-caaf-7bf8-4ab1-ec08760914d7@embecosm.com |
|---|---|
| State | Committed |
| Commit | 63f198553d3940495bfaa49da30b2ce93375c916 |
| Headers |
Return-Path: <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9E85D384B075 for <patchwork@sourceware.org>; Wed, 25 May 2022 13:26:03 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by sourceware.org (Postfix) with ESMTPS id 0A00B3856DC1 for <gcc-patches@gcc.gnu.org>; Wed, 25 May 2022 13:25:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0A00B3856DC1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x32a.google.com with SMTP id c9-20020a7bc009000000b0039750ec5774so3336238wmb.5 for <gcc-patches@gcc.gnu.org>; Wed, 25 May 2022 06:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=message-id:date:mime-version:user-agent:to:cc:from:subject :content-transfer-encoding; bh=hA7HGqzTzhRN4z7d3UsGwiYxIOQp5q6wqjPU0gPWN4I=; b=Qi3o5M1CTx3p2mBA+nOebVWKtXNkSRvuwsRW9WtaQErNYWRWTQMnFYJBG5zd0bCTUW O9vBBJzw55GCC+bNoVhwsiJVeI3/IiPRmIa3+ayrBi11NKNj9A44PwgLcc5TJSgZ2KDh 3dBoJ+Zh75amjHGeQonaWc4gFfeYoTp/skdVw/bZupg6ZqHLPR4j79EY7xm7sddIU/rM /2tEHJ65aKMzqh85Wjyco+iX1f/eQlJZzX5PBjkGEMTjUUqaUYVvJ/d5jGbGqj2sFKCF GD+n7MLlOhV+JPcXFqyAiLncbhX22V0S8/B+4zyCbtwoU1n3tASWkwfHF2U8C2UKxre/ D9Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:to:cc :from:subject:content-transfer-encoding; bh=hA7HGqzTzhRN4z7d3UsGwiYxIOQp5q6wqjPU0gPWN4I=; b=isxlaIqztP3gMVslAYVhTGEU6RK8zbc1KNwFd4U9x5NlI5eJUN/Z2aBwryOjS+TA3D YDm59xulExUkzcK40dOWkrvBhPJqXm4Kt/dcKWkKp054QkRM0YiFbBzeldyfNoKekh5g d5QFcKt+5XpEKrJaRUxhPf98ZKllllMpVDUBoXBHMxGdYCx/zQat4o+5pQOI+Yqmc7zr 7fK4VlWs3Y0vFAqe+pocL9sWw21kEnAUGM+wGEprmzAVDOrNPBnKSQJAmJONvr1I917c vwWBmlDRciU/QB9G+HsraOy7JUqkkZwxVrIZMDTZG8vQmbUix8GHbRbnTVcRe37JZt1O MpwA== X-Gm-Message-State: AOAM5312PUshNnV18uslulGSWWF7qXqjeS453OYb36O/tlmmk2Q8unOy VqMns5airw/FQbRS8iJfs6j1NSWXdVZi7A== X-Google-Smtp-Source: ABdhPJyGQiB52n4MYVLSU7uppnKtYNFgiEHEmAVftNR3ajdqveVNosJLRsaxVGd4bngpV76IOHHgUA== X-Received: by 2002:a05:600c:34d4:b0:394:91a8:104b with SMTP id d20-20020a05600c34d400b0039491a8104bmr8168608wmq.134.1653485145203; Wed, 25 May 2022 06:25:45 -0700 (PDT) Received: from [192.168.0.121] ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id 10-20020a5d47aa000000b0020c5253d8casm2294981wrb.22.2022.05.25.06.25.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 May 2022 06:25:44 -0700 (PDT) Message-ID: <6210fc0f-caaf-7bf8-4ab1-ec08760914d7@embecosm.com> Date: Wed, 25 May 2022 14:25:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 To: gcc-patches@gcc.gnu.org From: Simon Cook <simon.cook@embecosm.com> Subject: [PATCH] RISC-V: Don't unconditionally add m,a,f,d in arch-canonicalize Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GAPPY_SUBJECT, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> Cc: kito.cheng@gmail.com Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> |
| Series |
RISC-V: Don't unconditionally add m,a,f,d in arch-canonicalize
|
|
Commit Message
Simon Cook
May 25, 2022, 1:25 p.m. UTC
This solves an issue where rv32i, etc. are canonicalized to rv32imafd since the g->i addition of 'm', 'a', 'f', 'd' is not actually gated by whether the input was rv32g/rv64g. gcc/ChangeLog: * config/riscv/arch-canonicalize: Only add mafd extension if base was rv32/rv64g. --- gcc/config/riscv/arch-canonicalize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Committed, Thanks for fixing my stupid bug :P On Wed, May 25, 2022 at 9:26 PM Simon Cook <simon.cook@embecosm.com> wrote: > > This solves an issue where rv32i, etc. are canonicalized to rv32imafd > since the g->i addition of 'm', 'a', 'f', 'd' is not actually gated by > whether the input was rv32g/rv64g. > > gcc/ChangeLog: > > * config/riscv/arch-canonicalize: Only add mafd extension if > base was rv32/rv64g. > --- > gcc/config/riscv/arch-canonicalize | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gcc/config/riscv/arch-canonicalize > b/gcc/config/riscv/arch-canonicalize > index 71b2232b29e..fd7651ac491 100755 > --- a/gcc/config/riscv/arch-canonicalize > +++ b/gcc/config/riscv/arch-canonicalize > @@ -73,8 +73,8 @@ def arch_canonicalize(arch, isa_spec): > std_exts = [] > if arch[:5] in ['rv32e', 'rv32i', 'rv32g', 'rv64i', 'rv64g']: > new_arch = arch[:5].replace("g", "i") > - std_exts = ['m', 'a', 'f', 'd'] > if arch[:5] in ['rv32g', 'rv64g']: > + std_exts = ['m', 'a', 'f', 'd'] > if not is_isa_spec_2p2: > extra_long_ext = ['zicsr', 'zifencei'] > else: > -- > 2.32.1
On Wed, 25 May 2022 07:00:11 PDT (-0700), gcc-patches@gcc.gnu.org wrote: > Committed, Thanks for fixing my stupid bug :P IMO this is a good candidate for a backport. > On Wed, May 25, 2022 at 9:26 PM Simon Cook <simon.cook@embecosm.com> wrote: >> >> This solves an issue where rv32i, etc. are canonicalized to rv32imafd >> since the g->i addition of 'm', 'a', 'f', 'd' is not actually gated by >> whether the input was rv32g/rv64g. >> >> gcc/ChangeLog: >> >> * config/riscv/arch-canonicalize: Only add mafd extension if >> base was rv32/rv64g. >> --- >> gcc/config/riscv/arch-canonicalize | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/gcc/config/riscv/arch-canonicalize >> b/gcc/config/riscv/arch-canonicalize >> index 71b2232b29e..fd7651ac491 100755 >> --- a/gcc/config/riscv/arch-canonicalize >> +++ b/gcc/config/riscv/arch-canonicalize >> @@ -73,8 +73,8 @@ def arch_canonicalize(arch, isa_spec): >> std_exts = [] >> if arch[:5] in ['rv32e', 'rv32i', 'rv32g', 'rv64i', 'rv64g']: >> new_arch = arch[:5].replace("g", "i") >> - std_exts = ['m', 'a', 'f', 'd'] >> if arch[:5] in ['rv32g', 'rv64g']: >> + std_exts = ['m', 'a', 'f', 'd'] >> if not is_isa_spec_2p2: >> extra_long_ext = ['zicsr', 'zifencei'] >> else: >> -- >> 2.32.1
Back ported to releases/gcc-11 and releases/gcc-12 branch :) On Thu, May 26, 2022 at 5:33 AM Palmer Dabbelt <palmer@dabbelt.com> wrote: > > On Wed, 25 May 2022 07:00:11 PDT (-0700), gcc-patches@gcc.gnu.org wrote: > > Committed, Thanks for fixing my stupid bug :P > > IMO this is a good candidate for a backport. > > > On Wed, May 25, 2022 at 9:26 PM Simon Cook <simon.cook@embecosm.com> wrote: > >> > >> This solves an issue where rv32i, etc. are canonicalized to rv32imafd > >> since the g->i addition of 'm', 'a', 'f', 'd' is not actually gated by > >> whether the input was rv32g/rv64g. > >> > >> gcc/ChangeLog: > >> > >> * config/riscv/arch-canonicalize: Only add mafd extension if > >> base was rv32/rv64g. > >> --- > >> gcc/config/riscv/arch-canonicalize | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/gcc/config/riscv/arch-canonicalize > >> b/gcc/config/riscv/arch-canonicalize > >> index 71b2232b29e..fd7651ac491 100755 > >> --- a/gcc/config/riscv/arch-canonicalize > >> +++ b/gcc/config/riscv/arch-canonicalize > >> @@ -73,8 +73,8 @@ def arch_canonicalize(arch, isa_spec): > >> std_exts = [] > >> if arch[:5] in ['rv32e', 'rv32i', 'rv32g', 'rv64i', 'rv64g']: > >> new_arch = arch[:5].replace("g", "i") > >> - std_exts = ['m', 'a', 'f', 'd'] > >> if arch[:5] in ['rv32g', 'rv64g']: > >> + std_exts = ['m', 'a', 'f', 'd'] > >> if not is_isa_spec_2p2: > >> extra_long_ext = ['zicsr', 'zifencei'] > >> else: > >> -- > >> 2.32.1
diff --git a/gcc/config/riscv/arch-canonicalize b/gcc/config/riscv/arch-canonicalize index 71b2232b29e..fd7651ac491 100755 --- a/gcc/config/riscv/arch-canonicalize +++ b/gcc/config/riscv/arch-canonicalize @@ -73,8 +73,8 @@ def arch_canonicalize(arch, isa_spec): std_exts = [] if arch[:5] in ['rv32e', 'rv32i', 'rv32g', 'rv64i', 'rv64g']: new_arch = arch[:5].replace("g", "i") - std_exts = ['m', 'a', 'f', 'd'] if arch[:5] in ['rv32g', 'rv64g']: + std_exts = ['m', 'a', 'f', 'd'] if not is_isa_spec_2p2: extra_long_ext = ['zicsr', 'zifencei'] else: