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

[Bugfix hpdcache] axi struct usage #1802

Merged
merged 4 commits into from
Feb 5, 2024
Merged

[Bugfix hpdcache] axi struct usage #1802

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8275fe
Add parameter types for axi channel b and r and remove their local ty…
CoralieAllioux Feb 2, 2024
cdd3199
Remove include axi typedef and local axi typedef: use parameter types…
CoralieAllioux Feb 2, 2024
60801bd
Update hdpcache parameters to propagate axi typedef
CoralieAllioux Feb 2, 2024
7b88198
Remove white space to resolve verible report
CoralieAllioux Feb 5, 2024
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
22 changes: 9 additions & 13 deletions core/cache_subsystem/cva6_hpdcache_subsystem.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ module cva6_hpdcache_subsystem
parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty,
parameter int NumPorts = 4,
parameter int NrHwPrefetchers = 4,
// AXI types
parameter type axi_ar_chan_t = logic,
parameter type axi_aw_chan_t = logic,
parameter type axi_w_chan_t = logic,
parameter type axi_b_chan_t = logic,
parameter type axi_r_chan_t = logic,
parameter type noc_req_t = logic,
parameter type noc_resp_t = logic,
parameter type cmo_req_t = logic,
Expand Down Expand Up @@ -87,8 +93,6 @@ module cva6_hpdcache_subsystem
);
// }}}

`include "axi/typedef.svh"

// I$ instantiation
// {{{
logic icache_miss_valid, icache_miss_ready;
Expand Down Expand Up @@ -472,17 +476,7 @@ module cva6_hpdcache_subsystem

// AXI arbiter instantiation
// {{{
typedef logic [CVA6Cfg.AxiAddrWidth-1:0] axi_addr_t;
typedef logic [CVA6Cfg.AxiDataWidth-1:0] axi_data_t;
typedef logic [CVA6Cfg.AxiDataWidth/8-1:0] axi_strb_t;
typedef logic [CVA6Cfg.AxiIdWidth-1:0] axi_id_t;
typedef logic [CVA6Cfg.AxiUserWidth-1:0] axi_user_t;
`AXI_TYPEDEF_AW_CHAN_T(axi_aw_chan_t, axi_addr_t, axi_id_t, axi_user_t)
`AXI_TYPEDEF_W_CHAN_T(axi_w_chan_t, axi_data_t, axi_strb_t, axi_user_t)
`AXI_TYPEDEF_B_CHAN_T(axi_b_chan_t, axi_id_t, axi_user_t)
`AXI_TYPEDEF_AR_CHAN_T(axi_ar_chan_t, axi_addr_t, axi_id_t, axi_user_t)
`AXI_TYPEDEF_R_CHAN_T(axi_r_chan_t, axi_data_t, axi_id_t, axi_user_t)


