Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily set localparam ZC_EXT to 0 #597

Merged
merged 2 commits into from
Jun 28, 2022
Merged

Temporarily set localparam ZC_EXT to 0 #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b511034
Temporarily disabled localparam ZC_EXT.
silabs-oysteink Jun 28, 2022
d78d011
Temporarily commented out sequencer assert binding in the wrapper.
silabs-oysteink Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions bhv/cv32e40x_rvfi.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,10 +659,6 @@ module cv32e40x_rvfi
assign insn_funct7 = rvfi_insn[31:25];
assign insn_csr = rvfi_insn[31:20];

`ifdef CV32E40X_TRACE_EXECUTION
`include "cv32e40x_rvfi_trace.svh"
`endif

cv32e40x_rvfi_instr_obi
rvfi_instr_obi_i
(
Expand Down
56 changes: 0 additions & 56 deletions bhv/cv32e40x_rvfi_trace.svh
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion bhv/cv32e40x_wrapper.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,12 @@ module cv32e40x_wrapper
.PMA_CFG(PMA_CFG))
write_buffer_sva(.*);

/* todo: include once localparam ZC_EXT is set back to 1
bind cv32e40x_sequencer:
core_i.if_stage_i.gen_seq.sequencer_i
cv32e40x_sequencer_sva
sequencer_sva (.*);

*/
`ifndef FORMAL
bind cv32e40x_rvfi:
rvfi_i
Expand Down
3 changes: 2 additions & 1 deletion rtl/cv32e40x_core.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ module cv32e40x_core import cv32e40x_pkg::*;
localparam int unsigned REGFILE_NUM_READ_PORTS = X_EXT ? X_NUM_RS : 2;

// Zc is always present
localparam bit ZC_EXT = 1;
// todo: turn on when Zc is ready for core-v-verif
localparam bit ZC_EXT = 0;

// Determine alignedness of mtvt
// mtvt[31:N] holds mtvt table entry
Expand Down