From patchwork Fri Apr 10 09:20:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kito Cheng X-Patchwork-Id: 1268999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=Y5iV6aqB; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48zCD84zkpz9sSX for ; Fri, 10 Apr 2020 19:20:40 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92827385DC20; Fri, 10 Apr 2020 09:20:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by sourceware.org (Postfix) with ESMTPS id D5E7A385B835 for ; Fri, 10 Apr 2020 09:20:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D5E7A385B835 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kito.cheng@sifive.com Received: by mail-pg1-x541.google.com with SMTP id n13so750707pgp.11 for ; Fri, 10 Apr 2020 02:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HZVe4xlGVPSPIg5V5/x0F4R0ZaPco2wrbPB8/4blznc=; b=Y5iV6aqBEli8aVv6pfmPlxnkdg8LSDN40+aCGhAlERvadZnEipeczBJWLJfTefBk+K QFV3Be1Jyk6PZhdXG3vCkgXB0wthUE75/nk1SET4Isa3z8Xqwiv2n3wl6mVFA+3TWGT9 nIkG5T9Qn9mR/5lUXuUpAWSxWDUY4g7cVF1+kOfu4cm33UdKAkTmlE7mzah+Halc2o+M xiONf365UxC42VaeP7hQKligifDdOLZSGmC/Z/5eXzZKQzw9wJaBUstsqFIwHBW543ZD MCOWnunkDkp8RNu15KlBo3CxQ0E7LIk6mHY7M94W3I2+Kz7+fX6nSQrkQuD3g3I2Lmig cnkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HZVe4xlGVPSPIg5V5/x0F4R0ZaPco2wrbPB8/4blznc=; b=AzBnurigW/2RGAiIiEn9QsE0OJhEQ8SoG8GtBbZBqH6th1eXfK9LLBkrWbsDXX7q44 t3R/ako2YexRGp8CKP4TWliFzjwf6zUEUthBSPot8+cEI2pjYVrVXCr62pXD3r5Gy8jl 45oO23u7DeaoAL728GsxgZLHOcTlgzNGBqEn0n8Ordiiu0PaBjmTgVZcQlRKOEE/AQPn /kqzhlHNZu671foxV3EUIYkk4425/2KKt+XmH/3L7efUBsQNX/uAsQ44Qjunwk8o4ySp rqRffwUlITcra2mBw8RUlPBcNGlHDy1czBLbiMMHVMyUZSZ5jB591tBB35YnvkSQOuPR uD3A== X-Gm-Message-State: AGi0PubEdFTlAKkSgwGvdwlKQmqrIrpi68CbUyqg2ZhdBYpmtKz2FWzc CFrMc/kVk1YbZ8v6ZiC144tuTQsPWNo= X-Google-Smtp-Source: APiQypK/VmlA2qV9h4Z9G1E3Z43nFuOpzUsNWD283coJtoHsLIA7OLDMyq/RF9H72rR4/XOxufdQ2g== X-Received: by 2002:a63:9a11:: with SMTP id o17mr3561079pge.234.1586510431527; Fri, 10 Apr 2020 02:20:31 -0700 (PDT) Received: from hsinchu02.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id a1sm1265277pfl.188.2020.04.10.02.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2020 02:20:31 -0700 (PDT) From: Kito Cheng To: gcc-patches@gcc.gnu.org, kito.cheng@gmail.com, jimw@sifive.com Subject: [PATCH v2 2/2] RISC-V: Handle implied extension for -march parser. Date: Fri, 10 Apr 2020 17:20:19 +0800 Message-Id: <20200410092019.98521-2-kito.cheng@sifive.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200410092019.98521-1-kito.cheng@sifive.com> References: <20200410092019.98521-1-kito.cheng@sifive.com> MIME-Version: 1.0 X-Spam-Status: No, score=-26.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Kito Cheng Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" - Implied rule are introduced into latest RISC-V ISA spec. - Only implemented D implied F-extension. Zicsr and Zifence are not implement yet, so the rule not included in this patch. - Pass preprocessed arch string to arch. - Verified with binutils 2.30 and 2.34. gcc/ChangeLog * common/config/riscv/riscv-common.c (riscv_implied_info_t): New. (riscv_implied_info): New. (riscv_subset_list): Add handle_implied_ext. (riscv_subset_list::to_string): New parameter version_p to control output format. (riscv_subset_list::handle_implied_ext): New. (riscv_subset_list::parse_std_ext): Call handle_implied_ext. (riscv_arch_str): New parameter version_p to control output format. (riscv_expand_arch): New. * config/riscv/riscv-protos.h (riscv_arch_str): New parameter, version_p. * config/riscv/riscv.h (riscv_expand_arch): New, (EXTRA_SPEC_FUNCTIONS): Define. (ASM_SPEC): Transform -march= via riscv_expand_arch. gcc/testsuite/ChangeLog * gcc.target/riscv/arch-6.c: New. * gcc.target/riscv/attribute-11.c: New. * gcc.target/riscv/attribute-12.c: New. --- gcc/common/config/riscv/riscv-common.c | 85 ++++++++++++++++--- gcc/config/riscv/riscv-protos.h | 2 +- gcc/config/riscv/riscv.h | 7 +- gcc/testsuite/gcc.target/riscv/arch-6.c | 5 ++ gcc/testsuite/gcc.target/riscv/attribute-11.c | 6 ++ gcc/testsuite/gcc.target/riscv/attribute-12.c | 6 ++ 6 files changed, 99 insertions(+), 12 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/arch-6.c create mode 100644 gcc/testsuite/gcc.target/riscv/attribute-11.c create mode 100644 gcc/testsuite/gcc.target/riscv/attribute-12.c diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c index a2e8d7003cc..2df93460165 100644 --- a/gcc/common/config/riscv/riscv-common.c +++ b/gcc/common/config/riscv/riscv-common.c @@ -44,6 +44,20 @@ struct riscv_subset_t struct riscv_subset_t *next; }; +/* Type for implied ISA info. */ +struct riscv_implied_info_t +{ + const char *ext; + const char *implied_ext; +}; + +/* Implied ISA info, must end with NULL sentinel. */ +riscv_implied_info_t riscv_implied_info[] = +{ + {"d", "f"}, + {NULL, NULL} +}; + /* Subset list. */ class riscv_subset_list { @@ -73,6 +87,8 @@ private: const char *parse_multiletter_ext (const char *, const char *, const char *); + void handle_implied_ext (const char *, int, int); + public: ~riscv_subset_list (); @@ -82,7 +98,7 @@ public: int major_version = RISCV_DONT_CARE_VERSION, int minor_version = RISCV_DONT_CARE_VERSION) const; - std::string to_string () const; + std::string to_string (bool) const; unsigned xlen() const {return m_xlen;}; @@ -140,10 +156,11 @@ riscv_subset_list::add (const char *subset, int major_version, m_tail = s; } -/* Convert subset info to string with explicit version info. */ +/* Convert subset info to string with explicit version info, + VERSION_P to determine append version info or not. */ std::string -riscv_subset_list::to_string () const +riscv_subset_list::to_string (bool version_p) const { std::ostringstream oss; oss << "rv" << m_xlen; @@ -153,14 +170,20 @@ riscv_subset_list::to_string () const while (subset != NULL) { - if (!first) + /* For !version_p, we only separate extension with underline for + multi-letter extension. */ + if (!first && + (version_p || subset->name.length() > 1)) oss << '_'; first = false; - oss << subset->name - << subset->major_version - << 'p' - << subset->minor_version; + oss << subset->name; + + if (version_p) + oss << subset->major_version + << 'p' + << subset->minor_version; + subset = subset->next; } @@ -394,11 +417,38 @@ riscv_subset_list::parse_std_ext (const char *p) subset[0] = std_ext; + handle_implied_ext (subset, major_version, minor_version); + add (subset, major_version, minor_version); } return p; } + +/* Check any implied extensions for EXT with version + MAJOR_VERSION.MINOR_VERSION. */ +void +riscv_subset_list::handle_implied_ext (const char *ext, + int major_version, + int minor_version) +{ + riscv_implied_info_t *implied_info; + for (implied_info = &riscv_implied_info[0]; + implied_info->ext; + ++implied_info) + { + if (strcmp (ext, implied_info->ext) != 0) + continue; + + /* Skip if implied extension already present. */ + if (lookup (implied_info->implied_ext)) + continue; + + /* TODO: Implied extension might use different version. */ + add (implied_info->implied_ext, major_version, minor_version); + } +} + /* Parsing function for multi-letter extensions. Return Value: @@ -530,10 +580,10 @@ fail: /* Return the current arch string. */ std::string -riscv_arch_str () +riscv_arch_str (bool version_p) { gcc_assert (current_subset_list); - return current_subset_list->to_string (); + return current_subset_list->to_string (version_p); } /* Parse a RISC-V ISA string into an option mask. Must clear or set all arch @@ -600,6 +650,21 @@ riscv_handle_option (struct gcc_options *opts, } } +/* Expand arch string with implied extensions. */ + +const char * +riscv_expand_arch (int argc ATTRIBUTE_UNUSED, + const char **argv) +{ + static char *_arch_buf; + gcc_assert (argc == 1); + int flags; + location_t loc = UNKNOWN_LOCATION; + riscv_parse_arch_string (argv[0], &flags, loc); + _arch_buf = xstrdup (riscv_arch_str (false).c_str ()); + return _arch_buf; +} + /* Implement TARGET_OPTION_OPTIMIZATION_TABLE. */ static const struct default_options riscv_option_optimization_table[] = { diff --git a/gcc/config/riscv/riscv-protos.h b/gcc/config/riscv/riscv-protos.h index 8cf9137b5e7..4ff33593ec7 100644 --- a/gcc/config/riscv/riscv-protos.h +++ b/gcc/config/riscv/riscv-protos.h @@ -87,7 +87,7 @@ extern tree riscv_builtin_decl (unsigned int, bool); extern void riscv_init_builtins (void); /* Routines implemented in riscv-common.c. */ -extern std::string riscv_arch_str (); +extern std::string riscv_arch_str (bool version_p = true); extern bool riscv_hard_regno_rename_ok (unsigned, unsigned); diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h index 567c23380fe..f494daa24e4 100644 --- a/gcc/config/riscv/riscv.h +++ b/gcc/config/riscv/riscv.h @@ -40,6 +40,11 @@ along with GCC; see the file COPYING3. If not see #define RISCV_TUNE_STRING_DEFAULT "rocket" #endif +extern const char *riscv_expand_arch (int argc, const char **argv); + +# define EXTRA_SPEC_FUNCTIONS \ + { "riscv_expand_arch", riscv_expand_arch }, + /* Support for a compile-time default CPU, et cetera. The rules are: --with-arch is ignored if -march is specified. --with-abi is ignored if -mabi is specified. @@ -59,7 +64,7 @@ along with GCC; see the file COPYING3. If not see #define ASM_SPEC "\ %(subtarget_asm_debugging_spec) \ %{" FPIE_OR_FPIC_SPEC ":-fpic} \ -%{march=*} \ +%{march=*:-march=%:riscv_expand_arch(%*)} \ %{mabi=*} \ %(subtarget_asm_spec)" diff --git a/gcc/testsuite/gcc.target/riscv/arch-6.c b/gcc/testsuite/gcc.target/riscv/arch-6.c new file mode 100644 index 00000000000..b36dccbf46b --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/arch-6.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-O -march=rv32id -mabi=ilp32" } */ +int foo() +{ +} diff --git a/gcc/testsuite/gcc.target/riscv/attribute-11.c b/gcc/testsuite/gcc.target/riscv/attribute-11.c new file mode 100644 index 00000000000..a8649508b2f --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/attribute-11.c @@ -0,0 +1,6 @@ +/* { dg-do compile } */ +/* { dg-options "-O -mriscv-attribute -march=rv32id -mabi=ilp32" } */ +int foo() +{ +} +/* { dg-final { scan-assembler ".attribute arch, \"rv32i2p0_f2p0_d2p0\"" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/attribute-12.c b/gcc/testsuite/gcc.target/riscv/attribute-12.c new file mode 100644 index 00000000000..df27fc3234d --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/attribute-12.c @@ -0,0 +1,6 @@ +/* { dg-do compile } */ +/* { dg-options "-O -mriscv-attribute -march=rv32ifd -mabi=ilp32" } */ +int foo() +{ +} +/* { dg-final { scan-assembler ".attribute arch, \"rv32i2p0_f2p0_d2p0\"" } } */