feat(smcntrpmf): support Smcntrpmf extension (#811)

wissygh · web-flow · commit b62ec64411d5 · 2026-01-28T14:10:54.000+08:00
diff --git a/configs/riscv64-gem5-multicore-ref_defconfig b/configs/riscv64-gem5-multicore-ref_defconfig
@@ -71,6 +71,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-gem5-ref_defconfig b/configs/riscv64-gem5-ref_defconfig
@@ -71,6 +71,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-nanhu-dual-ref_defconfig b/configs/riscv64-nanhu-dual-ref_defconfig
@@ -74,6 +74,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-nanhu-ref_defconfig b/configs/riscv64-nanhu-ref_defconfig
@@ -74,6 +74,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-nanhu_defconfig b/configs/riscv64-nanhu_defconfig
@@ -80,6 +80,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-nutshell-diff-spike_defconfig b/configs/riscv64-nutshell-diff-spike_defconfig
@@ -53,6 +53,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_MSTATUS_FS_WRITABLE is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-nutshell-ref_defconfig b/configs/riscv64-nutshell-ref_defconfig
@@ -61,6 +61,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVPBMT is not set
 CONFIG_RV_MSTATUS_FS_WRITABLE=y
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-nutshell_defconfig b/configs/riscv64-nutshell_defconfig
@@ -67,6 +67,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVPBMT is not set
 CONFIG_RV_MSTATUS_FS_WRITABLE=y
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-pa_defconfig b/configs/riscv64-pa_defconfig
@@ -78,6 +78,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-spm-ref-xs_defconfig b/configs/riscv64-spm-ref-xs_defconfig
@@ -67,6 +67,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-spm-xs_defconfig b/configs/riscv64-spm-xs_defconfig
@@ -73,6 +73,7 @@ CONFIG_RV_ASID_LEN=16
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-ahead-ref_defconfig b/configs/riscv64-xs-ahead-ref_defconfig
@@ -72,6 +72,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-clang-ref_defconfig b/configs/riscv64-xs-clang-ref_defconfig
@@ -86,6 +86,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-clang_defconfig b/configs/riscv64-xs-clang_defconfig
@@ -90,6 +90,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-cpt-with-flash_defconfig b/configs/riscv64-xs-cpt-with-flash_defconfig
@@ -81,6 +81,7 @@ CONFIG_RV_SMMPM=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-cpt-with-libcheckpoint_defconfig b/configs/riscv64-xs-cpt-with-libcheckpoint_defconfig
@@ -81,6 +81,7 @@ CONFIG_RV_SMMPM=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-cpt_defconfig b/configs/riscv64-xs-cpt_defconfig
@@ -81,6 +81,7 @@ CONFIG_RV_SMMPM=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-custom-tensor_defconfig b/configs/riscv64-xs-custom-tensor_defconfig
@@ -90,6 +90,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-diff-spike-agnostic_defconfig b/configs/riscv64-xs-diff-spike-agnostic_defconfig
@@ -90,6 +90,7 @@ CONFIG_RV_SMMPM=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 # CONFIG_RV_SHLCOFIDELEG is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-diff-spike-withflash_defconfig b/configs/riscv64-xs-diff-spike-withflash_defconfig
@@ -90,6 +90,7 @@ CONFIG_RV_SMMPM=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 # CONFIG_RV_SHLCOFIDELEG is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-diff-spike_defconfig b/configs/riscv64-xs-diff-spike_defconfig
@@ -90,6 +90,7 @@ CONFIG_RV_SMMPM=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 # CONFIG_RV_SHLCOFIDELEG is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-dual-ref-debug_defconfig b/configs/riscv64-xs-dual-ref-debug_defconfig
@@ -86,6 +86,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-dual-ref_defconfig b/configs/riscv64-xs-dual-ref_defconfig
@@ -86,6 +86,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-fpga_defconfig b/configs/riscv64-xs-fpga_defconfig
@@ -75,6 +75,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-kunminghu-v3-ref_defconfig b/configs/riscv64-xs-kunminghu-v3-ref_defconfig
@@ -86,6 +86,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-novga_defconfig b/configs/riscv64-xs-novga_defconfig
@@ -75,6 +75,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-ref-debug_defconfig b/configs/riscv64-xs-ref-debug_defconfig
@@ -86,6 +86,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-ref_bitmap_defconfig b/configs/riscv64-xs-ref_bitmap_defconfig
@@ -86,6 +86,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-ref_defconfig b/configs/riscv64-xs-ref_defconfig
@@ -86,6 +86,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs-southlake-debug_defconfig b/configs/riscv64-xs-southlake-debug_defconfig
@@ -75,6 +75,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-southlake-fpga_defconfig b/configs/riscv64-xs-southlake-fpga_defconfig
@@ -75,6 +75,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-southlake-ref-debug_defconfig b/configs/riscv64-xs-southlake-ref-debug_defconfig
@@ -69,6 +69,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-southlake-ref_defconfig b/configs/riscv64-xs-southlake-ref_defconfig
@@ -76,6 +76,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-southlake_defconfig b/configs/riscv64-xs-southlake_defconfig
@@ -75,6 +75,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-spmem-ref_defconfig b/configs/riscv64-xs-spmem-ref_defconfig
@@ -84,6 +84,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs-spmem-so-ref_defconfig b/configs/riscv64-xs-spmem-so-ref_defconfig
@@ -78,6 +78,7 @@ CONFIG_RV_VMID_LEN=14
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 CONFIG_XTVEC_VECTORED_MODE=y
diff --git a/configs/riscv64-xs_bitmap_defconfig b/configs/riscv64-xs_bitmap_defconfig
@@ -89,6 +89,7 @@ CONFIG_RV_SMMPM=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-xs_defconfig b/configs/riscv64-xs_defconfig
@@ -90,6 +90,7 @@ CONFIG_RV_SMCSRIND_SUB=y
 CONFIG_RV_SVNAPOT=y
 CONFIG_RV_SVPBMT=y
 CONFIG_RV_SSCOFPMF=y
+CONFIG_RV_SMCNTRPMF=y
 CONFIG_RV_SHLCOFIDELEG=y
 CONFIG_RV_SMSTATEEN=y
 CONFIG_MISA_UNCHANGEABLE=y
diff --git a/configs/riscv64-yanqihu-dual-ref_defconfig b/configs/riscv64-yanqihu-dual-ref_defconfig
@@ -61,6 +61,7 @@ CONFIG_RV_ASID_LEN=0
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 # CONFIG_XTVEC_VECTORED_MODE is not set
diff --git a/configs/riscv64-yanqihu-ref_defconfig b/configs/riscv64-yanqihu-ref_defconfig
@@ -61,6 +61,7 @@ CONFIG_RV_ASID_LEN=0
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 # CONFIG_XTVEC_VECTORED_MODE is not set
diff --git a/configs/riscv64-yanqihu_defconfig b/configs/riscv64-yanqihu_defconfig
@@ -64,6 +64,7 @@ CONFIG_RV_ASID_LEN=0
 # CONFIG_RV_SVNAPOT is not set
 # CONFIG_RV_SVPBMT is not set
 # CONFIG_RV_SSCOFPMF is not set
+# CONFIG_RV_SMCNTRPMF is not set
 # CONFIG_RV_SMSTATEEN is not set
 CONFIG_MISA_UNCHANGEABLE=y
 # CONFIG_XTVEC_VECTORED_MODE is not set
diff --git a/ready-to-run.yml b/ready-to-run.yml
@@ -1,7 +1,7 @@
 spike:
   type: github-release
   repo: OpenXiangShan/riscv-isa-sim
-  version: v2025.12.r2
+  version: v2026.01.r1
   assets:
     - save_as: spike-xiangshan-ref.so
       asset_name: spike-{version}-xiangshan-ref.so
diff --git a/src/isa/riscv64/Kconfig b/src/isa/riscv64/Kconfig
@@ -566,6 +566,10 @@ config RV_SSCOFPMF
   bool "(Beta)Enable Sscofpmf extension(Supervisor-level Count OverFlow and Privilege Mode Filtering)"
   default n
 
+config RV_SMCNTRPMF
+  bool "(Beta)Enable Smcntrpmf extension(Cycle and Instret Privilege Mode Filtering)"
+  default n
+
 config RV_SHLCOFIDELEG
   depends on RVH
   depends on RV_SSCOFPMF
diff --git a/src/isa/riscv64/init.c b/src/isa/riscv64/init.c
@@ -218,6 +218,11 @@ void init_isa() {
   scontext->val = 0;
 #endif // CONFIG_RV_SDTRIG
 
+#ifdef CONFIG_RV_SMCNTRPMF
+  mcyclecfg->val = 0;
+  minstretcfg->val = 0;
+#endif // CONFIG_RV_SMCNTRPMF
+
 #ifdef CONFIG_RV_IMSIC
   init_iprio();
 #endif
diff --git a/src/isa/riscv64/local-include/csr.h b/src/isa/riscv64/local-include/csr.h
diff --git a/src/isa/riscv64/system/priv.c b/src/isa/riscv64/system/priv.c
