github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-04-22 12:57:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ISA strings from Xbitmanip to XZb*

Browse source 
This allows us to model stuff more closely. This depends on Spike
version ibex-cosim-v0.2 (which is rebased onto a master branch commit
supporting these more specific ISA strings).
This commit is contained in:
Rupert Swarbrick 2022-02-17 16:23:51 +00:00 • committed by hcallahan-lowrisc
parent 05f3b205c5
commit 09d2dd2306
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dv/uvm/core_ibex/scripts/scripts_lib.py
View file

@ -123,9 +123,11 @@ def get_isas_for_config(cfg: Config) -> Tuple[str, str]:
bitmanip_mapping = {
'ibex_pkg::RV32BNone': [],
'ibex_pkg::RV32BBalanced': ['Zba', 'Zbb', 'Zbs', 'Xbitmanip'],
'ibex_pkg::RV32BOTEarlGrey': ['Zba', 'Zbb', 'Zbc', 'Zbs', 'Xbitmanip'],
'ibex_pkg::RV32BFull': ['Zba', 'Zbb', 'Zbc', 'Zbs', 'Xbitmanip'],
'ibex_pkg::RV32BBalanced': ['Zba', 'Zbb', 'Zbs', 'XZbf', 'XZbt'],
'ibex_pkg::RV32BOTEarlGrey': ['Zba', 'Zbb', 'Zbc', 'Zbs',
'XZbf', 'XZbp', 'XZbr', 'XZbt'],
'ibex_pkg::RV32BFull': ['Zba', 'Zbb', 'Zbc', 'Zbs',
'XZbe', 'XZbf', 'XZbp', 'XZbr', 'XZbt']
}
bitmanip_isa = bitmanip_mapping.get(cfg.rv32b)

10
dv/uvm/core_ibex/tests/core_ibex_base_test.sv
View file

@ -59,10 +59,6 @@ class core_ibex_base_test extends uvm_test;
// Construct the right ISA string for the cosimulator by looking at top-level testbench
// parameters.
//
// Note that the bitmanip extensions from the v0.93 spec (Zbe, Zbf, Zbp, Zbr, Zbt) are all
// contained in "Xbitmanip" for Spike at the moment. The specific parts used are listed in
// comments below.
isa = {"rv32", RV32E ? "e" : "i"};
if (RV32M != RV32MNone) isa = {isa, "m"};
isa = {isa, "c"};
@ -70,11 +66,11 @@ class core_ibex_base_test extends uvm_test;
RV32BNone:
;
RV32BBalanced:
isa = {isa, "_Zba_Zbb_Zbs_Xbitmanip"}; // + Zbf, Zbt
isa = {isa, "_Zba_Zbb_Zbs_XZbf_XZbt"};
RV32BOTEarlGrey:
isa = {isa, "_Zba_Zbb_Zbc_Zbs_Xbitmanip"}; // + Zbf, Zbp, Zbr, Zbt
isa = {isa, "_Zba_Zbb_Zbc_Zbs_XZbf_XZbp_XZbr_XZbt"};
RV32BFull:
isa = {isa, "_Zba_Zbb_Zbc_Zbs_Xbitmanip"}; // + Zbe, Zbf, Zbp, Zbr, Zbt
isa = {isa, "_Zba_Zbb_Zbc_Zbs_XZbe_XZbf_XZbp_XZbr_XZbt"};
endcase
return isa;

9
examples/simple_system/ibex_simple_system.cc
View file

@ -45,19 +45,20 @@ std::string SimpleSystem::GetIsaString() const {
extensions += "c";
// See the equivalent get_isa_string() function in core_ibex_base_test.sv for
// an explanation of the different ISA strings
switch (top.ibex_simple_system->RV32B) {
case 0: // RV32BNone
break;
case 1: // RV32BBalanced
extensions += "_Zba_Zbb_Zbs_Xbitmanip";
extensions += "_Zba_Zbb_Zbs_XZbf_XZbt";
break;
case 2: // RV32BOTEarlGrey
extensions += "_Zba_Zbb_Zbc_Zbs_XZbf_XZbp_XZbr_XZbt";
break;
case 3: // RV32BFull
extensions += "_Zba_Zbb_Zbc_Zbs_Xbitmanip";
extensions += "_Zba_Zbb_Zbc_Zbs_XZbe_XZbf_XZbp_XZbr_XZbt";
break;
}