From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2119) id 26E723858280; Fri, 14 Jul 2023 02:29:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26E723858280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689301743; bh=8h1Bws9JiUIDNAYqJZ/FsKUINrCzcg0yU8lXgd7l6/0=; h=From:To:Subject:Date:From; b=ZK6dIfwb5QZqVwSViT2WE1eE+aGMQ46gZaKBIQ3KE3ONcnusQGAHJjm52XFZPbf2j wJBxmDaZoO9R0OIPCqZj/b5vM+BVDdByM6B5lvTYV4X9lnPvt0adl2Hx4EkB0KakDj fft5TrLHKCUMhHwDMEAoJmV4sXL60rX+Q+q+y/Ig= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jeff Law To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] RISC-V: Adjust the parsing order of extensions to be consistent with riscv-spec and binutils. X-Act-Checkin: gcc X-Git-Author: Jin Ma X-Git-Refname: refs/vendors/riscv/heads/gcc-13-with-riscv-opts X-Git-Oldrev: 17d40dd16795ded51bd7c1b723791c9195d8653e X-Git-Newrev: 8235c5000f2bc3793f3da2faa7605922fb89d458 Message-Id: <20230714022903.26E723858280@sourceware.org> Date: Fri, 14 Jul 2023 02:29:03 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8235c5000f2bc3793f3da2faa7605922fb89d458 commit 8235c5000f2bc3793f3da2faa7605922fb89d458 Author: Jin Ma Date: Tue Apr 18 17:26:49 2023 +0800 RISC-V: Adjust the parsing order of extensions to be consistent with riscv-spec and binutils. The current order of gcc and binutils parsing extensions is inconsistent. According to latest risc-v spec, the canonical order in which extension names must appear in the name string specified in Table 29.1 is different from before. In the latest table, non-standard extensions must be listed after all standard extensions. To keep consistent, we now change the parsing order. Related llvm patch links: https://reviews.llvm.org/D148315 gcc/ChangeLog: * common/config/riscv/riscv-common.cc (multi_letter_subset_rank): Swap the order of z-extensions and s-extensions. (riscv_subset_list::parse): Likewise. gcc/testsuite/ChangeLog: * gcc.target/riscv/arch-5.c: Likewise. Diff: --- gcc/common/config/riscv/riscv-common.cc | 12 ++++++------ gcc/testsuite/gcc.target/riscv/arch-5.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index e19c0985ca0..fb2635eb559 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -398,10 +398,10 @@ multi_letter_subset_rank (const std::string &subset) char multiletter_class = subset[0]; switch (multiletter_class) { - case 's': + case 'z': high_order = 0; break; - case 'z': + case 's': high_order = 1; break; case 'x': @@ -1121,14 +1121,14 @@ riscv_subset_list::parse (const char *arch, location_t loc) if (p == NULL) goto fail; - /* Parsing supervisor extension. */ - p = subset_list->parse_multiletter_ext (p, "s", "supervisor extension"); + /* Parsing sub-extensions. */ + p = subset_list->parse_multiletter_ext (p, "z", "sub-extension"); if (p == NULL) goto fail; - /* Parsing sub-extensions. */ - p = subset_list->parse_multiletter_ext (p, "z", "sub-extension"); + /* Parsing supervisor extension. */ + p = subset_list->parse_multiletter_ext (p, "s", "supervisor extension"); if (p == NULL) goto fail; diff --git a/gcc/testsuite/gcc.target/riscv/arch-5.c b/gcc/testsuite/gcc.target/riscv/arch-5.c index b945a643cc1..8258552214f 100644 --- a/gcc/testsuite/gcc.target/riscv/arch-5.c +++ b/gcc/testsuite/gcc.target/riscv/arch-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv32isabc_zfoo_xbar -mabi=ilp32" } */ +/* { dg-options "-march=rv32i_zfoo_sabc_xbar -mabi=ilp32" } */ int foo() { }