Revert "[dv] Enable Zcb and Zcmp extension in compiler"

This reverts commit 69083c1.

Author: SamuelRiedel

dv/uvm/core_ibex/riscv_dv_extension/testlist.yaml

@@ -1157,36 +1157,3 @@
   rtl_test: core_ibex_base_test
   rtl_params:
     RV32B: ["ibex_pkg::RV32BFull", "ibex_pkg::RV32BOTEarlGrey", "ibex_pkg::RV32BBalanced"]
-
-- test: riscv_zcb_balanced_test
-  desc: >
-    Random instruction test with zcb instructions in balanced configuration
-  iterations: 10
-  gen_test: riscv_rand_instr_test
-  gen_opts: >
-    +enable_zcb_extension=1
-  rtl_test: core_ibex_base_test
-
-- test: riscv_zcmp_balanced_test
-  desc: >
-    Random instruction test with zcmp instructions in balanced configuration
-  iterations: 10
-  gen_test: riscv_rand_instr_test
-  gen_opts: >
-    +enable_zcb_extension=1
-    +enable_zcmp_extension=1
-  rtl_test: core_ibex_base_test
-
-- test: riscv_zcmp_directed_test
-  desc: >
-    Random instruction test with zcmp instructions in balanced configuration
-  iterations: 10
-  gen_test: riscv_instr_base_test
-  gen_opts: >
-    +enable_zcb_extension=1
-    +enable_zcmp_extension=1
-    +directed_instr_0=riscv_zcmp_chain_instr_stream,1
-    +instr_cnt=100
-    +num_of_sub_program=0
-    +no_branch_jump=1
-  rtl_test: core_ibex_base_test

dv/uvm/core_ibex/scripts/ibex_cmd.py

@@ -114,9 +114,8 @@ def get_isas_for_config(cfg: Config) -> Tuple[str, str]:
 
     has_bitmanip = cfg.rv32b != 'ibex_pkg::RV32BNone'
     toolchain_isa = base_isa + ('b' if has_bitmanip else '')
-    toolchain_isa = toolchain_isa + ('_zicsr_zifencei_zcb_zcmp')
 
-    return (toolchain_isa, '_'.join([base_isa] + ['Zicsr','Zifencei','Zcb','Zcmp'] + bitmanip_isa))
+    return (toolchain_isa, '_'.join([base_isa] + bitmanip_isa))
 
 
 _TestEntry = Dict[str, object]

dv/uvm/core_ibex/tests/core_ibex_base_test.sv

@@ -70,10 +70,6 @@ class core_ibex_base_test extends uvm_test;
     isa = {"rv32", RV32E ? "e" : "i"};
     if (RV32M != RV32MNone) isa = {isa, "m"};
     isa = {isa, "c"};
-    isa = {isa, "_Zicsr"};
-    isa = {isa, "_Zifencei"};
-    isa = {isa, "_Zcb"};
-    isa = {isa, "_Zcmp"};
     case (RV32B)
       RV32BNone:
         ;