wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fpga_synthesis' of https://github.gatech.edu/casl/Vortex into fpga_synthesis

Browse Source
This commit is contained in:
Blaise Tine
2020-05-21 01:11:38 -07:00
parent 3f5fa64085 d12c40131e
commit 8daab1c22b
1 changed files with 108 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
hw/rtl/libs/VX_generic_queue.v
View File

@@ -2,7 +2,8 @@
module VX_generic_queue #( module VX_generic_queue #(
parameter DATAW, parameter DATAW,
parameter SIZE = 16 parameter SIZE = 16,
parameter BUFFERED_OUTPUT = 1
) ( ) (
`IGNORE_WARNINGS_BEGIN `IGNORE_WARNINGS_BEGIN
input wire clk, input wire clk,
@@ -31,7 +32,6 @@ module VX_generic_queue #(
reg [DATAW-1:0] data [SIZE-1:0]; reg [DATAW-1:0] data [SIZE-1:0];
`endif `endif
reg [DATAW-1:0] head_r;
reg [`LOG2UP(SIZE+1)-1:0] size_r; reg [`LOG2UP(SIZE+1)-1:0] size_r;
wire reading; wire reading;
wire writing; wire writing;
@@ -39,12 +39,14 @@ module VX_generic_queue #(
assign reading = pop && !empty; assign reading = pop && !empty;
assign writing = push && !full; assign writing = push && !full;
if (SIZE == 1) begin if (SIZE == 1) begin // (SIZE == 1)
reg [DATAW-1:0] head_r;
always @(posedge clk) begin always @(posedge clk) begin
if (reset) begin if (reset) begin
size_r <= 0;
head_r <= 0; head_r <= 0;
size_r <= 0;
end else begin end else begin
if (writing && !reading) begin if (writing && !reading) begin
size_r <= 1; size_r <= 1;
@@ -65,72 +67,94 @@ module VX_generic_queue #(
end else begin // (SIZE > 1) end else begin // (SIZE > 1)
if (0 == BUFFERED_OUTPUT) begin
reg [`LOG2UP(SIZE):0] wr_ptr_r;
reg [`LOG2UP(SIZE):0] rd_ptr_r;
wire [`LOG2UP(SIZE)-1:0] wr_ptr_a = wr_ptr_r[`LOG2UP(SIZE)-1:0];
wire [`LOG2UP(SIZE)-1:0] rd_ptr_a = rd_ptr_r[`LOG2UP(SIZE)-1:0];
always @(posedge clk) begin
if (reset) begin
rd_ptr_r <= 0;
wr_ptr_r <= 0;
size_r <= 0;
end else begin
if (writing) begin
data[wr_ptr_a] <= data_in;
wr_ptr_r <= wr_ptr_r + 1;
if (!reading) begin
size_r <= size_r + 1;
end
end
if (reading) begin
rd_ptr_r <= rd_ptr_r + 1;
if (!writing) begin
size_r <= size_r - 1;
end
end
end
end
assign data_out = data[rd_ptr_a];
assign empty = (wr_ptr_r == rd_ptr_r);
assign full = (wr_ptr_a == rd_ptr_a) && (wr_ptr_r[`LOG2UP(SIZE)] != rd_ptr_r[`LOG2UP(SIZE)]);
assign size = size_r;
end else begin
reg [DATAW-1:0] head_r;
reg [DATAW-1:0] curr_r; reg [DATAW-1:0] curr_r;
reg [`LOG2UP(SIZE)-1:0] wr_ctr_r; reg [`LOG2UP(SIZE)-1:0] wr_ptr_r;
reg [`LOG2UP(SIZE)-1:0] rd_ptr_r; reg [`LOG2UP(SIZE)-1:0] rd_ptr_r;
reg [`LOG2UP(SIZE)-1:0] rd_next_ptr_r; reg [`LOG2UP(SIZE)-1:0] rd_ptr_next_r;
reg empty_r; reg empty_r;
reg full_r; reg full_r;
reg bypass_r; reg bypass_r;
always @(posedge clk) begin
if (reset) begin
wr_ctr_r <= 0;
end else begin
if (writing)
wr_ctr_r <= wr_ctr_r + 1;
end
end
always @(posedge clk) begin always @(posedge clk) begin
if (reset) begin if (reset) begin
size_r <= 0; size_r <= 0;
empty_r <= 1; empty_r <= 1;
full_r <= 0; full_r <= 0;
wr_ptr_r <= 0;
rd_ptr_r <= 0;
rd_ptr_next_r <= 1;
end else begin end else begin
if (writing && !reading) begin if (writing) begin
size_r <= size_r + 1; data[wr_ptr_r] <= data_in;
wr_ptr_r <= wr_ptr_r + 1;
if (!reading) begin
empty_r <= 0; empty_r <= 0;
if (size_r == SIZE-1) begin if (size_r == SIZE-1) begin
full_r <= 1; full_r <= 1;
end end
end else size_r <= size_r + 1;
if (reading && !writing) begin end
size_r <= size_r - 1; end
if (reading) begin
rd_ptr_r <= rd_ptr_next_r;
if (SIZE == 2) begin
rd_ptr_next_r <= ~rd_ptr_next_r;
end else if (SIZE > 2) begin
rd_ptr_next_r <= rd_ptr_r + 2;
end
if (!writing) begin
if (size_r == 1) begin if (size_r == 1) begin
empty_r <= 1; empty_r <= 1;
end; end;
full_r <= 0; full_r <= 0;
end size_r <= size_r - 1;
end
end
always @(posedge clk) begin
if (writing) begin
data[wr_ctr_r] <= data_in;
end
end
always @(posedge clk) begin
if (reset) begin
curr_r <= 0;
rd_ptr_r <= 0;
rd_next_ptr_r <= 1;
bypass_r <= 0;
end else begin
if (reading) begin
if (SIZE == 2) begin
rd_ptr_r <= rd_next_ptr_r;
rd_next_ptr_r <= ~rd_next_ptr_r;
end else if (SIZE > 2) begin
rd_ptr_r <= rd_next_ptr_r;
rd_next_ptr_r <= rd_ptr_r + 2;
end end
end end
bypass_r <= writing && (empty_r || (1 == size_r) && reading); bypass_r <= writing && (empty_r || (1 == size_r) && reading);
curr_r <= data_in; curr_r <= data_in;
head_r <= data[reading ? rd_next_ptr_r : rd_ptr_r]; head_r <= data[reading ? rd_ptr_next_r : rd_ptr_r];
end end
end end
@@ -140,5 +164,6 @@ module VX_generic_queue #(
assign size = size_r; assign size = size_r;
end end
end end
end
endmodule endmodule