From 3e8235aa71a930be815e03230b64bb850b6ffdb4 Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Sun, 12 Nov 2023 23:42:59 -0600 Subject: rtl/gfx: move funnel out of frag --- rtl/gfx/gfx.sv | 24 ++++++++++--- rtl/gfx/gfx_frag.sv | 37 ++++++-------------- rtl/gfx/gfx_frag_funnel.sv | 85 ---------------------------------------------- rtl/gfx/gfx_funnel.sv | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 116 deletions(-) delete mode 100644 rtl/gfx/gfx_frag_funnel.sv create mode 100644 rtl/gfx/gfx_funnel.sv (limited to 'rtl') diff --git a/rtl/gfx/gfx.sv b/rtl/gfx/gfx.sv index adb777f..cf209bf 100644 --- a/rtl/gfx/gfx.sv +++ b/rtl/gfx/gfx.sv @@ -52,7 +52,7 @@ module gfx ( .in_ready(raster_ready), .in_valid(0), //TODO - .out_ready(frag_ready), + .out_ready(funnel_ready), .out_valid(raster_valid), .vertex_a(), //TODO @@ -72,17 +72,33 @@ module gfx .* ); + logic funnel_ready, funnel_valid; + frag_xy funnel_frag; + fixed_tri funnel_bary; + + gfx_funnel funnel + ( + .bary(funnel_bary), + .frag(funnel_frag), + .in_ready(funnel_ready), + .in_valid(raster_valid), + .out_ready(frag_ready), + .out_valid(funnel_valid), + .* + ); + logic frag_ready, frag_valid; frag_paint frag_out; gfx_frag frag ( + .out(frag_out), + .bary(funnel_bary), + .frag(funnel_frag), .in_ready(frag_ready), - .in_valid(raster_valid), + .in_valid(funnel_valid), .out_ready(1), //TODO .out_valid(frag_valid), - - .out(frag_out), .* ); diff --git a/rtl/gfx/gfx_frag.sv b/rtl/gfx/gfx_frag.sv index 94db287..108f99a 100644 --- a/rtl/gfx/gfx_frag.sv +++ b/rtl/gfx/gfx_frag.sv @@ -5,10 +5,10 @@ module gfx_frag input logic clk, rst_n, - input frag_xy_lanes fragments, - input bary_lanes barys, - input fixed_tri ws, - input paint_lanes in_valid, + input frag_xy frag, + input fixed_tri bary, + ws, + input logic in_valid, output logic in_ready, input logic out_ready, @@ -16,27 +16,11 @@ module gfx_frag output frag_paint out ); - logic funnel_valid; - frag_xy funnel_frag; - fixed_tri bary; - - gfx_frag_funnel funnel - ( - .frag(funnel_frag), - .out_ready(frag_ready), - .out_valid(funnel_valid), - .* - ); - - logic frag_ready, frag_stall; + logic stall; gfx_pipeline_flow #(.STAGES(`GFX_FRAG_STAGES)) addr_flow ( - .stall(frag_stall), - .in_ready(frag_ready), - .in_valid(funnel_valid), - .out_ready(1), - .out_valid(), + .stall(stall), .* ); @@ -44,8 +28,7 @@ module gfx_frag gfx_frag_addr addr ( - .frag(funnel_frag), - .stall(frag_stall), + .stall(stall), .* ); @@ -55,7 +38,7 @@ module gfx_frag ( .in(linear), .out(), - .stall(frag_stall), + .stall(stall), .* ); @@ -63,13 +46,13 @@ module gfx_frag gfx_frag_bary frag_bary ( - .stall(frag_stall), + .stall(stall), .* ); gfx_frag_shade shade ( - .stall(frag_stall), + .stall(stall), .color(), .argb0(), .argb1_argb0(), diff --git a/rtl/gfx/gfx_frag_funnel.sv b/rtl/gfx/gfx_frag_funnel.sv deleted file mode 100644 index 943f582..0000000 --- a/rtl/gfx/gfx_frag_funnel.sv +++ /dev/null @@ -1,85 +0,0 @@ -`include "gfx/gfx_defs.sv" - -module gfx_frag_funnel -( - input logic clk, - rst_n, - - input frag_xy_lanes fragments, - input bary_lanes barys, - input paint_lanes in_valid, - output logic in_ready, - - input logic out_ready, - output logic out_valid, - output frag_xy frag, - output fixed_tri bary -); - - logic skid_ready, stall, ready, valid; - frag_xy next_frag, out_frag; - fixed_tri next_bary, out_bary; - bary_lanes barys_hold; - paint_lanes current, next; - frag_xy_lanes fragments_hold; - - assign ready = !(|next); - assign in_ready = skid_ready && ready; - - gfx_skid_buf #(.WIDTH($bits(frag))) skid_frag - ( - .in(out_frag), - .out(frag), - .* - ); - - gfx_skid_buf #(.WIDTH($bits(bary))) skid_bary - ( - .in(out_bary), - .out(bary), - .* - ); - - gfx_skid_flow skid_flow - ( - .in_ready(skid_ready), - .in_valid(valid), - .* - ); - - always_comb begin - next = 0; - next_bary = {($bits(next_bary)){1'bx}}; - next_frag = {($bits(next_frag)){1'bx}}; - - for (integer i = 0; i < `GFX_FINE_LANES; ++i) - if (current[i]) begin - next = current; - next[i] = 0; - - next_bary = barys_hold[i]; - next_frag = fragments_hold[i]; - end - end - - always_ff @(posedge clk or negedge rst_n) - if (!rst_n) begin - valid <= 0; - current <= 0; - end else if (!stall) begin - valid <= |current; - current <= ready ? in_valid : next; - end - - always_ff @(posedge clk) - if (!stall) begin - if (ready) begin - barys_hold <= barys; - fragments_hold <= fragments; - end - - out_bary <= next_bary; - out_frag <= next_frag; - end - -endmodule diff --git a/rtl/gfx/gfx_funnel.sv b/rtl/gfx/gfx_funnel.sv new file mode 100644 index 0000000..22fefe3 --- /dev/null +++ b/rtl/gfx/gfx_funnel.sv @@ -0,0 +1,85 @@ +`include "gfx/gfx_defs.sv" + +module gfx_funnel +( + input logic clk, + rst_n, + + input frag_xy_lanes fragments, + input bary_lanes barys, + input paint_lanes in_valid, + output logic in_ready, + + input logic out_ready, + output logic out_valid, + output frag_xy frag, + output fixed_tri bary +); + + logic skid_ready, stall, ready, valid; + frag_xy next_frag, out_frag; + fixed_tri next_bary, out_bary; + bary_lanes barys_hold; + paint_lanes current, next; + frag_xy_lanes fragments_hold; + + assign ready = !(|next); + assign in_ready = skid_ready && ready; + + gfx_skid_buf #(.WIDTH($bits(frag))) skid_frag + ( + .in(out_frag), + .out(frag), + .* + ); + + gfx_skid_buf #(.WIDTH($bits(bary))) skid_bary + ( + .in(out_bary), + .out(bary), + .* + ); + + gfx_skid_flow skid_flow + ( + .in_ready(skid_ready), + .in_valid(valid), + .* + ); + + always_comb begin + next = 0; + next_bary = {($bits(next_bary)){1'bx}}; + next_frag = {($bits(next_frag)){1'bx}}; + + for (integer i = 0; i < `GFX_FINE_LANES; ++i) + if (current[i]) begin + next = current; + next[i] = 0; + + next_bary = barys_hold[i]; + next_frag = fragments_hold[i]; + end + end + + always_ff @(posedge clk or negedge rst_n) + if (!rst_n) begin + valid <= 0; + current <= 0; + end else if (!stall) begin + valid <= |current; + current <= ready ? in_valid : next; + end + + always_ff @(posedge clk) + if (!stall) begin + if (ready) begin + barys_hold <= barys; + fragments_hold <= fragments; + end + + out_bary <= next_bary; + out_frag <= next_frag; + end + +endmodule -- cgit v1.2.3