github-mirrors/cva6
1
0
Fork 0
mirror of https://github.com/openhwgroup/cva6.git synced 2025-04-22 21:27:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove ifdef directives from IO cva6 module (#1153)

Browse source
This commit is contained in:
JeanRochCoulon 2023-04-04 07:52:10 +02:00 • committed by GitHub
parent bf25dc793c
commit d7491f4e28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -140,6 +140,7 @@ endif
# this list contains the standalone components
src := corev_apu/tb/axi_adapter.sv \
corev_apu/tb/ariane.sv \
$(wildcard corev_apu/bootrom/*.sv) \
$(wildcard corev_apu/clint/*.sv) \
$(wildcard corev_apu/fpga/src/axi2apb/src/*.sv) \

1
core/Flist.cva6
View file

@ -98,7 +98,6 @@ ${CVA6_REPO_DIR}/vendor/pulp-platform/fpnew/src/fpu_div_sqrt_mvp/hdl/nrbd_nrsc_m
${CVA6_REPO_DIR}/vendor/pulp-platform/fpnew/src/fpu_div_sqrt_mvp/hdl/preprocess_mvp.sv
// Top-level source files (not necessarily instantiated at the top of the cva6).
${CVA6_REPO_DIR}/core/ariane.sv
${CVA6_REPO_DIR}/core/cva6.sv
${CVA6_REPO_DIR}/core/alu.sv
// Note: depends on fpnew_pkg, above

11
core/cva6.sv
View file

@ -46,26 +46,17 @@ module cva6 import ariane_pkg::*; #(
// Timer facilities
input logic time_irq_i, // timer interrupt in (async)
input logic debug_req_i, // debug request (async)
`ifdef FIRESIM_TRACE
// firesim trace port
output traced_instr_pkg::trace_port_t trace_o,
`endif
`ifdef RVFI_TRACE
// RISC-V formal interface port (`rvfi`):
// Can be left open when formal tracing is not needed.
output ariane_rvfi_pkg::rvfi_port_t rvfi_o,
`endif
output cvxif_pkg::cvxif_req_t cvxif_req_o,
input cvxif_pkg::cvxif_resp_t cvxif_resp_i,
`ifdef PITON_ARIANE
// L15 (memory side)
output wt_cache_pkg::l15_req_t l15_req_o,
input wt_cache_pkg::l15_rtrn_t l15_rtrn_i
`else
input wt_cache_pkg::l15_rtrn_t l15_rtrn_i,
// memory side, AXI Master
output axi_req_t axi_req_o,
input axi_rsp_t axi_resp_i
`endif
);
// ------------------------------------------

11
core/ariane.sv → corev_apu/tb/ariane.sv
View file

@ -78,18 +78,21 @@ module ariane import ariane_pkg::*; #(
.ipi_i ( ipi_i ),
.time_irq_i ( time_irq_i ),
.debug_req_i ( debug_req_i ),
`ifdef FIRESIME_TRACE
.trace_o ( trace_o ),
`endif
`ifdef RVFI_TRACE
.rvfi_o ( rvfi_o ),
`else
.rvfi_o ( ),
`endif
.cvxif_req_o ( cvxif_req ),
.cvxif_resp_i ( cvxif_resp ),
`ifdef PITON_ARIANE
.l15_req_o ( l15_req_o ),
.l15_rtrn_i ( l15_rtrn_i )
.l15_rtrn_i ( l15_rtrn_i ),
.axi_req_o ( ),
.axi_resp_i ( '0 )
`else
.l15_req_o ( ),
.l15_rtrn_i ( '0 ),
.axi_req_o ( axi_req_o ),
.axi_resp_i ( axi_resp_i )
`endif