Skip to content

Commit 312b66a

Browse files
committed
refactor: adopt latest version of common_cells v2
1 parent 33e16fb commit 312b66a

35 files changed

Lines changed: 473 additions & 349 deletions

Bender.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
packages:
22
common_cells:
3-
revision: e42f76dcb1e8a1a171943b22f36c94f640508994
3+
revision: 814da36cdfb4f720afcbc1d33bb39b900e82b5f1
44
version: null
55
source:
66
Git: https://github.com/pulp-platform/common_cells.git

src/axi_atop_filter.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ module axi_atop_filter #(
346346
end
347347

348348
cc_stream_register #(
349-
.T(r_resp_cmd_t)
349+
.data_t (r_resp_cmd_t)
350350
) r_resp_cmd (
351351
.clk_i (clk_i),
352352
.rst_ni (rst_ni),

src/axi_burst_splitter_gran.sv

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -620,11 +620,12 @@ module axi_burst_splitter_gran_counters #(
620620

621621
if (CutPath) begin : gen_spill
622622
cc_spill_register #(
623-
.T ( alloc_pld_t ),
623+
.data_t ( alloc_pld_t ),
624624
.Bypass ( 1'b0 )
625625
) i_spill_register_alloc (
626626
.clk_i,
627627
.rst_ni,
628+
.clr_i ( 1'b0 ),
628629
.valid_i ( alloc_req_i ),
629630
.ready_o ( alloc_gnt_o ),
630631
.data_i ( alloc_pld_in ),
@@ -646,11 +647,11 @@ module axi_burst_splitter_gran_counters #(
646647
cnt_idx_t cnt_free_idx, cnt_r_idx;
647648
for (genvar i = 0; i < MaxTxns; i++) begin : gen_cnt
648649
cc_delta_counter #(
649-
.WIDTH ( $bits(cnt_t) )
650+
.Width ( $bits(cnt_t) )
650651
) i_cnt (
651652
.clk_i,
652653
.rst_ni,
653-
.clear_i ( cnt_clr[i] ),
654+
.clr_i ( cnt_clr[i] ),
654655
.en_i ( cnt_dec[i] ),
655656
.load_i ( cnt_set[i] ),
656657
.down_i ( 1'b1 ),
@@ -664,8 +665,8 @@ module axi_burst_splitter_gran_counters #(
664665
assign cnt_inp = {1'b0, alloc_pld_out.len} + 1;
665666

666667
cc_lzc #(
667-
.WIDTH ( MaxTxns ),
668-
.MODE ( cc_pkg::LZC_TRAILING_ZERO_CNT )
668+
.Width ( MaxTxns ),
669+
.Mode ( cc_pkg::LZC_TRAILING_ZERO_CNT )
669670
) i_lzc (
670671
.in_i ( cnt_free ),
671672
.cnt_o ( cnt_free_idx ),
@@ -675,13 +676,14 @@ module axi_burst_splitter_gran_counters #(
675676
logic idq_inp_req, idq_inp_gnt,
676677
idq_oup_gnt, idq_oup_valid, idq_oup_pop;
677678
cc_id_queue #(
678-
.ID_WIDTH ( $bits(id_t) ),
679-
.CAPACITY ( MaxTxns ),
680-
.FULL_BW ( FullBW ),
679+
.IdWidth ( $bits(id_t) ),
680+
.Capacity ( MaxTxns ),
681+
.FullBw ( FullBW ),
681682
.data_t ( cnt_idx_t )
682683
) i_idq (
683684
.clk_i,
684685
.rst_ni,
686+
.clr_i ( 1'b0 ),
685687
.inp_id_i ( alloc_pld_out.id ),
686688
.inp_data_i ( cnt_free_idx ),
687689
.inp_req_i ( idq_inp_req ),

src/axi_burst_unwrap.sv

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -566,11 +566,11 @@ module axi_burst_counters #(
566566
cnt_idx_t cnt_free_idx, cnt_r_idx;
567567
for (genvar i = 0; i < MaxTxns; i++) begin : gen_cnt
568568
cc_counter #(
569-
.WIDTH ( $bits(cnt_t) )
569+
.Width ( $bits(cnt_t) )
570570
) i_cnt (
571571
.clk_i,
572572
.rst_ni,
573-
.clear_i ( 1'b0 ),
573+
.clr_i ( 1'b0 ),
574574
.en_i ( cnt_dec[i] ),
575575
.load_i ( cnt_set[i] ),
576576
.down_i ( 1'b1 ),
@@ -583,8 +583,8 @@ module axi_burst_counters #(
583583
assign cnt_inp = {1'b0, alloc_len_i} + 1;
584584

585585
cc_lzc #(
586-
.WIDTH ( MaxTxns ),
587-
.MODE ( cc_pkg::LZC_TRAILING_ZERO_CNT ) // start counting at index 0
586+
.Width ( MaxTxns ),
587+
.Mode ( cc_pkg::LZC_TRAILING_ZERO_CNT ) // start counting at index 0
588588
) i_lzc (
589589
.in_i ( cnt_free ),
590590
.cnt_o ( cnt_free_idx ),
@@ -594,12 +594,13 @@ module axi_burst_counters #(
594594
logic idq_inp_req, idq_inp_gnt,
595595
idq_oup_gnt, idq_oup_valid, idq_oup_pop;
596596
cc_id_queue #(
597-
.ID_WIDTH ( $bits(id_t) ),
598-
.CAPACITY ( MaxTxns ),
597+
.IdWidth ( $bits(id_t) ),
598+
.Capacity ( MaxTxns ),
599599
.data_t ( cnt_idx_t )
600600
) i_idq (
601601
.clk_i,
602602
.rst_ni,
603+
.clr_i ( 1'b0 ),
603604
.inp_id_i ( alloc_id_i ),
604605
.inp_data_i ( cnt_free_idx ),
605606
.inp_req_i ( idq_inp_req ),

0 commit comments

Comments
 (0)