From: Kito Cheng <kito.cheng@sifive.com>
To: gcc-patches@gcc.gnu.org, kito.cheng@gmail.com,
jim.wilson.gcc@gmail.com, palmer@dabbelt.com, andrew@sifive.com,
christoph.muellner@vrull.eu
Cc: Kito Cheng <kito.cheng@sifive.com>
Subject: [PATCH] RISC-V: Add h extension support
Date: Mon, 24 Oct 2022 17:55:30 +0800 [thread overview]
Message-ID: <20221024095530.16284-1-kito.cheng@sifive.com> (raw)
`h` was the prefix of multi-letter extension name, but it become a
extension in later RISC-V isa spec.
Fortunately we don't have any extension really defined is prefixed
with `h`, so we can just change that.
gcc/ChangeLog:
* common/config/riscv/riscv-common.cc (riscv_ext_version_table):
Add `h`.
(riscv_supported_std_ext): Ditto.
(multi_letter_subset_rank): Remove `h`.
(riscv_subset_list::parse_std_ext): Handle `h` as single letter
extension.
(riscv_subset_list::parse): Ditto.
gcc/testsuite/ChangeLog:
* testsuite/gcc.target/riscv/arch-18.c: New.
* testsuite/gcc.target/riscv/arch-5.c: Remove test for prefixed
with `h`.
* testsuite/gcc.target/riscv/predef-23.c: New.
---
gcc/common/config/riscv/riscv-common.cc | 23 +++-----
gcc/testsuite/gcc.target/riscv/arch-18.c | 5 ++
gcc/testsuite/gcc.target/riscv/arch-5.c | 2 +-
gcc/testsuite/gcc.target/riscv/predef-23.c | 63 ++++++++++++++++++++++
4 files changed, 77 insertions(+), 16 deletions(-)
create mode 100644 gcc/testsuite/gcc.target/riscv/arch-18.c
create mode 100644 gcc/testsuite/gcc.target/riscv/predef-23.c
diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc
index c39ed2e2696..595cff03cdc 100644
--- a/gcc/common/config/riscv/riscv-common.cc
+++ b/gcc/common/config/riscv/riscv-common.cc
@@ -145,6 +145,8 @@ static const struct riscv_ext_version riscv_ext_version_table[] =
{"c", ISA_SPEC_CLASS_20190608, 2, 0},
{"c", ISA_SPEC_CLASS_2P2, 2, 0},
+ {"h", ISA_SPEC_CLASS_NONE, 1, 0},
+
{"v", ISA_SPEC_CLASS_NONE, 1, 0},
{"zicsr", ISA_SPEC_CLASS_20191213, 2, 0},
@@ -353,21 +355,18 @@ multi_letter_subset_rank (const std::string &subset)
gcc_assert (subset.length () >= 2);
int high_order = -1;
int low_order = 0;
- /* The order between multi-char extensions: s -> h -> z -> x. */
+ /* The order between multi-char extensions: s -> z -> x. */
char multiletter_class = subset[0];
switch (multiletter_class)
{
case 's':
high_order = 0;
break;
- case 'h':
- high_order = 1;
- break;
case 'z':
- high_order = 2;
+ high_order = 1;
break;
case 'x':
- high_order = 3;
+ high_order = 2;
break;
default:
gcc_unreachable ();
@@ -663,7 +662,7 @@ riscv_subset_list::lookup (const char *subset, int major_version,
static const char *
riscv_supported_std_ext (void)
{
- return "mafdqlcbkjtpvn";
+ return "mafdqlcbkjtpvnh";
}
/* Parsing subset version.
@@ -822,7 +821,7 @@ riscv_subset_list::parse_std_ext (const char *p)
{
char subset[2] = {0, 0};
- if (*p == 'x' || *p == 's' || *p == 'h' || *p == 'z')
+ if (*p == 'x' || *p == 's' || *p == 'z')
break;
if (*p == '_')
@@ -947,7 +946,7 @@ riscv_subset_list::handle_combine_ext ()
Arguments:
`p`: Current parsing position.
- `ext_type`: What kind of extensions, 's', 'h', 'z' or 'x'.
+ `ext_type`: What kind of extensions, 's', 'z' or 'x'.
`ext_type_str`: Full name for kind of extension. */
const char *
@@ -1086,12 +1085,6 @@ riscv_subset_list::parse (const char *arch, location_t loc)
/* Parsing supervisor extension. */
p = subset_list->parse_multiletter_ext (p, "s", "supervisor extension");
- if (p == NULL)
- goto fail;
-
- /* Parsing hypervisor extension. */
- p = subset_list->parse_multiletter_ext (p, "h", "hypervisor extension");
-
if (p == NULL)
goto fail;
diff --git a/gcc/testsuite/gcc.target/riscv/arch-18.c b/gcc/testsuite/gcc.target/riscv/arch-18.c
new file mode 100644
index 00000000000..bb045360ce1
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/arch-18.c
@@ -0,0 +1,5 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=rv32gcvh -mabi=ilp32 -mcmodel=medlow" } */
+int foo()
+{
+}
diff --git a/gcc/testsuite/gcc.target/riscv/arch-5.c b/gcc/testsuite/gcc.target/riscv/arch-5.c
index 2a0f3b782a8..b945a643cc1 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_hghi_zfoo_xbar -mabi=ilp32" } */
+/* { dg-options "-march=rv32isabc_zfoo_xbar -mabi=ilp32" } */
int foo()
{
}
diff --git a/gcc/testsuite/gcc.target/riscv/predef-23.c b/gcc/testsuite/gcc.target/riscv/predef-23.c
new file mode 100644
index 00000000000..676023f2a75
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/predef-23.c
@@ -0,0 +1,63 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=rv64ih_zfhmin -mabi=lp64f -mcmodel=medlow -misa-spec=20191213" } */
+
+int main () {
+
+#ifndef __riscv_arch_test
+#error "__riscv_arch_test"
+#endif
+
+#if __riscv_xlen != 64
+#error "__riscv_xlen"
+#endif
+
+#if !defined(__riscv_i)
+#error "__riscv_i"
+#endif
+
+#if defined(__riscv_c)
+#error "__riscv_c"
+#endif
+
+#if defined(__riscv_e)
+#error "__riscv_e"
+#endif
+
+#if defined(__riscv_a)
+#error "__riscv_a"
+#endif
+
+#if defined(__riscv_m)
+#error "__riscv_m"
+#endif
+
+#if !defined(__riscv_f)
+#error "__riscv_f"
+#endif
+
+#if defined(__riscv_d)
+#error "__riscv_d"
+#endif
+
+#if defined(__riscv_v)
+#error "__riscv_v"
+#endif
+
+#if defined(__riscv_zfh)
+#error "__riscv_zfh"
+#endif
+
+#if !defined(__riscv_zfhmin)
+#error "__riscv_zfhmin"
+#endif
+
+#if !defined(__riscv_zicsr)
+#error "__riscv_zicsr"
+#endif
+
+#if !defined(__riscv_h)
+#error "__riscv_h"
+#endif
+
+ return 0;
+}
--
2.37.2
next reply other threads:[~2022-10-24 9:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-24 9:55 Kito Cheng [this message]
2022-10-24 15:04 ` Jeff Law
2022-10-26 8:34 ` Kito Cheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221024095530.16284-1-kito.cheng@sifive.com \
--to=kito.cheng@sifive.com \
--cc=andrew@sifive.com \
--cc=christoph.muellner@vrull.eu \
--cc=gcc-patches@gcc.gnu.org \
--cc=jim.wilson.gcc@gmail.com \
--cc=kito.cheng@gmail.com \
--cc=palmer@dabbelt.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).