RISC-V: Add minimal Smctr extension support

This adds minimal support for the Smctr[1] (Machine-mode control transfer
records) extension, which depends on Zicsr.

[1] https://github.com/riscv/riscv-isa-manual/blob/main/src/priv/smctr.adoc

gcc/ChangeLog:

	* config/riscv/riscv-ext.def (smctr): Add new extension.
	* config/riscv/riscv-ext.opt: Ditto.
	* doc/riscv-ext.texi: Ditto.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/smctr-version.c: New test.

diff --git a/gcc/config/riscv/riscv-ext.def b/gcc/config/riscv/riscv-ext.def
index 4159be567d2adb23f087838fda2b2795c62f67e1..449f98a29c5ef97cdddd85ecbbb5010d18d36f62 100644 (file)
--- a/gcc/config/riscv/riscv-ext.def
+++ b/gcc/config/riscv/riscv-ext.def
@@ -1780,6 +1780,19 @@ DEFINE_RISCV_EXT(
   /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
   /* EXTRA_EXTENSION_FLAGS */ 0)
 
+DEFINE_RISCV_EXT(
+  /* NAME */ smctr,
+  /* UPPERCASE_NAME */ SMCTR,
+  /* FULL_NAME */ "Machine-mode control transfer records extension",
+  /* DESC */ "",
+  /* URL */ ,
+  /* DEP_EXTS */ ({"zicsr"}),
+  /* SUPPORTED_VERSIONS */ ({{1, 0}}),
+  /* FLAG_GROUP */ sm,
+  /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
+  /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
+  /* EXTRA_EXTENSION_FLAGS */ 0)
+
 DEFINE_RISCV_EXT(
   /* NAME */ smcsrind,
   /* UPPERCASE_NAME */ SMCSRIND,

diff --git a/gcc/config/riscv/riscv-ext.opt b/gcc/config/riscv/riscv-ext.opt
index cfee9551126cb6e87561cd4d9d7f59a99d27ce78..c25a65a1d60def8c45df7a5ec407a290bd7f4af4 100644 (file)
--- a/gcc/config/riscv/riscv-ext.opt
+++ b/gcc/config/riscv/riscv-ext.opt
@@ -363,6 +363,8 @@ Mask(SMCDELEG) Var(riscv_sm_subext)
 
 Mask(SMCNTRPMF) Var(riscv_sm_subext)
 
+Mask(SMCTR) Var(riscv_sm_subext)
+
 Mask(SMCSRIND) Var(riscv_sm_subext)
 
 Mask(SMEPMP) Var(riscv_sm_subext)

diff --git a/gcc/doc/riscv-ext.texi b/gcc/doc/riscv-ext.texi
index d71ff736bef41adcebbc83307798c7eca29b7e45..14d8b928daa5c142a5ab52f28c94c783387b18df 100644 (file)
--- a/gcc/doc/riscv-ext.texi
+++ b/gcc/doc/riscv-ext.texi
@@ -526,6 +526,10 @@
 @tab 1.0
 @tab Cycle and instret privilege mode filtering
 
+@item @samp{smctr}
+@tab 1.0
+@tab Machine-mode control transfer records extension
+
 @item @samp{smcsrind}
 @tab 1.0
 @tab Machine-level indirect CSR access

diff --git a/gcc/testsuite/gcc.target/riscv/smctr-version.c b/gcc/testsuite/gcc.target/riscv/smctr-version.c
new file mode 100644 (file)
index 0000000..8e28522
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/smctr-version.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-mriscv-attribute -march=rv64i_smctr1p0 -mabi=lp64" { target { rv64 } } } */
+/* { dg-options "-mriscv-attribute -march=rv32i_smctr1p0 -mabi=ilp32" { target { rv32 } } } */
+
+#ifndef __riscv_smctr
+#error "Feature macro for 'smctr' not defined"
+#endif
+
+int
+foo (void)
+{
+  return 0;
+}
+
+/* { dg-final { scan-assembler ".attribute arch, .*smctr1p0" } } */