Add unratified Smctr and Ssctr extensions

Makefile

@@ -28,6 +28,7 @@ SAIL_DEFAULT_INST += riscv_insts_fext.sail riscv_insts_cfext.sail
 SAIL_DEFAULT_INST += riscv_insts_dext.sail riscv_insts_cdext.sail
 
 SAIL_DEFAULT_INST += riscv_insts_svinval.sail
+SAIL_DEFAULT_INST += riscv_insts_ctr.sail
 
 SAIL_DEFAULT_INST += riscv_insts_zba.sail
 SAIL_DEFAULT_INST += riscv_insts_zbb.sail
@@ -68,6 +69,7 @@ SAIL_RMEM_INST_SRCS = riscv_insts_begin.sail $(SAIL_RMEM_INST) riscv_insts_end.s
 SAIL_SYS_SRCS = riscv_csr_map.sail
 SAIL_SYS_SRCS += riscv_vext_control.sail # helpers for the 'V' extension
 SAIL_SYS_SRCS += riscv_next_regs.sail
+SAIL_SYS_SRCS += riscv_ctr_regs.sail
 SAIL_SYS_SRCS += riscv_sys_exceptions.sail # default basic helpers for exception handling
 SAIL_SYS_SRCS += riscv_sync_exception.sail # define the exception structure used in the model
 SAIL_SYS_SRCS += riscv_next_control.sail # helpers for the 'N' extension

c_emulator/riscv_platform.c

@@ -71,7 +71,22 @@ bool sys_enable_writable_misa(unit u)
 {
  return rv_enable_writable_misa;
 }
