From patchwork Thu Jul 13 08:32:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lehua Ding X-Patchwork-Id: 119629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1675751vqm; Thu, 13 Jul 2023 01:33:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlER+7y6eG/NjfU8W6zHiwgKGdbxqwd3yvha+Y9wPjQKO+15YYcQi9fxl1rPtqwefTAKFoCh X-Received: by 2002:a17:906:300b:b0:991:d5ad:f1b1 with SMTP id 11-20020a170906300b00b00991d5adf1b1mr806209ejz.47.1689237220680; Thu, 13 Jul 2023 01:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689237220; cv=none; d=google.com; s=arc-20160816; b=LBNu331uugJtj2UDhhOBXWLZGS9NOoByLnsqc3YXQsnFMV99rGqW4sPVIcq+IwIYLp fffZ1i9UptK4i8xYOJWdu1cWnwG8+cy9+x3j8+aK2MtZ/YWNahWAOKQoWZE1uGSXbTRa kul4+U97Pn/w4wQUGkmwBvp/qHyea+QR/7M17Lbnq1ot1bR5+SxkeyQ0f8FiUuwqTHpJ h1FmspYCOR1oLSfpIMJpjUdNsn1eMyCBathYJqz5XV10cs/YowzOfes/pF3HX5TOmmP1 8MrLfDmP9i0DqoHNVkQwXNlWSHqFfUaJQjahfQC0mQ8z9XC2ZlfcUle1GaMDD6WqTiVB LReA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:feedback-id :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dmarc-filter:delivered-to; bh=NSxWl45jRpXrFaQeXqBYmjNGGqeVV4emU2ZoCBWAJGQ=; fh=gTyau+cNmEmsMakPG5hn1BgV9dZ8F3BLCRVmJIys8DA=; b=rqMVGWEeLyHhijunVjBFvOlwuDWQHmHfDuPWHdPxq/sr2CF7A2lIrWl1DIPLYwBRmz wuVeylhb2qTrAIQldoOe9xlIGfbgTfkySpnDKY6j3t8sI5/vBoi2glLTRuhngxb7VR9T Kvrt5lok3DOKttnqK0bOvpjAnRQUeyooXlScvLda0eYzg71ooJx1AURg8wTj7ukL9u7q hURWfFKCkvioCxMHOD5joYPHDLTIkCb1qIy/WcTg46Q/qWWkzVPHepFYv1oQFNJG7LVP o1NbWS8bpgyAQrhf0pGn3p/rwanNIHkVyZUnLVtPZveDm3TnKzlSwUXt/aggXAJU9yrl QrQg== ARC-Authentication-Results: i=1; mx.google.com; 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 gz15-20020a170906f2cf00b00992d0de8763si7108823ejb.910.2023.07.13.01.33.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 01:33:40 -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; 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 6DB083856DC2 for ; Thu, 13 Jul 2023 08:33:30 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbg153.qq.com (smtpbg153.qq.com [13.245.218.24]) by sourceware.org (Postfix) with ESMTPS id C3AAE385772D for ; Thu, 13 Jul 2023 08:32:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C3AAE385772D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai X-QQ-mid: bizesmtp88t1689237132t194ec5a Received: from server1.localdomain ( [58.60.1.22]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 13 Jul 2023 16:32:10 +0800 (CST) X-QQ-SSF: 01400000000000B0F000000A0000000 X-QQ-FEAT: Q4gfBD3K7t/VU7A5a9fhXSjuYfjUdN7u6FLeRaoufJWsU+tesr0gqpuEIpIUb ABE5ThAKX2+fKDBi+QAurFBSexicms93nCHPF6VAmDnbJoIWEDSw9iaBpD2b2bpK9nTdK0n ep8weQVW+7reb3mslMnXcXf5TMaVpmqkmogxTwEa1YSjNzq8MTmo99czVCT0InhHl253HVd OC4Ew/fo2qj1Cin2XkH5E8tryLFpp29qT8yEE9tTy8EdOFCnsyskloc/qrQ4yIhC6nCuu+k OfHy6JCZGoU2EUSK/ktgtNJYIU5kGfwJUkwvVG7Am0aR9/NEp+vpyjsqs1kJVxZmo/8FBPX LcY8OufTtLqFszP2+lPySLA10KSihx0RGom0PIjVjIasEYMoqrlCco4pUbn1g== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 109097319995144744 From: Lehua Ding To: gcc-patches@gcc.gnu.org Cc: juzhe.zhong@rivai.ai, rdapp.gcc@gmail.com, kito.cheng@gmail.com, palmer@rivosinc.com, jeffreyalaw@gmail.com Subject: [PATCH V2] RISC-V: Throw compilation error for unknown sub-extension or supervisor extension Date: Thu, 13 Jul 2023 16:32:09 +0800 Message-Id: <20230713083209.49847-1-lehua.ding@rivai.ai> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz6a-0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771293607857316737 X-GMAIL-MSGID: 1771293607857316737 Hi, This tiny patch add a check for extension starts with 'z' or 's' in `-march` option. Currently this unknown extension will be passed to the assembler, which then reports an error. With this patch, the compiler will throw a compilation error if the extension starts with 'z' or 's' is not a standard sub-extension or supervisor extension. Along with two extra changes. The first is to reduce repeated errors, which are currently reported at least twice. The second is to report as many mistakes as possible. e.g.: Run `riscv64-unknown-elf-gcc -march=rv64gvcw_zvl128_s123_x123 -mabi=lp64d a.c` will throw these error: riscv64-unknown-elf-gcc: error: '-march=rv64gcv_zvl128_s123': ISA string is not in canonical order. 'c' riscv64-unknown-elf-gcc: error: '-march=rv64gcv_zvl128_s123': extension 'w' is unsupported standard single letter extension riscv64-unknown-elf-gcc: error: '-march=rv64gcv_zvl128_s123': extension 'zvl128' start with `z` but is unsupported standard extension riscv64-unknown-elf-gcc: error: '-march=rv64gcv_zvl128_s123': extension 's123' start with `s` but is unsupported standard supervisor extension riscv64-unknown-elf-gcc: error: '-march=rv64gcv_zvl128_s123': extension 'x123' start with `x` but is unsupported non-standard extension Best, Lehua gcc/ChangeLog: * common/config/riscv/riscv-common.cc (riscv_supported_std_ext): Init. (standard_extensions_p): Add check. (riscv_subset_list::add): Just return NULL if it failed before. (riscv_subset_list::parse_std_ext): Continue parse when find a error (riscv_subset_list::parse): Just return NULL if it failed before. * config/riscv/riscv-subset.h (class riscv_subset_list): Add field. gcc/testsuite/ChangeLog: * gcc.target/riscv/arch-2.c: Update -march. * gcc.target/riscv/arch-3.c: Ditto. * gcc.target/riscv/arch-5.c: Ditto. * gcc.target/riscv/arch-8.c: Ditto. * gcc.target/riscv/attribute-10.c: Ditto. * gcc.target/riscv/attribute-18.c: Ditto. * gcc.target/riscv/attribute-19.c: Ditto. * gcc.target/riscv/attribute-8.c: Ditto. * gcc.target/riscv/attribute-9.c: Ditto. * gcc.target/riscv/pr102957.c: Ditto. * gcc.target/riscv/arch-22.cc: New test. --- gcc/common/config/riscv/riscv-common.cc | 68 +++++++++++++++---- gcc/config/riscv/riscv-subset.h | 5 ++ gcc/testsuite/gcc.target/riscv/arch-2.c | 2 +- gcc/testsuite/gcc.target/riscv/arch-22.cc | 11 +++ gcc/testsuite/gcc.target/riscv/arch-3.c | 2 +- gcc/testsuite/gcc.target/riscv/arch-5.c | 2 +- gcc/testsuite/gcc.target/riscv/arch-8.c | 2 +- gcc/testsuite/gcc.target/riscv/attribute-10.c | 2 +- gcc/testsuite/gcc.target/riscv/attribute-18.c | 4 +- gcc/testsuite/gcc.target/riscv/attribute-19.c | 4 +- gcc/testsuite/gcc.target/riscv/attribute-8.c | 4 +- gcc/testsuite/gcc.target/riscv/attribute-9.c | 4 +- gcc/testsuite/gcc.target/riscv/pr102957.c | 2 + 13 files changed, 87 insertions(+), 25 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/arch-22.cc diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index 6091d8f281b..9de7c54269e 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -311,6 +311,8 @@ static const char *riscv_tunes[] = static const char *riscv_supported_std_ext (void); +bool riscv_subset_list::parse_failed = false; + static riscv_subset_list *current_subset_list = NULL; const riscv_subset_list *riscv_current_subset_list () @@ -518,6 +520,18 @@ subset_cmp (const std::string &a, const std::string &b) } } +/* Return true if EXT is a standard extension. */ + +static bool +standard_extensions_p (const char *ext) +{ + const riscv_ext_version *ext_ver; + for (ext_ver = &riscv_ext_version_table[0]; ext_ver->name != NULL; ++ext_ver) + if (strcmp (ext, ext_ver->name) == 0) + return true; + return false; +} + /* Add new subset to list. */ void @@ -546,6 +560,38 @@ riscv_subset_list::add (const char *subset, int major_version, return; } + else if (strlen (subset) == 1 && !standard_extensions_p (subset)) + { + error_at (m_loc, + "%<-march=%s%>: extension %qs is unsupported standard single " + "letter extension", + m_arch, subset); + return; + } + else if (subset[0] == 'z' && !standard_extensions_p (subset)) + { + error_at (m_loc, + "%<-march=%s%>: extension %qs starts with `z` but is " + "unsupported standard extension", + m_arch, subset); + return; + } + else if (subset[0] == 's' && !standard_extensions_p (subset)) + { + error_at (m_loc, + "%<-march=%s%>: extension %qs start with `s` but is " + "unsupported standard supervisor extension", + m_arch, subset); + return; + } + else if (subset[0] == 'x' && !standard_extensions_p (subset)) + { + error_at (m_loc, + "%<-march=%s%>: extension %qs start with `x` but is " + "unsupported non-standard extension", + m_arch, subset); + return; + } riscv_subset_t *s = new riscv_subset_t (); riscv_subset_t *itr; @@ -919,22 +965,16 @@ riscv_subset_list::parse_std_ext (const char *p) while (*std_exts && std_ext != *std_exts) std_exts++; - if (std_ext != *std_exts) - { - if (strchr (all_std_exts, std_ext) == NULL) - error_at (m_loc, "%<-march=%s%>: unsupported ISA subset %<%c%>", - m_arch, *p); - else - error_at (m_loc, - "%<-march=%s%>: ISA string is not in canonical order. " - "%<%c%>", m_arch, *p); - return NULL; - } + subset[0] = std_ext; + if (std_ext != *std_exts && standard_extensions_p (subset)) + error_at (m_loc, + "%<-march=%s%>: ISA string is not in canonical order. " + "%<%c%>", + m_arch, *p); std_exts++; p++; - subset[0] = std_ext; p = parsing_subset_version (subset, p, &major_version, &minor_version, /* std_ext_p= */ true, &explicit_version_p); @@ -1139,6 +1179,9 @@ riscv_subset_list::parse_multiletter_ext (const char *p, riscv_subset_list * riscv_subset_list::parse (const char *arch, location_t loc) { + if (riscv_subset_list::parse_failed) + return NULL; + riscv_subset_list *subset_list = new riscv_subset_list (arch, loc); riscv_subset_t *itr; const char *p = arch; @@ -1205,6 +1248,7 @@ riscv_subset_list::parse (const char *arch, location_t loc) fail: delete subset_list; + riscv_subset_list::parse_failed = true; return NULL; } diff --git a/gcc/config/riscv/riscv-subset.h b/gcc/config/riscv/riscv-subset.h index 92e4fb31692..6691997df7c 100644 --- a/gcc/config/riscv/riscv-subset.h +++ b/gcc/config/riscv/riscv-subset.h @@ -41,6 +41,11 @@ struct riscv_subset_t /* Subset list. */ class riscv_subset_list { +public: + /* Because the parse method is called in several places, to prevent repeated + errors, use this flag to prevent it from repeating parse. */ + static bool parse_failed; + private: /* Original arch string. */ const char *m_arch; diff --git a/gcc/testsuite/gcc.target/riscv/arch-2.c b/gcc/testsuite/gcc.target/riscv/arch-2.c index 8908b4b3a8c..e308bf7407c 100644 --- a/gcc/testsuite/gcc.target/riscv/arch-2.c +++ b/gcc/testsuite/gcc.target/riscv/arch-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv32ixabc_xfoo -mabi=ilp32" } */ +/* { dg-options "-march=rv32ixtheadba_xtheadsync -mabi=ilp32" } */ int foo() { } diff --git a/gcc/testsuite/gcc.target/riscv/arch-22.cc b/gcc/testsuite/gcc.target/riscv/arch-22.cc new file mode 100644 index 00000000000..68337a70406 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/arch-22.cc @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gvcw_zvl128_s123_x123 -mabi=lp64d" } */ +int foo() +{ +} + +/* { dg-error "ISA string is not in canonical order. 'c'" "" { target *-*-* } 0 } */ +/* { dg-error "extension 'w' is unsupported standard single letter extension" "" { target *-*-* } 0 } */ +/* { dg-error "extension 'zvl128' start with `z` but is unsupported standard extension" "" { target *-*-* } 0 } */ +/* { dg-error "extension 's123' start with `s` but is unsupported standard supervisor extension" "" { target *-*-* } 0 } */ +/* { dg-error "extension 'x123' start with `x` but is unsupported non-standard extension" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.target/riscv/arch-3.c b/gcc/testsuite/gcc.target/riscv/arch-3.c index 7aa945eca20..ac733746fd6 100644 --- a/gcc/testsuite/gcc.target/riscv/arch-3.c +++ b/gcc/testsuite/gcc.target/riscv/arch-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv32isabc_xbar -mabi=ilp32" } */ +/* { dg-options "-march=rv32isvinval_xtheadba -mabi=ilp32" } */ int foo() { } diff --git a/gcc/testsuite/gcc.target/riscv/arch-5.c b/gcc/testsuite/gcc.target/riscv/arch-5.c index 8258552214f..b8b6cd048f7 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=rv32i_zfoo_sabc_xbar -mabi=ilp32" } */ +/* { dg-options "-march=rv32i_zmmul_svnapot_xtheadba -mabi=ilp32" } */ int foo() { } diff --git a/gcc/testsuite/gcc.target/riscv/arch-8.c b/gcc/testsuite/gcc.target/riscv/arch-8.c index 1b9e51b0e12..ef557aeb673 100644 --- a/gcc/testsuite/gcc.target/riscv/arch-8.c +++ b/gcc/testsuite/gcc.target/riscv/arch-8.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv32id_zicsr_zifence -mabi=ilp32" } */ +/* { dg-options "-march=rv32id_zicsr_zifencei -mabi=ilp32" } */ int foo() { } diff --git a/gcc/testsuite/gcc.target/riscv/attribute-10.c b/gcc/testsuite/gcc.target/riscv/attribute-10.c index 1e121a10753..868adef6ab7 100644 --- a/gcc/testsuite/gcc.target/riscv/attribute-10.c +++ b/gcc/testsuite/gcc.target/riscv/attribute-10.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv32i -march=rv32im_sx_unexpectedstring -mabi=ilp32" } */ +/* { dg-options "-march=rv32i -march=rv32im_svnapot_unexpectedstring -mabi=ilp32" } */ int foo() { } diff --git a/gcc/testsuite/gcc.target/riscv/attribute-18.c b/gcc/testsuite/gcc.target/riscv/attribute-18.c index 492360cf7c1..fddbf15fc3e 100644 --- a/gcc/testsuite/gcc.target/riscv/attribute-18.c +++ b/gcc/testsuite/gcc.target/riscv/attribute-18.c @@ -1,4 +1,4 @@ /* { dg-do compile } */ -/* { dg-options "-mriscv-attribute -march=rv64imafdcp -mabi=lp64d -misa-spec=2.2" } */ +/* { dg-options "-mriscv-attribute -march=rv64imafdc -mabi=lp64d -misa-spec=2.2" } */ int foo() {} -/* { dg-final { scan-assembler ".attribute arch, \"rv64i2p0_m2p0_a2p0_f2p0_d2p0_c2p0_p\"" } } */ +/* { dg-final { scan-assembler ".attribute arch, \"rv64i2p0_m2p0_a2p0_f2p0_d2p0_c2p0\"" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/attribute-19.c b/gcc/testsuite/gcc.target/riscv/attribute-19.c index 562f8089361..8150452f5b1 100644 --- a/gcc/testsuite/gcc.target/riscv/attribute-19.c +++ b/gcc/testsuite/gcc.target/riscv/attribute-19.c @@ -1,4 +1,4 @@ /* { dg-do compile } */ -/* { dg-options "-mriscv-attribute -march=rv64imp0p9 -mabi=lp64 -misa-spec=2.2" } */ +/* { dg-options "-mriscv-attribute -march=rv64im -mabi=lp64 -misa-spec=2.2" } */ int foo() {} -/* { dg-final { scan-assembler ".attribute arch, \"rv64i2p0_m2p0_p0p9\"" } } */ +/* { dg-final { scan-assembler ".attribute arch, \"rv64i2p0_m2p0\"" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/attribute-8.c b/gcc/testsuite/gcc.target/riscv/attribute-8.c index 4c91b9e6369..2065f74b977 100644 --- a/gcc/testsuite/gcc.target/riscv/attribute-8.c +++ b/gcc/testsuite/gcc.target/riscv/attribute-8.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-mriscv-attribute -march=rv32i2p0xabc_xv5 -mabi=ilp32" } */ +/* { dg-options "-mriscv-attribute -march=rv32i2p0xtheadba_xtheadbb -mabi=ilp32" } */ int foo() { } -/* { dg-final { scan-assembler ".attribute arch, \"rv32i2p0_xabc_xv5p0\"" } } */ +/* { dg-final { scan-assembler ".attribute arch, \"rv32i2p0_xtheadba1p0_xtheadbb1p0\"" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/attribute-9.c b/gcc/testsuite/gcc.target/riscv/attribute-9.c index 7e3741a827c..3c31848ed80 100644 --- a/gcc/testsuite/gcc.target/riscv/attribute-9.c +++ b/gcc/testsuite/gcc.target/riscv/attribute-9.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ -/* { dg-options "-mriscv-attribute -march=rv32i2p0sabc_xbar -mabi=ilp32e" } */ +/* { dg-options "-mriscv-attribute -march=rv32i2p0svinval_xtheadba -mabi=ilp32e" } */ int foo() { } -/* { dg-final { scan-assembler ".attribute arch, \"rv32i2p0_sabc_xbar\"" } } */ +/* { dg-final { scan-assembler ".attribute arch, \"rv32i2p0_svinval1p0_xtheadba1p0\"" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/pr102957.c b/gcc/testsuite/gcc.target/riscv/pr102957.c index 9747dde3038..322d49c62d4 100644 --- a/gcc/testsuite/gcc.target/riscv/pr102957.c +++ b/gcc/testsuite/gcc.target/riscv/pr102957.c @@ -3,3 +3,5 @@ int foo() { } + +/* { dg-error "extension 'zb' starts with `z` but is unsupported standard extension" "" { target *-*-* } 0 } */