diff options
author | Kito Cheng <kito.cheng@sifive.com> | 2020-04-10 17:20:19 +0800 |
---|---|---|
committer | Kito Cheng <kito.cheng@sifive.com> | 2020-05-19 14:31:58 +0800 |
commit | f908b69cfd71b85a602424e9fea882108e02cb8a (patch) | |
tree | 606cae2c4bff55c2eb092bdccfd1ab1d3e38601a /gcc/common | |
parent | ca1a9763a1f635d2687ebd5009dd61d4fd0ab5fb (diff) | |
download | gcc-f908b69cfd71b85a602424e9fea882108e02cb8a.zip gcc-f908b69cfd71b85a602424e9fea882108e02cb8a.tar.gz gcc-f908b69cfd71b85a602424e9fea882108e02cb8a.tar.bz2 |
RISC-V: Handle implied extension for -march parser.
- 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.
Diffstat (limited to 'gcc/common')
-rw-r--r-- | gcc/common/config/riscv/riscv-common.c | 85 |
1 files changed, 75 insertions, 10 deletions
diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c index a2e8d70..2df9346 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[] = { |