-
+uint64_t sys_valid_ctr_depth(unit u)
+{
+ return rv_valid_ctr_depth;
+}
+uint64_t sys_num_cce_bits(unit u)
+{
+ return rv_num_cce_bits;
+}
+uint64_t sys_mctrctl_warl_mask(unit u)
+{
+ return rv_mctrctl_warl_mask;
+}
+bool sys_enable_smctr(unit u)
+{
+ return rv_enable_smctr;
+}
 bool plat_enable_dirty_update(unit u)
 {
  return rv_enable_dirty_update;

c_emulator/riscv_platform.h

@@ -11,6 +11,11 @@ bool sys_enable_writable_misa(unit);
 bool sys_enable_writable_fiom(unit);
 bool sys_enable_vext(unit);
 
+uint64_t sys_valid_ctr_depth(unit u);
+uint64_t sys_num_cce_bits(unit u);
+uint64_t sys_mctrctl_warl_mask(unit u);
+bool sys_enable_smctr(unit u);
+
 uint64_t sys_pmp_count(unit);
 uint64_t sys_pmp_grain(unit);
 

c_emulator/riscv_platform_impl.c

@@ -6,6 +6,11 @@
 uint64_t rv_pmp_count = 0;
 uint64_t rv_pmp_grain = 0;
 
+uint64_t rv_valid_ctr_depth = 0x1F;
+uint64_t rv_num_cce_bits = 1;
+uint64_t rv_mctrctl_warl_mask = -1;
+bool rv_enable_smctr = true;
+
 bool rv_enable_svinval = false;
 bool rv_enable_zcb = false;
 bool rv_enable_zfinx = false;

c_emulator/riscv_platform_impl.h

@@ -11,6 +11,11 @@
 extern uint64_t rv_pmp_count;
 extern uint64_t rv_pmp_grain;
 
+extern uint64_t rv_valid_ctr_depth;
+extern uint64_t rv_num_cce_bits;
+extern uint64_t rv_mctrctl_warl_mask;
+extern bool rv_enable_smctr;
+
 extern bool rv_enable_svinval;
 extern bool rv_enable_zcb;
 extern bool rv_enable_zfinx;

c_emulator/riscv_sim.c

@@ -54,6 +54,10 @@ const char *RV32ISA = "RV32IMAC";
 #define OPT_PMP_COUNT 1002
 #define OPT_PMP_GRAIN 1003
 #define OPT_ENABLE_SVINVAL 1004
+#define OPT_ENABLE_SMCTR 1005
+#define OPT_VALID_CTR_DEPTH 1006
+#define OPT_NUM_CCE_BITS 1007
+#define OPT_MCTRCTL_WARL_MASK 1008
 #define OPT_ENABLE_ZCB 10014
 
 static bool do_dump_dts = false;
@@ -149,6 +153,10 @@ static struct option options[] = {
  {"enable-writable-fiom", no_argument, 0, OPT_ENABLE_WRITABLE_FIOM},
  {"enable-svinval", no_argument, 0, OPT_ENABLE_SVINVAL },
  {"enable-zcb", no_argument, 0, OPT_ENABLE_ZCB },
+ {"valid-ctr-depth", required_argument, 0, OPT_VALID_CTR_DEPTH },
+ {"num-cce-bits", required_argument, 0, OPT_NUM_CCE_BITS },
+ {"enable-smctr", no_argument, 0, OPT_ENABLE_SMCTR },
+ {"mctrctl-warl-mask", required_argument, 0, OPT_MCTRCTL_WARL_MASK },
 #ifdef SAILCOV
  {"sailcov-file", required_argument, 0, 'c' },
 #endif
@@ -245,6 +253,10 @@ static int process_args(int argc, char **argv)
  uint64_t ram_size = 0;
  uint64_t pmp_count = 0;
  uint64_t pmp_grain = 0;
+ uint64_t valid_ctr_depth = 0;
+ uint64_t num_cce_bits = 0;
+ uint64_t mctrctl_warl_mask = 0;
+
  while (true) {
  c = getopt_long(argc, argv,
  "a"
@@ -394,6 +406,38 @@ static int process_args(int argc, char **argv)
  fprintf(stderr, "enabling Zcb extension.\n");
  rv_enable_zcb = true;
  break;
+ case OPT_ENABLE_SMCTR:
+ fprintf(stderr, "enabling Smctr extension.\n");
+ rv_enable_smctr = true;
+ break;
+ case OPT_VALID_CTR_DEPTH:
+ rv_valid_ctr_depth = atol(optarg);
+ fprintf(stderr, "Valid CTR depth: %" PRIu64 "\n", rv_valid_ctr_depth);
+ if (rv_valid_ctr_depth > 0x1F) {
+ fprintf(stderr, "invalid CTR depth");
+ exit(1);
+ }
+ break;
+ case OPT_NUM_CCE_BITS:
+ num_cce_bits = atol(optarg);
+ fprintf(stderr, "Num CCE bits: %" PRIu64 "\n", num_cce_bits);
+ if (num_cce_bits > 4) {
+ fprintf(stderr, "invalid number of cce bits: must be 0,1,2,3, or 4 ");
+ exit(1);
+ }
+ rv_num_cce_bits = num_cce_bits;
+ break;
+ case OPT_MCTRCTL_WARL_MASK:
+ mctrctl_warl_mask = atol(optarg);
+ fprintf(stderr, "mctrctl WARL mask: %" PRIu64 "\n", mctrctl_warl_mask);
+ if (((mctrctl_warl_mask & 0x7) == 0)
+ || ((mctrctl_warl_mask & (1 << 11)) == 0)) {
+ fprintf(stderr,
+ "invalid mctrctl WARL mask - M/S/U/BPFRZ bits are mandatory");
+ exit(1);
+ }
+ rv_mctrctl_warl_mask = mctrctl_warl_mask;
+ break;
  case 'x':
  fprintf(stderr, "enabling Zfinx support.\n");
  rv_enable_zfinx = true;

model/riscv_csr_map.sail

@@ -49,8 +49,22 @@ mapping clause csr_name_map = 0x141 <-> "sepc"
 mapping clause csr_name_map = 0x142 <-> "scause"
 mapping clause csr_name_map = 0x143 <-> "stval"
 mapping clause csr_name_map = 0x144 <-> "sip"
+/* Supervisor Control Transfer Records Control Register */
+mapping clause csr_name_map = 0x14E <-> "sctrctl"
+/* Supervisor Control Transfer Records Status Register */
+mapping clause csr_name_map = 0x14F <-> "sctrstatus"
 /* supervisor protection and translation */
 mapping clause csr_name_map = 0x180 <-> "satp"
+/* supervisor indirect register select and alias CSRs */
+mapping clause csr_name_map = 0x150 <-> "siselect"
+mapping clause csr_name_map = 0x151 <-> "sireg"
+mapping clause csr_name_map = 0x152 <-> "sireg2"
+mapping clause csr_name_map = 0x153 <-> "sireg3"
+mapping clause csr_name_map = 0x155 <-> "sireg4"
+mapping clause csr_name_map = 0x156 <-> "sireg5"
+mapping clause csr_name_map = 0x157 <-> "sireg6"
+/* Supervisor Control Transfer Records Depth Register */
+mapping clause csr_name_map = 0x15F <-> "sctrdepth"
 /* supervisor envcfg */
 mapping clause csr_name_map = 0x10A <-> "senvcfg"
 /* machine information registers */
@@ -70,12 +84,25 @@ mapping clause csr_name_map = 0x306 <-> "mcounteren"
 mapping clause csr_name_map = 0x320 <-> "mcountinhibit"
 /* machine envcfg */
 mapping clause csr_name_map = 0x30A <-> "menvcfg"
+/* Smstateen csrs */
+mapping clause csr_name_map = 0x30C <-> "mstateen0"
+mapping clause csr_name_map = 0x31C <-> "mstateen0h"
 /* machine trap handling */
 mapping clause csr_name_map = 0x340 <-> "mscratch"
 mapping clause csr_name_map = 0x341 <-> "mepc"
 mapping clause csr_name_map = 0x342 <-> "mcause"
 mapping clause csr_name_map = 0x343 <-> "mtval"
 mapping clause csr_name_map = 0x344 <-> "mip"
+/* Machine Control Transfer Records Control Register */
+mapping clause csr_name_map = 0x34E <-> "mctrctl"
+/* Machine indirect register select and alias CSRs */
+mapping clause csr_name_map = 0x350 <-> "miselect"
+mapping clause csr_name_map = 0x351 <-> "mireg"
+mapping clause csr_name_map = 0x352 <-> "mireg2"
+mapping clause csr_name_map = 0x353 <-> "mireg3"
+mapping clause csr_name_map = 0x355 <-> "mireg4"
+mapping clause csr_name_map = 0x356 <-> "mireg5"
+mapping clause csr_name_map = 0x357 <-> "mireg6"
 /* machine protection and translation */
 mapping clause csr_name_map = 0x3A0 <-> "pmpcfg0"
 mapping clause csr_name_map = 0x3A1 <-> "pmpcfg1"