Skip to content

Commit a1bf0bc

Browse files
author
Yvan Tortorella
committed
Fix lint.
1 parent e42703f commit a1bf0bc

29 files changed

+184
-178
lines changed

‎core/axi_shim.sv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ module axi_shim #(
286286
// Registers
287287
// ----------------
288288
`FFARNC(wr_state_q, wr_state_d, clear_i, IDLE, clk_i, rst_ni)
289-
`FFARNC(wr_cnt_q , wr_cnt_d , clear_i, '0, clk_i, rst_ni)
289+
`FFARNC(wr_cnt_q, wr_cnt_d, clear_i, '0, clk_i, rst_ni)
290290

291291
// ----------------
292292
// Assertions

‎core/cache_subsystem/axi_adapter.sv‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -463,14 +463,14 @@ module axi_adapter #(
463463
// ----------------
464464
// Registers
465465
// ----------------
466-
`FFARNC(state_q , state_d , 1'b0, IDLE , clk_i, rst_ni)
467-
`FFARNC(cnt_q , cnt_d , 1'b0, '0 , clk_i, rst_ni)
468-
`FFARNC(cache_line_q , cache_line_d , 1'b0, '0 , clk_i, rst_ni)
469-
`FFARNC(addr_offset_q , addr_offset_d , 1'b0, '0 , clk_i, rst_ni)
470-
`FFARNC(id_q , id_d , 1'b0, '0 , clk_i, rst_ni)
471-
`FFARNC(amo_q , amo_d , 1'b0, ariane_pkg::AMO_NONE, clk_i, rst_ni)
472-
`FFARNC(size_q , size_d , 1'b0, '0 , clk_i, rst_ni)
473-
`FFARNC(outstanding_aw_cnt_q , outstanding_aw_cnt_d, 1'b0, '0 , clk_i, rst_ni)
466+
`FFARNC(state_q, state_d, 1'b0, IDLE, clk_i, rst_ni)
467+
`FFARNC(cnt_q, cnt_d, 1'b0, '0, clk_i, rst_ni)
468+
`FFARNC(cache_line_q, cache_line_d, 1'b0, '0, clk_i, rst_ni)
469+
`FFARNC(addr_offset_q, addr_offset_d, 1'b0, '0, clk_i, rst_ni)
470+
`FFARNC(id_q, id_d, 1'b0, '0, clk_i, rst_ni)
471+
`FFARNC(amo_q, amo_d, 1'b0, ariane_pkg::AMO_NONE, clk_i, rst_ni)
472+
`FFARNC(size_q, size_d, 1'b0, '0, clk_i, rst_ni)
473+
`FFARNC(outstanding_aw_cnt_q, outstanding_aw_cnt_d, 1'b0, '0, clk_i, rst_ni)
474474

475475
function automatic axi_pkg::atop_t atop_from_amo(ariane_pkg::amo_t amo);
476476
axi_pkg::atop_t result = 6'b000000;

‎core/cache_subsystem/cache_ctrl.sv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,9 @@ module cache_ctrl
444444
// --------------
445445
// Registers
446446
// --------------
447-
`FFARNC(state_q , state_d , clear_i, IDLE, clk_i, rst_ni)
448-
`FFARNC(mem_req_q , mem_req_d, clear_i, '0, clk_i, rst_ni)
449-
`FFARNC(hit_way_q , hit_way_d, clear_i, '0, clk_i, rst_ni)
447+
`FFARNC(state_q, state_d, clear_i, IDLE, clk_i, rst_ni)
448+
`FFARNC(mem_req_q, mem_req_d, clear_i, '0, clk_i, rst_ni)
449+
`FFARNC(hit_way_q, hit_way_d, clear_i, '0, clk_i, rst_ni)
450450

451451
//pragma translate_off
452452
`ifndef VERILATOR

‎core/cache_subsystem/cva6_hpdcache_if_adapter.sv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ module cva6_hpdcache_if_adapter
111111
logic [ 7:0] amo_data_be;
112112
hpdcache_req_op_t amo_op;
113113
logic [31:0] amo_resp_word;
114-
logic amo_pending_q, amo_pending_n;
114+
logic amo_pending_q, amo_pending_n;
115115

116116
// AMO logic
117117
// {{{

‎core/cache_subsystem/miss_handler.sv‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -507,12 +507,12 @@ module miss_handler
507507
// --------------------
508508
// Sequential Process
509509
// --------------------
510-
`FFARNC(mshr_q , mshr_d , 1'b0, '0 , clk_i, rst_ni)
511-
`FFARNC(state_q , state_d , 1'b0, INIT, clk_i, rst_ni)
512-
`FFARNC(cnt_q , cnt_d , 1'b0, '0 , clk_i, rst_ni)
513-
`FFARNC(evict_way_q , evict_way_d, 1'b0, '0 , clk_i, rst_ni)
514-
`FFARNC(evict_cl_q , evict_cl_d , 1'b0, '0 , clk_i, rst_ni)
515-
`FFARNC(serve_amo_q , serve_amo_d, 1'b0, '0 , clk_i, rst_ni)
510+
`FFARNC(mshr_q, mshr_d, 1'b0, '0, clk_i, rst_ni)
511+
`FFARNC(state_q, state_d, 1'b0, INIT, clk_i, rst_ni)
512+
`FFARNC(cnt_q, cnt_d, 1'b0, '0, clk_i, rst_ni)
513+
`FFARNC(evict_way_q, evict_way_d, 1'b0, '0, clk_i, rst_ni)
514+
`FFARNC(evict_cl_q, evict_cl_d, 1'b0, '0, clk_i, rst_ni)
515+
`FFARNC(serve_amo_q, serve_amo_d, 1'b0, '0, clk_i, rst_ni)
516516

517517
//pragma translate_off
518518
`ifndef VERILATOR
@@ -789,10 +789,10 @@ module axi_adapter_arbiter #(
789789
endcase
790790
end
791791

792-
`FFARNC(state_q , state_d , 1'b0, IDLE, clk_i, rst_ni)
793-
`FFARNC(sel_q , sel_d , 1'b0, '0 , clk_i, rst_ni)
794-
`FFARNC(req_q , req_d , 1'b0, '0 , clk_i, rst_ni)
795-
`FFARNC(outstanding_cnt_q , outstanding_cnt_d, 1'b0, '0 , clk_i, rst_ni)
792+
`FFARNC(state_q, state_d, 1'b0, IDLE, clk_i, rst_ni)
793+
`FFARNC(sel_q, sel_d, 1'b0, '0, clk_i, rst_ni)
794+
`FFARNC(req_q, req_d, 1'b0, '0, clk_i, rst_ni)
795+
`FFARNC(outstanding_cnt_q, outstanding_cnt_d, 1'b0, '0, clk_i, rst_ni)
796796

797797
// ------------
798798
// Assertions

‎core/cache_subsystem/wt_axi_adapter.sv‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -621,20 +621,20 @@ module wt_axi_adapter
621621
// assign dcache_rtrn_o.inv.vld = '0;
622622
// assign dcache_rtrn_o.inv.all = '0;
623623

624-
`FFARNC(icache_first_q , icache_first_d , clear_i, 1'b1 , clk_i, rst_ni)
625-
`FFARNC(dcache_first_q , dcache_first_d , clear_i, 1'b1 , clk_i, rst_ni)
626-
`FFARNC(icache_rd_shift_q , icache_rd_shift_d , clear_i, '0 , clk_i, rst_ni)
627-
`FFARNC(icache_rd_shift_user_q , icache_rd_shift_user_d, clear_i, '0 , clk_i, rst_ni)
628-
`FFARNC(dcache_rd_shift_q , dcache_rd_shift_d , clear_i, '0 , clk_i, rst_ni)
629-
`FFARNC(dcache_rd_shift_user_q , dcache_rd_shift_user_d, clear_i, '0 , clk_i, rst_ni)
630-
`FFARNC(icache_rtrn_vld_q , icache_rtrn_vld_d , clear_i, '0 , clk_i, rst_ni)
631-
`FFARNC(dcache_rtrn_vld_q , dcache_rtrn_vld_d , clear_i, '0 , clk_i, rst_ni)
632-
`FFARNC(icache_rtrn_tid_q , icache_rtrn_tid_d , clear_i, '0 , clk_i, rst_ni)
633-
`FFARNC(dcache_rtrn_tid_q , dcache_rtrn_tid_d , clear_i, '0 , clk_i, rst_ni)
634-
`FFARNC(dcache_rtrn_type_q , dcache_rtrn_type_d , clear_i, wt_cache_pkg::DCACHE_LOAD_ACK, clk_i, rst_ni)
635-
`FFARNC(dcache_rtrn_inv_q , dcache_rtrn_inv_d , clear_i, '0 , clk_i, rst_ni)
636-
`FFARNC(amo_off_q , amo_off_d , clear_i, '0 , clk_i, rst_ni)
637-
`FFARNC(amo_gen_r_q , amo_gen_r_d , clear_i, '0 , clk_i, rst_ni)
624+
`FFARNC(icache_first_q, icache_first_d, clear_i, 1'b1, clk_i, rst_ni)
625+
`FFARNC(dcache_first_q, dcache_first_d, clear_i, 1'b1, clk_i, rst_ni)
626+
`FFARNC(icache_rd_shift_q, icache_rd_shift_d, clear_i, '0, clk_i, rst_ni)
627+
`FFARNC(icache_rd_shift_user_q, icache_rd_shift_user_d, clear_i, '0, clk_i, rst_ni)
628+
`FFARNC(dcache_rd_shift_q, dcache_rd_shift_d, clear_i, '0, clk_i, rst_ni)
629+
`FFARNC(dcache_rd_shift_user_q, dcache_rd_shift_user_d, clear_i, '0, clk_i, rst_ni)
630+
`FFARNC(icache_rtrn_vld_q, icache_rtrn_vld_d, clear_i, '0, clk_i, rst_ni)
631+
`FFARNC(dcache_rtrn_vld_q, dcache_rtrn_vld_d, clear_i, '0, clk_i, rst_ni)
632+
`FFARNC(icache_rtrn_tid_q, icache_rtrn_tid_d, clear_i, '0, clk_i, rst_ni)
633+
`FFARNC(dcache_rtrn_tid_q, dcache_rtrn_tid_d, clear_i, '0, clk_i, rst_ni)
634+
`FFARNC(dcache_rtrn_type_q, dcache_rtrn_type_d, clear_i, wt_cache_pkg::DCACHE_LOAD_ACK, clk_i, rst_ni)
635+
`FFARNC(dcache_rtrn_inv_q, dcache_rtrn_inv_d, clear_i, '0, clk_i, rst_ni)
636+
`FFARNC(amo_off_q, amo_off_d, clear_i, '0, clk_i, rst_ni)
637+
`FFARNC(amo_gen_r_q, amo_gen_r_d, clear_i, '0, clk_i, rst_ni)
638638

639639

640640
///////////////////////////////////////////////////////

‎core/cache_subsystem/wt_dcache.sv‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ module wt_dcache
2424
parameter logic [CACHE_ID_WIDTH-1:0] RdAmoTxId = 1
2525
) (
2626
input logic clk_i, // Clock
27-
input logic rst_ni, // Asynchronous reset active low
28-
input logic clear_i, // Synchronous clear active high
29-
27+
input logic rst_ni, // Asynchronous reset active low
28+
input logic clear_i, // Synchronous clear active high
3029
// Cache management
3130
input logic enable_i, // from CSR
3231
input logic flush_i, // high until acknowledged

‎core/cache_subsystem/wt_dcache_mem.sv‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,10 @@ module wt_dcache_mem
342342
);
343343
end
344344

345-
`FFARNC(bank_idx_q , bank_idx_d, 1'b0, '0, clk_i, rst_ni)
346-
`FFARNC(bank_off_q , bank_off_d, 1'b0, '0, clk_i, rst_ni)
347-
`FFARNC(vld_sel_q , vld_sel_d , 1'b0, '0, clk_i, rst_ni)
348-
`FFARNC(cmp_en_q , cmp_en_d , 1'b0, '0, clk_i, rst_ni)
345+
`FFARNC(bank_idx_q, bank_idx_d, 1'b0, '0, clk_i, rst_ni)
346+
`FFARNC(bank_off_q, bank_off_d, 1'b0, '0, clk_i, rst_ni)
347+
`FFARNC(vld_sel_q, vld_sel_d, 1'b0, '0, clk_i, rst_ni)
348+
`FFARNC(cmp_en_q, cmp_en_d, 1'b0, '0, clk_i, rst_ni)
349349

350350
///////////////////////////////////////////////////////
351351
// assertions
@@ -395,8 +395,8 @@ module wt_dcache_mem
395395
logic [ariane_pkg::DCACHE_SET_ASSOC-1:0] load_enable;
396396
for (genvar i = 0; i < ariane_pkg::DCACHE_SET_ASSOC; i++) begin : gen_p_mirror_registers
397397
assign load_enable[i] = (vld_req[i] & vld_we) ? 1'b1 : 1'b0;
398-
`FFLARNC(vld_mirror[vld_addr][i], vld_wdata[i], load_enable[i], clear_i, '{default: '0}, clk_i, rst_ni)
399-
`FFLARNC(tag_mirror[vld_addr][i], wr_cl_tag_i, load_enable[i], clear_i, '{default: '0}, clk_i, rst_ni)
398+
`FFLARNC(vld_mirror[vld_addr][i], vld_wdata[i], load_enable[i], clear_i, '0, clk_i, rst_ni)
399+
`FFLARNC(tag_mirror[vld_addr][i], wr_cl_tag_i, load_enable[i], clear_i, '0, clk_i, rst_ni)
400400
end
401401

402402
for (genvar i = 0; i < DCACHE_SET_ASSOC; i++) begin : gen_tag_dubl_test

‎core/cache_subsystem/wt_dcache_wbuffer.sv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ module wt_dcache_wbuffer
5656
#(
5757
parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty
5858
) (
59-
input logic clk_i, // Clock
60-
input logic rst_ni, // Asynchronous reset active low
61-
input logic clear_i, // Synchronous clear active high
59+
input logic clk_i, // clock
60+
input logic rst_ni, // asynchronous reset active low
61+
input logic clear_i, // synchronous clear active high
6262

6363
input logic cache_en_i, // writes are treated as NC if disabled
6464
output logic empty_o, // asserted if no data is present in write buffer

‎core/cvxif_fu.sv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ module cvxif_fu
117117
end
118118
end
119119

120-
`FFARNC(illegal_q , illegal_n , clear_i, '0, clk_i, rst_ni)
121-
`FFARNC(illegal_id_q , illegal_id_n , clear_i, '0, clk_i, rst_ni)
120+
`FFARNC(illegal_q, illegal_n, clear_i, '0, clk_i, rst_ni)
121+
`FFARNC(illegal_id_q, illegal_id_n, clear_i, '0, clk_i, rst_ni)
122122
`FFARNC(illegal_instr_q, illegal_instr_n, clear_i, '0, clk_i, rst_ni)
123123

124124
endmodule

0 commit comments

Comments
 (0)