From 9c4a3c37d65a7d99dd86dfe19d3c50a37f9a543e Mon Sep 17 00:00:00 2001
From: Jalali <110232072+AyoubJalali@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:13:57 +0000
Subject: [PATCH] Remove mcountinhibit from csr_test and UVM env (#1863)

---
 verif/env/uvme/uvme_cva6_cfg.sv               |  4 +-
 verif/tests/custom/csr_embedded/csrcs_test.S  | 57 -------------------
 verif/tests/custom/csr_embedded/csrcsi_test.S | 45 ---------------
 verif/tests/custom/csr_embedded/csrrw_test.S  | 38 -------------
 verif/tests/custom/csr_embedded/csrrwi_test.S | 39 -------------
 5 files changed, 1 insertion(+), 182 deletions(-)

diff --git a/verif/env/uvme/uvme_cva6_cfg.sv b/verif/env/uvme/uvme_cva6_cfg.sv
index 19be98effc..16b00d0bed 100644
--- a/verif/env/uvme/uvme_cva6_cfg.sv
+++ b/verif/env/uvme/uvme_cva6_cfg.sv
@@ -271,6 +271,7 @@ function void uvme_cva6_cfg_c::set_unsupported_csr_mask();
 
    // Remove unsupported CSRs for Embedded configuration
    unsupported_csr_mask[uvma_core_cntrl_pkg::MTVAL] = 1;
+   unsupported_csr_mask[uvma_core_cntrl_pkg::MCOUNTINHIBIT] = 1;
 
    // Add supported CSRs for Embedded configuration
    for (int i = 0; i < MAX_NUM_HPMCOUNTERS; i++) begin
@@ -285,9 +286,6 @@ function void uvme_cva6_cfg_c::set_unsupported_csr_mask();
    unsupported_csr_mask[uvma_core_cntrl_pkg::CYCLEH] = 0;
    unsupported_csr_mask[uvma_core_cntrl_pkg::INSTRETH] = 0;
 
-   // Exist but only-read zero in embedded application
-   unsupported_csr_mask[uvma_core_cntrl_pkg::MCOUNTINHIBIT] = 0;
-
    // Remove unsupported pmp CSRs
    if (nr_pmp_entries == 0) begin
        unsupported_csr_mask[uvma_core_cntrl_pkg::PMPCFG0+:16]  = 16'hffff;
diff --git a/verif/tests/custom/csr_embedded/csrcs_test.S b/verif/tests/custom/csr_embedded/csrcs_test.S
index 2fad6e0840..3d26b2a492 100644
--- a/verif/tests/custom/csr_embedded/csrcs_test.S
+++ b/verif/tests/custom/csr_embedded/csrcs_test.S
@@ -5840,61 +5840,4 @@ csrcs:
     #MHPMEVENT20 read value
     csrr x14, 0x334
 
-    ##########################
-    #MCOUNTINHBIT testing W/R values '{'h1f, 'h0, 'h15, 'ha, 'h4}
-    ##########################
-    #MCOUNTINHBIT Write clear/set value 0x1f
-    li x3, 0xffffffe0
-    csrrc x14, 0x320, x3
-    li x3, 0x1f
-    csrrs x14, 0x320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x0
-    li x3, 0xffffffff
-    csrrc x14, 0x320, x3
-    li x3, 0x0
-    csrrs x14, 0x320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x15
-    li x3, 0xffffffea
-    csrrc x14, 0x320, x3
-    li x3, 0x15
-    csrrs x14, 0x320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0xa
-    li x3, 0xfffffff5
-    csrrc x14, 0x320, x3
-    li x3, 0xa
-    csrrs x14, 0x320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x4
-    li x3, 0xfffffffb
-    csrrc x14, 0x320, x3
-    li x3, 0x4
-    csrrs x14, 0x320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x4
-    li x19, 0xfffffffb
-    csrrc x19, 0x320, x19
-    li x3, 0x4
-    csrrs x19, 0x320, x19
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
     ret
diff --git a/verif/tests/custom/csr_embedded/csrcsi_test.S b/verif/tests/custom/csr_embedded/csrcsi_test.S
index 0ef92d7c73..9c4775b1ad 100644
--- a/verif/tests/custom/csr_embedded/csrcsi_test.S
+++ b/verif/tests/custom/csr_embedded/csrcsi_test.S
@@ -4630,49 +4630,4 @@ csrcsi:
     #MHPMEVENT9 read value
     csrr x14, 0x329
 
-    ##########################
-    #MCOUNTINHBIT testing W/R values '{'h1f, 'h0, 'h15, 'ha, 'h6}
-    ##########################
-    #MCOUNTINHBIT Write clear/set value 0x1f
-    csrrci x14, 0x320, 0x0
-    csrrsi x14, 0x320, 0x1f
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x0
-    csrrci x14, 0x320, 0x1f
-    csrrsi x14, 0x320, 0x0
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x15
-    csrrci x14, 0x320, 0xa
-    csrrsi x14, 0x320, 0x15
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0xa
-    csrrci x14, 0x320, 0x15
-    csrrsi x14, 0x320, 0xa
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x6
-    csrrci x14, 0x320, 0x19
-    csrrsi x14, 0x320, 0x6
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write clear/set value 0x6
-    csrrci x0, 0x320, 0x19
-    csrrsi x0, 0x320, 0x6
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
     ret
diff --git a/verif/tests/custom/csr_embedded/csrrw_test.S b/verif/tests/custom/csr_embedded/csrrw_test.S
index e1dc1a75f7..e50aadfcc3 100644
--- a/verif/tests/custom/csr_embedded/csrrw_test.S
+++ b/verif/tests/custom/csr_embedded/csrrw_test.S
@@ -4630,42 +4630,4 @@ csrrw:
     #MHPMCOUNTERH14 read value
     csrr x14, 0xb8e
 
-    ##########################
-    #MCOUNTINHBIT testing W/R values '{'hffffffff, 'h0, 'h55555555, 'haaaaaaaa, 'h9683580}
-    ##########################
-    #MCOUNTINHBIT Write value 0xffffffff
-    li x3, 0xffffffff
-    csrw 0X320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0X320
-
-    #MCOUNTINHBIT Write value 0x0
-    li x3, 0x0
-    csrw 0X320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0X320
-
-    #MCOUNTINHBIT Write value 0x55555555
-    li x3, 0x55555555
-    csrw 0X320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0X320
-
-    #MCOUNTINHBIT Write value 0xaaaaaaaa
-    li x3, 0xaaaaaaaa
-    csrw 0X320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0X320
-
-    #MCOUNTINHBIT Write value 0x9683580
-    li x3, 0x9683580
-    csrw 0X320, x3
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0X320
-
     ret
diff --git a/verif/tests/custom/csr_embedded/csrrwi_test.S b/verif/tests/custom/csr_embedded/csrrwi_test.S
index 44fc27f563..c8b46ff778 100644
--- a/verif/tests/custom/csr_embedded/csrrwi_test.S
+++ b/verif/tests/custom/csr_embedded/csrrwi_test.S
@@ -4025,43 +4025,4 @@ csrrwi:
     #MHPMEVENT31 read value
     csrr x14, 0x33f
 
-    ##########################
-    #MCOUNTINHBIT testing W/R values '{'h1f, 'h0, 'h15, 'ha, 'h1}
-    ##########################
-    #MCOUNTINHBIT Write immediate value 0x1f
-    csrrwi x14, 0x320, 0x1f
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write immediate value 0x0
-    csrrwi x14, 0x320, 0x0
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write immediate value 0x15
-    csrrwi x14, 0x320, 0x15
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write immediate value 0xa
-    csrrwi x14, 0x320, 0xa
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write immediate value 0x1
-    csrrwi x14, 0x320, 0x1
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
-    #MCOUNTINHBIT Write immediate value 0x1
-    csrrwi x0, 0x320, 0x1
-
-    #MCOUNTINHBIT read value
-    csrr x14, 0x320
-
     ret