zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util_[w|r]fifo: Reduce synthesis warnings

main
Laszlo Nagy 2018-03-06 08:51:21 +00:00 committed by István Csomortáni
parent eedd8ed5d8
commit bce0cf8e22
2 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
library/util_rfifo/util_rfifo.v
View File

@ -129,7 +129,6 @@ module util_rfifo #(
reg [(DATA_WIDTH-1):0] din_wdata = 'd0; reg [(DATA_WIDTH-1):0] din_wdata = 'd0;
reg [(ADDRESS_WIDTH-1):0] din_waddr = 'hc; reg [(ADDRESS_WIDTH-1):0] din_waddr = 'hc;
reg [ 2:0] din_wcnt = 'd0;
reg din_wr = 'd0; reg din_wr = 'd0;
reg din_valid = 'd0; reg din_valid = 'd0;
reg [ 6:0] din_req_cnt = 'd0; reg [ 6:0] din_req_cnt = 'd0;
@ -159,6 +158,7 @@ module util_rfifo #(
wire [(T_DOUT_DATA_WIDTH+1):0] dout_data_s; wire [(T_DOUT_DATA_WIDTH+1):0] dout_data_s;
wire dout_init_s; wire dout_init_s;
wire [(DATA_WIDTH-1):0] dout_rdata_s; wire [(DATA_WIDTH-1):0] dout_rdata_s;
wire [ 2:0] din_wcnt_s;
// variables // variables
@ -211,10 +211,28 @@ module util_rfifo #(
end end
endgenerate endgenerate
generate
if (M_MEM_RATIO == 1) begin
assign din_wcnt_s = 'b0;
end else begin
reg [ 2:0] din_wcnt = 'd0;
always @(posedge din_clk or negedge din_rstn)
if (din_rstn == 1'b0) begin
din_wcnt <= 'd0;
end else begin
if (din_valid_in_0 == 1'b1) begin
din_wcnt <= din_wcnt + 1'b1;
end
end
assign din_wcnt_s = din_wcnt;
end
endgenerate
always @(posedge din_clk or negedge din_rstn) begin always @(posedge din_clk or negedge din_rstn) begin
if (din_rstn == 1'b0) begin if (din_rstn == 1'b0) begin
din_waddr <= 'hc; din_waddr <= 'hc;
din_wcnt <= 'd0;
din_wr <= 1'd0; din_wr <= 1'd0;
end else begin end else begin
if ((din_req == 1'b1) && (din_init == 1'b1)) begin if ((din_req == 1'b1) && (din_init == 1'b1)) begin
@ -222,13 +240,10 @@ module util_rfifo #(
end else if (din_wr == 1'b1) begin end else if (din_wr == 1'b1) begin
din_waddr <= din_waddr + 1'b1; din_waddr <= din_waddr + 1'b1;
end end
if (din_valid_in_0 == 1'b1) begin
din_wcnt <= din_wcnt + 1'b1;
end
case (M_MEM_RATIO) case (M_MEM_RATIO)
8: din_wr <= din_valid_in_0 & din_wcnt[2] & din_wcnt[1] & din_wcnt[0]; 8: din_wr <= din_valid_in_0 & din_wcnt_s[2] & din_wcnt_s[1] & din_wcnt_s[0];
4: din_wr <= din_valid_in_0 & din_wcnt[1] & din_wcnt[0]; 4: din_wr <= din_valid_in_0 & din_wcnt_s[1] & din_wcnt_s[0];
2: din_wr <= din_valid_in_0 & din_wcnt[0]; 2: din_wr <= din_valid_in_0 & din_wcnt_s[0];
default: din_wr <= din_valid_in_0; default: din_wr <= din_valid_in_0;
endcase endcase
end end

30
library/util_wfifo/util_wfifo.v
View File

@ -113,7 +113,6 @@ module util_wfifo #(
reg [(DATA_WIDTH-1):0] din_wdata = 'd0; reg [(DATA_WIDTH-1):0] din_wdata = 'd0;
reg [ 7:0] din_enable = 'd0; reg [ 7:0] din_enable = 'd0;
reg [ 2:0] din_dcnt = 'd0;
reg din_wr = 'd0; reg din_wr = 'd0;
reg [(ADDRESS_WIDTH-1):0] din_waddr = 'd0; reg [(ADDRESS_WIDTH-1):0] din_waddr = 'd0;
reg din_req_t = 'd0; reg din_req_t = 'd0;
@ -141,6 +140,7 @@ module util_wfifo #(
wire dout_req_t_s; wire dout_req_t_s;
wire [(DATA_WIDTH-1):0] dout_rdata_s; wire [(DATA_WIDTH-1):0] dout_rdata_s;
wire [(T_DOUT_DATA_WIDTH+1):0] dout_data_s; wire [(T_DOUT_DATA_WIDTH+1):0] dout_data_s;
wire [ 2:0] din_dcnt_s;
// variables // variables
@ -179,10 +179,27 @@ module util_wfifo #(
end end
endgenerate endgenerate
generate
if (M_MEM_RATIO == 1) begin
assign din_dcnt_s = 'b0;
end else begin
reg [ 2:0] din_dcnt = 'd0;
always @(posedge din_clk)
if (din_rst == 1'b1) begin
din_dcnt <= 'd0;
end else begin
if (din_valid_s[0] == 1'b1) begin
din_dcnt <= din_dcnt + 1'b1;
end
end
assign din_dcnt_s = din_dcnt;
end
endgenerate
always @(posedge din_clk) begin always @(posedge din_clk) begin
if (din_rst == 1'b1) begin if (din_rst == 1'b1) begin
din_enable <= 8'd0; din_enable <= 8'd0;
din_dcnt <= 3'd0;
din_wr <= 1'd0; din_wr <= 1'd0;
din_waddr <= 'd0; din_waddr <= 'd0;
din_req_t <= 1'd0; din_req_t <= 1'd0;
@ -191,13 +208,10 @@ module util_wfifo #(
din_ovf <= 'd0; din_ovf <= 'd0;
end else begin end else begin
din_enable <= din_enable_s; din_enable <= din_enable_s;
if (din_valid_s[0] == 1'b1) begin
din_dcnt <= din_dcnt + 1'b1;
end
case (M_MEM_RATIO) case (M_MEM_RATIO)
8: din_wr <= din_valid_s[0] & din_dcnt[0] & din_dcnt[1] & din_dcnt[2]; 8: din_wr <= din_valid_s[0] & din_dcnt_s[0] & din_dcnt_s[1] & din_dcnt_s[2];
4: din_wr <= din_valid_s[0] & din_dcnt[0] & din_dcnt[1]; 4: din_wr <= din_valid_s[0] & din_dcnt_s[0] & din_dcnt_s[1];
2: din_wr <= din_valid_s[0] & din_dcnt[0]; 2: din_wr <= din_valid_s[0] & din_dcnt_s[0];
default: din_wr <= din_valid_s[0]; default: din_wr <= din_valid_s[0];
endcase endcase
if (din_wr == 1'b1) begin if (din_wr == 1'b1) begin