Skip to content

Bump common_cells to v2 #36

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

Draft
colluca wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Bump common_cells to v2 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddeced6
Bump common_cells to v2
colluca May 15, 2026
3666d34
refactor: changes for `common_cells` v2
ricted98 Jul 8, 2026
b69af4a
obi_mux: Remove `flush_i` from `cc_rr_arb_tree`
colluca Jul 8, 2026
7e0bcc1
[Fix] Fix underflow in OBI typedefs
Jun 30, 2026
11d3e70
obi_atop_resolver: Compare optional widths with zero
hopang-0221 Oct 30, 2026
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
2 changes: 1 addition & 1 deletion Bender.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package:
- "Michael Rogenmoser <michaero@iis.ee.ethz.ch>"

dependencies:
common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.38.0 }
common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 2.0.0-beta }
common_verification: { git: "https://github.com/pulp-platform/common_verification.git", version: 0.2.3 }

export_include_dirs:
Expand Down
44 changes: 23 additions & 21 deletions include/obi/typedef.svh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
`ifndef OBI_TYPEDEF_SVH
`define OBI_TYPEDEF_SVH

`define OBI_TYPEDEF_MIN_WIDTH(WIDTH) ((WIDTH) > 0 ? (WIDTH) : 1)

`define OBI_TYPEDEF_A_CHAN_T(a_chan_t, ADDR_WIDTH, DATA_WIDTH, ID_WIDTH, a_optional_t) \
typedef struct packed { \
logic [ ADDR_WIDTH-1:0] addr; \
logic we; \
logic [DATA_WIDTH/8-1:0] be; \
logic [ DATA_WIDTH-1:0] wdata; \
logic [ ID_WIDTH-1:0] aid; \
a_optional_t a_optional; \
logic [ ADDR_WIDTH-1:0] addr; \
logic we; \
logic [ DATA_WIDTH/8-1:0] be; \
logic [ DATA_WIDTH-1:0] wdata; \
logic [`OBI_TYPEDEF_MIN_WIDTH(ID_WIDTH)-1:0] aid; \
a_optional_t a_optional; \
} a_chan_t;

`define OBI_TYPEDEF_TYPE_A_CHAN_T(a_chan_t, addr_t, data_t, strb_t, id_t, a_optional_t) \
Expand All @@ -37,22 +39,22 @@

`define OBI_TYPEDEF_ALL_A_OPTIONAL(a_optional_t, AUSER_WIDTH, WUSER_WIDTH, MID_WIDTH, ACHK_WIDTH) \
typedef struct packed { \
logic [ AUSER_WIDTH-1:0] auser; \
logic [ WUSER_WIDTH-1:0] wuser; \
obi_pkg::atop_t atop; \
obi_pkg::memtype_t memtype; \
logic [ MID_WIDTH-1:0] mid; \
obi_pkg::prot_t prot; \
logic dbg; \
logic [ ACHK_WIDTH-1:0] achk; \
logic [`OBI_TYPEDEF_MIN_WIDTH(AUSER_WIDTH)-1:0] auser; \
logic [`OBI_TYPEDEF_MIN_WIDTH(WUSER_WIDTH)-1:0] wuser; \
obi_pkg::atop_t atop; \
obi_pkg::memtype_t memtype; \
logic [ `OBI_TYPEDEF_MIN_WIDTH(MID_WIDTH)-1:0] mid; \
obi_pkg::prot_t prot; \
logic dbg; \
logic [ `OBI_TYPEDEF_MIN_WIDTH(ACHK_WIDTH)-1:0] achk; \
} a_optional_t;

`define OBI_TYPEDEF_R_CHAN_T(r_chan_t, RDATA_WIDTH, ID_WIDTH, r_optional_t) \
typedef struct packed { \
logic [RDATA_WIDTH-1:0] rdata; \
logic [ ID_WIDTH-1:0] rid; \
logic err; \
r_optional_t r_optional; \
logic [ RDATA_WIDTH-1:0] rdata; \
logic [`OBI_TYPEDEF_MIN_WIDTH(ID_WIDTH)-1:0] rid; \
logic err; \
r_optional_t r_optional; \
} r_chan_t;

`define OBI_TYPEDEF_TYPE_R_CHAN_T(r_chan_t, data_t, id_t, r_optional_t) \
Expand All @@ -68,9 +70,9 @@

`define OBI_TYPEDEF_ALL_R_OPTIONAL(r_optional_t, RUSER_WIDTH, RCHK_WIDTH) \
typedef struct packed { \
logic [RUSER_WIDTH-1:0] ruser; \
logic exokay; \
logic [ RCHK_WIDTH-1:0] rchk; \
logic [`OBI_TYPEDEF_MIN_WIDTH(RUSER_WIDTH)-1:0] ruser; \
logic exokay; \
logic [ `OBI_TYPEDEF_MIN_WIDTH(RCHK_WIDTH)-1:0] rchk; \
} r_optional_t;

`define OBI_TYPEDEF_DEFAULT_REQ_T(req_t, a_chan_t) \
Expand Down
35 changes: 16 additions & 19 deletions src/obi_atop_resolver.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ module obi_atop_resolver
) (
input logic clk_i,
input logic rst_ni,
input logic testmode_i,

input sbr_port_obi_req_t sbr_port_req_i,
output sbr_port_obi_rsp_t sbr_port_rsp_o,
Expand Down Expand Up @@ -93,25 +92,25 @@ module obi_atop_resolver
logic [$clog2(SbrPortObiCfg.DataWidth/8)-1:0] lz_cnt;
assign amo_operand_addr = lz_cnt >> $clog2(RiscvWordWidth / 8);

lzc #(
.WIDTH(SbrPortObiCfg.DataWidth / 8),
.MODE (1'b0)
cc_lzc #(
.Width (SbrPortObiCfg.DataWidth / 8),
.Mode (cc_pkg::LZC_TRAILING_ZERO_CNT)
) i_count_addr (
.in_i (be_q),
.cnt_o (lz_cnt),
.empty_o( /*Unused*/)
);

// Store the metadata at handshake
stream_fifo #(
.T (logic [SbrPortObiCfg.IdWidth-1:0]),
.DEPTH (NumTxns),
.FALL_THROUGH (1'b0)
cc_stream_fifo #(
.data_t (logic [SbrPortObiCfg.IdWidth-1:0]),
.Depth (NumTxns),
.FallThrough (1'b0)
) i_metadata_register (
.clk_i,
.rst_ni,
.clr_i ('0),
.flush_i ('0),
.testmode_i ('0),
.usage_o (),
.valid_i (sbr_port_req_i.req && sbr_port_rsp_o.gnt),
.ready_o(meta_ready),
Expand Down Expand Up @@ -160,14 +159,14 @@ module obi_atop_resolver
end
end

fifo_v3 #(
.FALL_THROUGH(1'b1),
.dtype (out_buffer_t),
.DEPTH (2)
cc_fifo #(
.FallThrough (1'b1),
.data_t (out_buffer_t),
.Depth (2)
) i_rdata_fifo (
.clk_i,
.rst_ni,
.testmode_i,
.clr_i ('0),
.flush_i(1'b0),
.full_o (rdata_full),
.empty_o(rdata_empty),
Expand Down Expand Up @@ -331,11 +330,11 @@ module obi_atop_resolver
end
end

if (!MgrPortObiCfg.OptionalCfg.AUserWidth &&
!MgrPortObiCfg.OptionalCfg.WUserWidth &&
if (MgrPortObiCfg.OptionalCfg.AUserWidth == 0 &&
MgrPortObiCfg.OptionalCfg.WUserWidth == 0 &&
!MgrPortObiCfg.OptionalCfg.UseProt &&
!MgrPortObiCfg.OptionalCfg.UseMemtype &&
!MgrPortObiCfg.OptionalCfg.MidWidth &&
MgrPortObiCfg.OptionalCfg.MidWidth == 0 &&
!MgrPortObiCfg.OptionalCfg.UseDbg) begin : gen_no_optional
assign a_optional = '0;
end
Expand Down Expand Up @@ -547,7 +546,6 @@ module obi_atop_resolver_intf
) (
input logic clk_i,
input logic rst_ni,
input logic testmode_i,

OBI_BUS.Subordinate sbr_port,

Expand Down Expand Up @@ -583,7 +581,6 @@ module obi_atop_resolver_intf
) i_obi_atop_resolver (
.clk_i,
.rst_ni,
.testmode_i,
.sbr_port_req_i(sbr_port_req),
.sbr_port_rsp_o(sbr_port_rsp),
.mgr_port_req_o(mgr_port_req),
Expand Down
10 changes: 6 additions & 4 deletions src/obi_cut.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ module obi_cut #(
input obi_rsp_t mgr_port_rsp_i
);

spill_register #(
.T ( obi_a_chan_t ),
cc_spill_register #(
.data_t ( obi_a_chan_t ),
.Bypass ( BypassReq )
) i_reg_a (
.clk_i,
.rst_ni,
.clr_i ( '0 ),
.valid_i ( sbr_port_req_i.req ),
.ready_o ( sbr_port_rsp_o.gnt ),
.data_i ( sbr_port_req_i.a ),
Expand All @@ -56,12 +57,13 @@ module obi_cut #(
assign ready_i = 1'b1;
end

spill_register #(
.T ( obi_r_chan_t ),
cc_spill_register #(
.data_t ( obi_r_chan_t ),
.Bypass ( BypassRsp )
) i_req_r (
.clk_i,
.rst_ni,
.clr_i ( '0 ),
.valid_i ( mgr_port_rsp_i.rvalid ),
.ready_o ( ready_o ),
.data_i ( mgr_port_rsp_i.r ),
Expand Down
14 changes: 7 additions & 7 deletions src/obi_demux.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module obi_demux #(
/// The maximum number of outstanding transactions.
parameter int unsigned NumMaxTrans = 32'd0,
/// The type of the port select signal.
parameter type select_t = logic [cf_math_pkg::idx_width(NumMgrPorts)-1:0]
parameter type select_t = logic [cc_pkg::idx_width(NumMgrPorts)-1:0]
) (
input logic clk_i,
input logic rst_ni,
Expand All @@ -34,7 +34,7 @@ module obi_demux #(
end

// stall requests to ensure in-order behavior (could be handled differently with rready)
localparam int unsigned CounterWidth = cf_math_pkg::idx_width(NumMaxTrans);
localparam int unsigned CounterWidth = cc_pkg::idx_width(NumMaxTrans);

logic cnt_up, cnt_down, overflow;
logic [CounterWidth-1:0] in_flight;
Expand Down Expand Up @@ -81,14 +81,14 @@ module obi_demux #(

assign cnt_down = mgr_ports_rsp_i[select_q].rvalid && sbr_port_rready;

delta_counter #(
.WIDTH ( CounterWidth ),
.STICKY_OVERFLOW ( 1'b0 )
cc_delta_counter #(
.Width ( CounterWidth ),
.StickyOverflow ( 1'b0 )
) i_counter (
.clk_i,
.rst_ni,

.clear_i ( 1'b0 ),
.clr_i ( 1'b0 ),
.en_i ( cnt_up ^ cnt_down ),
.load_i ( 1'b0 ),
.down_i ( cnt_down ),
Expand Down Expand Up @@ -119,7 +119,7 @@ module obi_demux_intf #(
/// The maximum number of outstanding transactions.
parameter int unsigned NumMaxTrans = 32'd0,
/// The type of the port select signal.
parameter type select_t = logic [cf_math_pkg::idx_width(NumMgrPorts)-1:0]
parameter type select_t = logic [cc_pkg::idx_width(NumMgrPorts)-1:0]
) (
input logic clk_i,
input logic rst_ni,
Expand Down
13 changes: 5 additions & 8 deletions src/obi_err_sbr.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module obi_err_sbr #(
) (
input logic clk_i,
input logic rst_ni,
input logic testmode_i,

input obi_req_t obi_req_i,
output obi_rsp_t obi_rsp_o
Expand All @@ -43,14 +42,14 @@ module obi_err_sbr #(
assign fifo_pop = obi_rsp_o.rvalid;
end

fifo_v3 #(
.DEPTH ( ObiCfg.UseRReady ? NumMaxTrans : 1 ),
.FALL_THROUGH ( 1'b0 ),
.DATA_WIDTH ( ObiCfg.IdWidth )
cc_fifo #(
.Depth ( ObiCfg.UseRReady ? NumMaxTrans : 1 ),
.FallThrough ( 1'b0 ),
.DataWidth ( ObiCfg.IdWidth )
) i_id_fifo (
.clk_i,
.rst_ni,
.testmode_i,
.clr_i ( '0 ),
.flush_i ( '0 ),
.full_o ( fifo_full ),
.empty_o ( fifo_empty ),
Expand All @@ -76,7 +75,6 @@ module obi_err_sbr_intf #(
) (
input logic clk_i,
input logic rst_ni,
input logic testmode_i,

OBI_BUS.Subordinate sbr_port
);
Expand All @@ -98,7 +96,6 @@ module obi_err_sbr_intf #(
) i_err_sbr (
.clk_i,
.rst_ni,
.testmode_i,

.obi_req_i ( obi_req ),
.obi_rsp_o ( obi_rsp )
Expand Down
21 changes: 9 additions & 12 deletions src/obi_mux.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ module obi_mux #(
) (
input logic clk_i,
input logic rst_ni,
input logic testmode_i,

input sbr_port_obi_req_t [NumSbrPorts-1:0] sbr_ports_req_i,
output sbr_port_obi_rsp_t [NumSbrPorts-1:0] sbr_ports_rsp_o,
Expand All @@ -45,7 +44,7 @@ module obi_mux #(
$fatal(1, "unimplemented");
end

localparam int unsigned RequiredExtraIdWidth = cf_math_pkg::idx_width(NumSbrPorts);
localparam int unsigned RequiredExtraIdWidth = cc_pkg::idx_width(NumSbrPorts);

logic [NumSbrPorts-1:0] sbr_ports_req, sbr_ports_gnt;
sbr_port_a_chan_t [NumSbrPorts-1:0] sbr_ports_a;
Expand All @@ -59,16 +58,16 @@ module obi_mux #(
logic [RequiredExtraIdWidth-1:0] selected_id, response_id;
logic mgr_port_req, fifo_full, fifo_pop;

rr_arb_tree #(
cc_rr_arb_tree #(
.NumIn ( NumSbrPorts ),
.DataType ( sbr_port_a_chan_t ),
.data_t ( sbr_port_a_chan_t ),
.AxiVldRdy ( 1'b1 ),
.LockIn ( 1'b1 )
) i_rr_arb (
.clk_i,
.rst_ni,
.clr_i ( '0 ),

.flush_i ( 1'b0 ),
.rr_i ( '0 ),

.req_i ( sbr_ports_req ),
Expand Down Expand Up @@ -112,15 +111,15 @@ module obi_mux #(

end else begin : gen_no_id_assign

fifo_v3 #(
.FALL_THROUGH( 1'b0 ),
.DATA_WIDTH ( RequiredExtraIdWidth ),
.DEPTH ( NumMaxTrans )
cc_fifo #(
.FallThrough ( 1'b0 ),
.DataWidth ( RequiredExtraIdWidth ),
.Depth ( NumMaxTrans )
) i_fifo (
.clk_i,
.rst_ni,
.clr_i ('0),
.flush_i ('0),
.testmode_i,

.full_o ( fifo_full ),
.empty_o (),
Expand Down Expand Up @@ -177,7 +176,6 @@ module obi_mux_intf #(
) (
input logic clk_i,
input logic rst_ni,
input logic testmode_i,

OBI_BUS.Subordinate sbr_ports [NumSbrPorts],

Expand Down Expand Up @@ -216,7 +214,6 @@ module obi_mux_intf #(
) i_obi_mux (
.clk_i,
.rst_ni,
.testmode_i,

.sbr_ports_req_i ( sbr_ports_req ),
.sbr_ports_rsp_o ( sbr_ports_rsp ),
Expand Down
2 changes: 1 addition & 1 deletion src/obi_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ package obi_pkg;
CombGnt: ObiCfgIn.CombGnt,
AddrWidth: ObiCfgIn.AddrWidth,
DataWidth: ObiCfgIn.DataWidth,
IdWidth: ObiCfgIn.IdWidth + cf_math_pkg::idx_width(NumManagers),
IdWidth: ObiCfgIn.IdWidth + cc_pkg::idx_width(NumManagers),
Integrity: ObiCfgIn.Integrity,
BeFull: ObiCfgIn.BeFull,
OptionalCfg: ObiCfgIn.OptionalCfg
Expand Down
Loading
Loading