Skip to content

Commit

Permalink
[Bender, hardware] Bump axi to v0.39.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mp-17 committed Nov 13, 2023
1 parent 54f5e85 commit eae58a7
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 30 deletions.
1 change: 1 addition & 0 deletions Bender.local
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
# SPDX-License-Identifier: SHL-0.51

overrides:
axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.1 }
tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.13 }
41 changes: 21 additions & 20 deletions Bender.lock
Original file line number Diff line number Diff line change
@@ -1,56 +1,57 @@
packages:
apb:
revision: null
version: null
revision: 77ddf073f194d44b9119949d2421be59789e69ae
version: 0.2.4
source:
Path: hardware/deps/apb
Git: https://github.com/pulp-platform/apb.git
dependencies:
- common_cells
ariane:
revision: null
revision: 44f387fb71464336cab47597c433411345ae4a6e
version: null
source:
Path: hardware/deps/ariane
Git: https://github.com/pulp-platform/cva6.git
dependencies:
- axi
- common_cells
- fpnew
- tech_cells_generic
axi:
revision: null
version: null
revision: fccffb5953ec8564218ba05e20adbedec845e014
version: 0.39.1
source:
Path: hardware/deps/axi
Git: https://github.com/pulp-platform/axi.git
dependencies:
- common_cells
- common_verification
- tech_cells_generic
common_cells:
revision: null
version: null
revision: 2bd027cb87eaa9bf7d17196ec5f69864b35b630f
version: 1.32.0
source:
Path: hardware/deps/common_cells
Git: https://github.com/pulp-platform/common_cells.git
dependencies:
- common_verification
- tech_cells_generic
common_verification:
revision: null
version: null
revision: 9c07fa860593b2caabd9b5681740c25fac04b878
version: 0.2.3
source:
Path: hardware/deps/common_verification
Git: https://github.com/pulp-platform/common_verification.git
dependencies: []
fpnew:
revision: null
version: null
revision: 3116391bf66660f806b45e212b9949c528b4e270
version: 0.7.0
source:
Path: hardware/deps/fpnew
Git: https://github.com/openhwgroup/cvfpu.git
dependencies:
- common_cells
- fpu_div_sqrt_mvp
fpu_div_sqrt_mvp:
revision: null
version: null
revision: 86e1f558b3c95e91577c41b2fc452c86b04e85ac
version: 1.0.4
source:
Path: hardware/deps/fpu_div_sqrt_mvp
Git: https://github.com/pulp-platform/fpu_div_sqrt_mvp.git
dependencies:
- common_cells
tech_cells_generic:
Expand Down
2 changes: 1 addition & 1 deletion Bender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package:
- "Paul Scheffler <[email protected]>"

dependencies:
axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.31.0 }
axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.1 }
common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.22.1 }
ariane: { git: "https://github.com/pulp-platform/cva6.git", rev: mp/acc_port_rebase } # mp/acc_port_rebase
tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.13 }
Expand Down
5 changes: 3 additions & 2 deletions hardware/src/ara_soc.sv
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ module ara_soc import axi_pkg::*; import ara_pkg::*; #(
MaxSlvTrans : 4,
FallThrough : 1'b0,
LatencyMode : axi_pkg::CUT_MST_PORTS,
PipelineStages : 0,
AxiIdWidthSlvPorts: AxiSocIdWidth,
AxiIdUsedSlvPorts : AxiSocIdWidth,
UniqueIds : 1'b0,
Expand Down Expand Up @@ -188,8 +189,8 @@ module ara_soc import axi_pkg::*; import ara_pkg::*; #(
axi_atop_filter #(
.AxiIdWidth (AxiSocIdWidth ),
.AxiMaxWriteTxns(4 ),
.req_t (soc_wide_req_t ),
.resp_t (soc_wide_resp_t)
.axi_req_t (soc_wide_req_t ),
.axi_resp_t (soc_wide_resp_t)
) i_l2mem_atop_filter (
.clk_i (clk_i ),
.rst_ni (rst_ni ),
Expand Down
14 changes: 7 additions & 7 deletions hardware/src/vlsu/vlsu.sv
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ module vlsu import ara_pkg::*; import rvv_pkg::*; #(
axi_resp_t axi_resp;

axi_cut #(
.ar_chan_t(axi_ar_t ),
.r_chan_t (axi_r_t ),
.aw_chan_t(axi_aw_t ),
.w_chan_t (axi_w_t ),
.b_chan_t (axi_b_t ),
.req_t (axi_req_t ),
.resp_t (axi_resp_t)
.ar_chan_t (axi_ar_t ),
.r_chan_t (axi_r_t ),
.aw_chan_t (axi_aw_t ),
.w_chan_t (axi_w_t ),
.b_chan_t (axi_b_t ),
.axi_req_t (axi_req_t ),
.axi_resp_t(axi_resp_t)
) i_axi_cut (
.clk_i (clk_i ),
.rst_ni (rst_ni ),
Expand Down

0 comments on commit eae58a7

Please sign in to comment.