CoralieAllioux marked this conversation as resolved.
Show resolved Hide resolved
cva6_hpdcache_subsystem_axi_arbiter #(
.HPDcacheMemIdWidth (ariane_pkg::MEM_TID_WIDTH),
.HPDcacheMemDataWidth (CVA6Cfg.AxiDataWidth),
Expand All @@ -498,6 +492,8 @@ module cva6_hpdcache_subsystem
.axi_ar_chan_t(axi_ar_chan_t),
.axi_aw_chan_t(axi_aw_chan_t),
.axi_w_chan_t (axi_w_chan_t),
.axi_b_chan_t (axi_b_chan_t),
.axi_r_chan_t (axi_r_chan_t),
.axi_req_t (noc_req_t),
.axi_rsp_t (noc_resp_t)
) i_axi_arbiter (
Expand Down
49 changes: 17 additions & 32 deletions core/cache_subsystem/cva6_hpdcache_subsystem_axi_arbiter.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ module cva6_hpdcache_subsystem_axi_arbiter
parameter type axi_ar_chan_t = logic,
parameter type axi_aw_chan_t = logic,
parameter type axi_w_chan_t = logic,
parameter type axi_b_chan_t = logic,
parameter type axi_r_chan_t = logic,
parameter type axi_req_t = logic,
parameter type axi_rsp_t = logic,

Expand Down Expand Up @@ -112,19 +114,6 @@ module cva6_hpdcache_subsystem_axi_arbiter

// Internal type definitions
// {{{
typedef struct packed {
logic [AxiIdWidth-1:0] id;
logic [AxiDataWidth-1:0] data;
axi_pkg::resp_t resp;
logic last;
logic [AxiUserWidth-1:0] user;
} axi_r_chan_t;

typedef struct packed {
logic [AxiIdWidth-1:0] id;
axi_pkg::resp_t resp;
logic [AxiUserWidth-1:0] user;
} axi_b_chan_t;

localparam int MEM_RESP_RT_DEPTH = (1 << HPDcacheMemIdWidth);
typedef hpdcache_mem_id_t [MEM_RESP_RT_DEPTH-1:0] mem_resp_rt_t;
Expand Down Expand Up @@ -493,8 +482,6 @@ module cva6_hpdcache_subsystem_axi_arbiter

// AXI adapters
// {{{
axi_req_t axi_req;
axi_rsp_t axi_resp;

hpdcache_mem_to_axi_write #(
.hpdcache_mem_req_t (hpdcache_mem_req_t),
Expand All @@ -516,17 +503,17 @@ module cva6_hpdcache_subsystem_axi_arbiter
.resp_valid_o(mem_resp_write_valid),
.resp_o (mem_resp_write),

.axi_aw_valid_o(axi_req.aw_valid),
.axi_aw_o (axi_req.aw),
.axi_aw_ready_i(axi_resp.aw_ready),
.axi_aw_valid_o(axi_req_o.aw_valid),
.axi_aw_o (axi_req_o.aw),
.axi_aw_ready_i(axi_resp_i.aw_ready),

.axi_w_valid_o(axi_req.w_valid),
.axi_w_o (axi_req.w),
.axi_w_ready_i(axi_resp.w_ready),
.axi_w_valid_o(axi_req_o.w_valid),
.axi_w_o (axi_req_o.w),
.axi_w_ready_i(axi_resp_i.w_ready),

.axi_b_valid_i(axi_resp.b_valid),
.axi_b_i (axi_resp.b),
.axi_b_ready_o(axi_req.b_ready)
.axi_b_valid_i(axi_resp_i.b_valid),
.axi_b_i (axi_resp_i.b),
.axi_b_ready_o(axi_req_o.b_ready)
);

hpdcache_mem_to_axi_read #(
Expand All @@ -543,17 +530,15 @@ module cva6_hpdcache_subsystem_axi_arbiter
.resp_valid_o(mem_resp_read_valid),
.resp_o (mem_resp_read),

.axi_ar_valid_o(axi_req.ar_valid),
.axi_ar_o (axi_req.ar),
.axi_ar_ready_i(axi_resp.ar_ready),
.axi_ar_valid_o(axi_req_o.ar_valid),
.axi_ar_o (axi_req_o.ar),
.axi_ar_ready_i(axi_resp_i.ar_ready),

.axi_r_valid_i(axi_resp.r_valid),
.axi_r_i (axi_resp.r),
.axi_r_ready_o(axi_req.r_ready)
.axi_r_valid_i(axi_resp_i.r_valid),
.axi_r_i (axi_resp_i.r),
.axi_r_ready_o(axi_req_o.r_ready)
);

assign axi_req_o = axi_req;
assign axi_resp = axi_resp_i;
// }}}

// Assertions
Expand Down
5 changes: 5 additions & 0 deletions core/cva6.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,11 @@ module cva6
cva6_hpdcache_subsystem #(
.CVA6Cfg (CVA6ExtendCfg),
.NumPorts (NumPorts),
.axi_ar_chan_t(axi_ar_chan_t),
.axi_aw_chan_t(axi_aw_chan_t),
.axi_w_chan_t (axi_w_chan_t),
.axi_b_chan_t (b_chan_t),
.axi_r_chan_t (r_chan_t),
.noc_req_t (noc_req_t),
.noc_resp_t(noc_resp_t),
.cmo_req_t (logic /*FIXME*/),
Expand Down
Loading