Parameterize Zicntr and Xif features #951
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Halfdan Bechmann Dolva <halfdan.bechmann@silabs.com>
Signed-off-by: Halfdan Bechmann Dolva <halfdan.bechmann@silabs.com>
Silabs-ArjanB
requested changes
Sep 15, 2023
rtl/cv32e40x_cs_registers.sv
Outdated
| csr_rdata_int = mhpmcounter_rdata[csr_raddr[4:0]][31:0]; | ||
| csr_counter_read_o = 1'b1; | ||
| CSR_HPMCOUNTER28, CSR_HPMCOUNTER29, CSR_HPMCOUNTER30, CSR_HPMCOUNTER31 : begin | ||
| if (ZICNTR) begin : zicntr_counters |
There was a problem hiding this comment.
ZICNTR is a misleading name. Please rename all ZICNTR and zicntr to ZICNTR_ZIHPM and zicntr_zihpm respectively. Or separate ZICNTR and ZIHPM local parameters
There was a problem hiding this comment.
Good point, will parameterize them separately.
There was a problem hiding this comment.
Pushed this now, also LEC clean.
rtl/cv32e40x_cs_registers.sv
Outdated
| csr_counter_read_o = 1'b1; | ||
| CSR_HPMCOUNTER28H, CSR_HPMCOUNTER29H, CSR_HPMCOUNTER30H, CSR_HPMCOUNTER31H : begin | ||
| if (ZICNTR) begin : zicntr_hcounters | ||
| csr_rdata_int = mhpmcounter_rdata[csr_raddr[4:0]][63:32]; |
There was a problem hiding this comment.
One less space before =
Signed-off-by: Halfdan Bechmann Dolva <halfdan.bechmann@silabs.com>
Silabs-ArjanB
approved these changes
Sep 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Parameterized Zicntr only registers.
Parameterized speculative reads for Xif.
LEC clean with ZICNTR=1'b1 and X_EXT=1'b1.
Logically equivalent to cv32e40s with all core exclusive features disabled (ZICNTR=1'b0, X_EXT=1'b0, etc.).