Skip to content

X
x393
Commit daf46a7e authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

more simulation - histograms, transfer over saxi, writing to video memory

parent 1ed9d65a
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 86 deletions
axi/histogram_saxi.v
View file @ daf46a7e
...@@ -126,7 +126,7 @@ module histogram_saxi#( ...@@ -126,7 +126,7 @@ module histogram_saxi#(
reg [1:0] mux_sel; reg [1:0] mux_sel;
wire start_w; wire start_w;
reg started; reg started;
reg [ATTRIB_WIDTH -1:0] attrib; // to hold frame number, sensor number and burst (color) for the histograms in the buffer reg [4*ATTRIB_WIDTH -1:0] attrib; // to hold frame number, sensor number and burst (color) for the histograms in the buffer
wire page_sent_mclk; // page sent over saxi - pulse in mclk domain wire page_sent_mclk; // page sent over saxi - pulse in mclk domain
reg [1:0] page_wr; // page number being written reg [1:0] page_wr; // page number being written
reg [7:0] page_wa; // 32-bit word address in page being written reg [7:0] page_wa; // 32-bit word address in page being written
...@@ -201,7 +201,7 @@ module histogram_saxi#( ...@@ -201,7 +201,7 @@ module histogram_saxi#(
assign rq_in = mux_sel[1] ? (mux_sel[0] ? hist_request3 : hist_request2) : (mux_sel[0] ? hist_request1 : hist_request0); assign rq_in = mux_sel[1] ? (mux_sel[0] ? hist_request3 : hist_request2) : (mux_sel[0] ? hist_request1 : hist_request0);
assign sub_chn_w = mux_sel[1] ? (mux_sel[0] ? hist_chn3 : hist_chn2) : (mux_sel[0] ? hist_chn1 : hist_chn0); assign sub_chn_w = mux_sel[1] ? (mux_sel[0] ? hist_chn3 : hist_chn2) : (mux_sel[0] ? hist_chn1 : hist_chn0);
assign frame_w = mux_sel[1] ? (mux_sel[0] ? frame3 : frame2) : (mux_sel[0] ? frame1 : frame0); assign frame_w = mux_sel[1] ? (mux_sel[0] ? frame3 : frame2) : (mux_sel[0] ? frame1 : frame0);
assign burst_done_w = dav_r && !dav; assign burst_done_w = dav_r && !dav && en;
assign hist_grant0 = chn_grant[0]; assign hist_grant0 = chn_grant[0];
assign hist_grant1 = chn_grant[1]; assign hist_grant1 = chn_grant[1];
assign hist_grant2 = chn_grant[2]; assign hist_grant2 = chn_grant[2];
...@@ -288,7 +288,9 @@ module histogram_saxi#( ...@@ -288,7 +288,9 @@ module histogram_saxi#(
else if ( burst_done_w && !page_sent_mclk) pages_in_buf_wr <= pages_in_buf_wr + 1; else if ( burst_done_w && !page_sent_mclk) pages_in_buf_wr <= pages_in_buf_wr + 1;
else if (!burst_done_w && page_sent_mclk) pages_in_buf_wr <= pages_in_buf_wr - 1; else if (!burst_done_w && page_sent_mclk) pages_in_buf_wr <= pages_in_buf_wr - 1;
grant <= en && rq_in && !buf_full; // grant <= en && rq_in && !buf_full && (!started || busy_r); // delay grant until chn_sel is set (first cycle of started)
grant <= en && rq_in && !buf_full && (grant || busy_r); // delay grant until chn_sel is set (first cycle of started)
if (!en) chn_grant <= 0; if (!en) chn_grant <= 0;
else chn_grant <= {4{grant}} & chn_sel; else chn_grant <= {4{grant}} & chn_sel;
...@@ -323,7 +325,8 @@ module histogram_saxi#( ...@@ -323,7 +325,8 @@ module histogram_saxi#(
else block_run <= {block_run[2:0],block_start_w | (block_run[0] & ~ block_end)}; else block_run <= {block_run[2:0],block_start_w | (block_run[0] & ~ block_end)};
if (!en_aclk) block_start_r <= 0; if (!en_aclk) block_start_r <= 0;
else block_start_r <= {block_run[2:0], block_start_w}; // else block_start_r <= {block_run[2:0], block_start_w};
else block_start_r <= {block_start_r[2:0], block_start_w};
if (block_start_r[0]) attrib_r <= attrib[page_rd * ATTRIB_WIDTH +: ATTRIB_WIDTH]; if (block_start_r[0]) attrib_r <= attrib[page_rd * ATTRIB_WIDTH +: ATTRIB_WIDTH];
...@@ -331,8 +334,8 @@ module histogram_saxi#( ...@@ -331,8 +334,8 @@ module histogram_saxi#(
if (block_start_r[2]) hist_start_addr[31:12] <= hist_start_page_r + attrib_frame; if (block_start_r[2]) hist_start_addr[31:12] <= hist_start_page_r + attrib_frame;
if (block_start_r[2]) hist_start_addr[11:10] <= attrib_color; if (block_start_r[2]) hist_start_addr[11:10] <= attrib_color;
if (block_start_r[3]) start_addr_r[31:6] <= {hist_start_addr[31:10], 4'b0}; if (arst || block_start_r[3]) start_addr_r[31:6] <= {hist_start_addr[31:10], 4'b0};
else if (saxi_start_burst_w) start_addr_r[31:6] <= start_addr_r[31:6] + 1; else if (saxi_start_burst_w) start_addr_r[31:6] <= start_addr_r[31:6] + 1;
if (!en_aclk) first_burst <= 0; if (!en_aclk) first_burst <= 0;
else if (block_start_r[3]) first_burst <=1; // block_start_r[3] - same as start_addr_r set else if (block_start_r[3]) first_burst <=1; // block_start_r[3] - same as start_addr_r set
......
includes/x393_parameters.vh
View file @ daf46a7e
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
parameter SENSI2C_STATUS_REG_REL = 0, // 4 locations" 'h20, 'h22, 'h24, 'h26 parameter SENSI2C_STATUS_REG_REL = 0, // 4 locations" 'h20, 'h22, 'h24, 'h26
parameter SENSIO_STATUS_REG_REL = 1, // 4 locations" 'h21, 'h23, 'h25, 'h27 parameter SENSIO_STATUS_REG_REL = 1, // 4 locations" 'h21, 'h23, 'h25, 'h27
parameter SENSOR_NUM_HISTOGRAM= 3, // number of histogram channels parameter SENSOR_NUM_HISTOGRAM= 3, // number of histogram channels
parameter HISTOGRAM_RAM_MODE = "NOBUF", // valid: "NOBUF" (32-bits, no buffering), "BUF18", "BUF32" parameter HISTOGRAM_RAM_MODE = "BUF32", // "NOBUF", // valid: "NOBUF" (32-bits, no buffering), "BUF18", "BUF32"
parameter SENS_NUM_SUBCHN = 3, // number of subchannels for his sensor ports (1..4) parameter SENS_NUM_SUBCHN = 3, // number of subchannels for his sensor ports (1..4)
parameter SENS_GAMMA_BUFFER = 0, // 1 - use "shadow" table for clean switching, 0 - single table per channel parameter SENS_GAMMA_BUFFER = 0, // 1 - use "shadow" table for clean switching, 0 - single table per channel
......
includes/x393_simulation_parameters.vh
View file @ daf46a7e
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
// parameter SENSOR12BITS_RAMP = 1, // 1 - ramp, 0 - random (now - sensor.dat) // parameter SENSOR12BITS_RAMP = 1, // 1 - ramp, 0 - random (now - sensor.dat)
// parameter SENSOR12BITS_NEW_BAYER = 0, // 0 - "old" tiles (16x16, 1 - new - (18x18) // parameter SENSOR12BITS_NEW_BAYER = 0, // 0 - "old" tiles (16x16, 1 - new - (18x18)
parameter HISTOGRAM_LEFT = 0, //2; // left parameter HISTOGRAM_LEFT = 0, // 2; // left
parameter HISTOGRAM_TOP = 2, // top parameter HISTOGRAM_TOP = 8, // 2, // top
parameter HISTOGRAM_WIDTH = 6, // width parameter HISTOGRAM_WIDTH = 6, // width
parameter HISTOGRAM_HEIGHT = 6, // height parameter HISTOGRAM_HEIGHT = 6, // height
parameter HISTOGRAM_STRAT_PAGE = 20'h12345, parameter HISTOGRAM_STRAT_PAGE = 20'h12345,
......
sensor/sens_histogram.v
View file @ daf46a7e
...@@ -25,7 +25,9 @@ module sens_histogram #( ...@@ -25,7 +25,9 @@ module sens_histogram #(
parameter HISTOGRAM_ADDR = 'h33c, parameter HISTOGRAM_ADDR = 'h33c,
parameter HISTOGRAM_ADDR_MASK = 'h7fe, parameter HISTOGRAM_ADDR_MASK = 'h7fe,
parameter HISTOGRAM_LEFT_TOP = 'h0, parameter HISTOGRAM_LEFT_TOP = 'h0,
parameter HISTOGRAM_WIDTH_HEIGHT = 'h1 // 1.. 2^16, 0 - use HACT parameter HISTOGRAM_WIDTH_HEIGHT = 'h1, // 1.. 2^16, 0 - use HACT
parameter [1:0] XOR_HIST_BAYER = 2'b00// 11 // invert bayer setting
)( )(
// input rst, // input rst,
input mrst, // @posedge mclk, sync reset input mrst, // @posedge mclk, sync reset
...@@ -44,20 +46,22 @@ module sens_histogram #( ...@@ -44,20 +46,22 @@ module sens_histogram #(
output [31:0] hist_do, output [31:0] hist_do,
output hist_dv, output hist_dv,
input [7:0] cmd_ad, // byte-serial command address/data (up to 6 bytes: AL-AH-D0-D1-D2-D3 input [7:0] cmd_ad, // byte-serial command address/data (up to 6 bytes: AL-AH-D0-D1-D2-D3
input cmd_stb // strobe (with first byte) for the command a/d input cmd_stb, // strobe (with first byte) for the command a/d
input monochrome // tie to 0 to reduce hardware
); );
localparam PXD_2X_LATENCY = 2;
reg hist_bank_pclk; reg hist_bank_pclk;
reg [7:0] hist_d; // reg [7:0] hist_d;
reg [9:0] hist_addr; reg [9:0] hist_addr;
reg [9:0] hist_addr_d; reg [9:0] hist_addr_d;
reg [9:0] hist_addr_d2; reg [9:0] hist_addr_d2;
reg [9:0] hist_rwaddr; reg [9:0] hist_rwaddr;
reg [31:0] inc_r; reg [31:0] to_inc; // multiplexed, registered (either from memory or from previously incremented/saturated value)
wire [31:0] inc_w; // wire [31:0] inc_w; // (before register)
reg [31:0] to_inc; reg [31:0] inc_r; // incremented value, registered
reg [31:0] inc_sat; // inc_r registered and possibly saturated (in 18-bit mode), just registered in 32-bit mode)
wire [31:0] hist_new; wire [31:0] hist_new;
reg hist_rwen; // read/write enable reg hist_rwen; // read/write enable
// reg [2:0] hist_regen; // bram output register enable: [0] - ren, [1] - regen, [2] - next after regen // reg [2:0] hist_regen; // bram output register enable: [0] - ren, [1] - regen, [2] - next after regen
...@@ -88,10 +92,11 @@ module sens_histogram #( ...@@ -88,10 +92,11 @@ module sens_histogram #(
wire set_left_top_pclk; wire set_left_top_pclk;
wire set_width_height_pclk; wire set_width_height_pclk;
wire pclk_sync; // CE for pclk2x, ~=pclk reg pclk_sync; // CE for pclk2x, ~=pclk
reg [1:0] bayer_pclk; reg [1:0] bayer_pclk;
reg hact_d;
reg [1:0] hact_d;
reg top_margin; // above (before) active window reg top_margin; // above (before) active window
reg hist_done; // @pclk single cycle reg hist_done; // @pclk single cycle
...@@ -104,7 +109,8 @@ module sens_histogram #( ...@@ -104,7 +109,8 @@ module sens_histogram #(
reg [15:0] hcntr; // horizontal (pixel) counter reg [15:0] hcntr; // horizontal (pixel) counter
wire vcntr_zero_w; // vertical counter is zero wire vcntr_zero_w; // vertical counter is zero
wire hcntr_zero_w; // horizontal counter is zero wire hcntr_zero_w; // horizontal counter is zero
reg same_addr; // @pclk2x - current histoigram address is the same as before-previous (previous was different color) reg same_addr1; // @pclk2x - current histogram address is the same as previous (it was different color, but for future monochrome?)
reg same_addr2; // @pclk2x - current histogram address is the same as before-previous (previous was different color)
reg hist_out; // some data yet to be sent out reg hist_out; // some data yet to be sent out
...@@ -122,11 +128,47 @@ module sens_histogram #( ...@@ -122,11 +128,47 @@ module sens_histogram #(
assign set_width_height_w = pio_stb && (pio_addr == HISTOGRAM_WIDTH_HEIGHT ); assign set_width_height_w = pio_stb && (pio_addr == HISTOGRAM_WIDTH_HEIGHT );
assign vcntr_zero_w = !(|vcntr); assign vcntr_zero_w = !(|vcntr);
assign hcntr_zero_w = !(|hcntr); assign hcntr_zero_w = !(|hcntr);
assign inc_w = to_inc+1; // assign inc_w = to_inc+1;
assign hist_rq = hist_rq_r; assign hist_rq = hist_rq_r;
assign hist_dv = hist_re[2]; assign hist_dv = hist_re[2];
assign hist_xfer_done_mclk = hist_out_d && !hist_out_d; assign hist_xfer_done_mclk = hist_out_d && !hist_out_d && hist_en;
//AF2015-new mod
wire line_start_w = hact && !hact_d[0];
reg pre_first_line;
reg frame_active; // until done
reg hist_en_pclk2x;
// reg hist_rst_pclk2x;
wire hlstart; // histogram line start @ posedge pclk2x
reg [7:0] pxd_ram [0:15] ; // crossing clock boundary
reg [1:0] bayer_ram [0:15] ; // crossing clock boundary
reg [0:0] woi_ram [0:15] ; // horizontal WOI to pclk2x
reg [3:0] pxd_wa;
reg [3:0] pxd_wa_woi;
reg [3:0] pxd_ra;
reg [3:0] pxd_ra_start; // start value of the pxd_ra counter to account for left margin
// reg [1:0] bayer_pclk;
wire [1:0] bayer_2x = bayer_ram[pxd_ra];
wire [7:0] pxd_2x = pxd_ram[pxd_ra];
wire hor_woi_2x=woi_ram[pxd_ra];
reg monochrome_pclk;
reg monochrome_2x;
always @ (posedge pclk) begin
if (!hact) pxd_wa <= 0;
else pxd_wa <= pxd_wa + 1;
if (!hact) pxd_wa_woi <= -PXD_2X_LATENCY;
else pxd_wa_woi <= pxd_wa_woi + 1;
if (hist_en_pclk && hact) pxd_ram[pxd_wa] <= hist_di;
if (hist_en_pclk && hact) bayer_ram[pxd_wa] <= bayer_pclk;
if (hist_en_pclk && hact_d[1]) woi_ram[pxd_wa_woi] <= hor_woi; // PXD_2X_LATENCY;
end
always @ (posedge mclk) begin always @ (posedge mclk) begin
...@@ -139,42 +181,43 @@ module sens_histogram #( ...@@ -139,42 +181,43 @@ module sens_histogram #(
if (set_width_height_pclk) {height_m1,width_m1} <= wh_mclk[31:0]; if (set_width_height_pclk) {height_m1,width_m1} <= wh_mclk[31:0];
end end
// process WOI
// wire eol = !hact && hact_d[0];
always @ (posedge pclk) begin always @ (posedge pclk) begin
hact_d <= hact; hact_d <= {hact_d[0],hact};
if (sof) bayer_pclk <= 0; if (!en) pre_first_line <= 0;
else if (hact) bayer_pclk <= {bayer_pclk[1], ~bayer_pclk[0]}; else if (sof && en_new) pre_first_line <= 1;
else bayer_pclk <= {bayer_pclk[1] ^ hact_d, 1'b0}; else if (hact) pre_first_line <= 0;
if (!en) top_margin <= 0;
else if (sof && en_new) top_margin <= 1;
else if (vcntr_zero_w & line_start_w) top_margin <= 0;
if (!en ||(pre_first_line && !hact)) vert_woi <= 0;
else if (vcntr_zero_w & line_start_w) vert_woi <= top_margin;
end hist_done <= vcntr_zero_w && vert_woi && line_start_w;
// process WOI
always @ (posedge pclk) begin
if (!en) top_margin <= 0;
else if (sof && en_new) top_margin <= 1;
else if (vcntr_zero_w) top_margin <= 0;
if (!en) vert_woi <= 0; if (!en || hist_done) frame_active <= 0;
else if (vcntr_zero_w) vert_woi <= top_margin; else if (sof && en_new) frame_active <= 1;
hist_done <= vcntr_zero_w && vert_woi;
if (sof) vcntr <= top; if ((pre_first_line && !hact) || !frame_active) vcntr <= top;
else if (vcntr_zero_w && top_margin) vcntr <= height_m1; else if (line_start_w) vcntr <= vcntr_zero_w ? height_m1 : (vcntr - 1);
else if (top_margin || vert_woi) vcntr <= vcntr - 1;
if (!vert_woi) left_margin <= 0; if (!frame_active) left_margin <= 0;
else if (!hact) left_margin <= 1; else if (!hact_d[0]) left_margin <= 1;
else if (hcntr_zero_w) left_margin <= 0; else if (hcntr_zero_w) left_margin <= 0;
if (!vert_woi || wait_readout) hor_woi <= 0; // postpone WOI if reading out/erasing histogram (no-buffer mode) // !hact_d[0] to limit by right margin if window is set wrong
else if (hcntr_zero_w) hor_woi <= left_margin; if (!vert_woi || wait_readout || !hact_d[0]) hor_woi <= 0; // postpone WOI if reading out/erasing histogram (no-buffer mode)
else if (hcntr_zero_w) hor_woi <= left_margin && vert_woi;
if (!hact) hcntr <= left; if (!hact_d[0]) hcntr <= left;
else if (hcntr_zero_w && left_margin) hcntr <= width_m1; else if (hcntr_zero_w && left_margin) hcntr <= width_m1;
else if (left_margin || hor_woi) hcntr <= hcntr - 1; else if (left_margin || hor_woi) hcntr <= hcntr - 1;
if (hor_woi) hist_d <= hist_di; // if (hor_woi) hist_d <= hist_di;
if (!en) hist_bank_pclk <= 0; if (!en) hist_bank_pclk <= 0;
else if (hist_done && (HISTOGRAM_RAM_MODE != "NOBUF")) hist_bank_pclk <= !hist_bank_pclk; else if (hist_done && (HISTOGRAM_RAM_MODE != "NOBUF")) hist_bank_pclk <= !hist_bank_pclk;
...@@ -191,20 +234,51 @@ module sens_histogram #( ...@@ -191,20 +234,51 @@ module sens_histogram #(
else if (!top_margin && !vert_woi && !hist_xfer_busy) en <= 0; else if (!top_margin && !vert_woi && !hist_xfer_busy) en <= 0;
en_new <= !hist_rst_pclk && hist_en_pclk; en_new <= !hist_rst_pclk && hist_en_pclk;
if (monochrome_pclk) bayer_pclk[1] <= 0;
else if (!hact && hact_d[0]) bayer_pclk[1] <= !bayer_pclk[1];
else if (pre_first_line && !hact) bayer_pclk[1] <= XOR_HIST_BAYER[1];
if (monochrome_pclk) bayer_pclk[0] <= 0;
else if (!hact) bayer_pclk[0] <= XOR_HIST_BAYER[0];
else bayer_pclk[0] <= ~bayer_pclk[0];
//line_start_w
end
always @(posedge pclk2x) begin
monochrome_2x <= monochrome;
hist_en_pclk2x <= hist_en;
// hist_rst_pclk2x <= hist_rst;
pxd_ra_start <= left[3:0];
if (!hist_en_pclk2x || hlstart || !(hor_woi_2x || (|woi))) pclk_sync <= 0;
else pclk_sync <= ~pclk_sync;
if (hlstart) pxd_ra <= pxd_ra_start;
else if (pclk_sync) pxd_ra <= pxd_ra + 1;
end end
always @(posedge pclk2x) begin always @(posedge pclk2x) begin
if (pclk_sync) begin if (pclk_sync) begin
woi <= {woi[1:0],hor_woi}; woi <= {woi[1:0],hor_woi_2x};
hist_addr <= {bayer_pclk,hist_d}; hist_addr <= {bayer_2x,pxd_2x};
hist_addr_d <= hist_addr; hist_addr_d <= hist_addr;
hist_addr_d2 <= hist_addr_d; hist_addr_d2 <= hist_addr_d;
same_addr <= woi[0] && woi[2] && (hist_addr_d2 == hist_addr); same_addr1 <= monochrome_2x && woi[0] && woi[1] && (hist_addr_d == hist_addr); // reduce hardware if hard-wire to gnd
if (same_addr) to_inc <= inc_r; same_addr2 <= woi[0] && woi[2] && (hist_addr_d2 == hist_addr);
else to_inc <= hist_new; // if (same_addr) to_inc <= inc_r;
// else to_inc <= hist_new;
if (same_addr1) to_inc <= inc_r; // only used in monochrome mode
else if (same_addr2) to_inc <= inc_sat;
else to_inc <= hist_new;
if (HISTOGRAM_RAM_MODE != "BUF18") inc_sat <= inc_r;
else if (inc_r[18]) inc_sat <= 32'h3fff; // maximal value
else inc_sat <= {14'b0,inc_r[17:0]};
end end
hist_rwen <= (woi[0] & ~pclk_sync) || (woi[2] & pclk_sync); hist_rwen <= (woi[0] & ~pclk_sync) || (woi[2] & pclk_sync);
// hist_regen <= {hist_regen[1:0], woi[0] & ~pclk_sync}; // hist_regen <= {hist_regen[1:0], woi[0] & ~pclk_sync};
...@@ -213,16 +287,19 @@ module sens_histogram #( ...@@ -213,16 +287,19 @@ module sens_histogram #(
if (woi[0] & ~pclk_sync) hist_rwaddr <= hist_addr; if (woi[0] & ~pclk_sync) hist_rwaddr <= hist_addr;
else if (woi[2] & pclk_sync) hist_rwaddr <= hist_addr_d2; else if (woi[2] & pclk_sync) hist_rwaddr <= hist_addr_d2;
inc_r <= to_inc + 1;
if (HISTOGRAM_RAM_MODE != "BUF18") inc_r <= inc_w; // if (HISTOGRAM_RAM_MODE != "BUF18") inc_r <= inc_w;
else if (inc_w[18]) inc_r <= 32'h3fff; // maximal value // else if (inc_w[18]) inc_r <= 32'h3fff; // maximal value
else inc_r <= {14'b0,inc_w[17:0]}; // else inc_r <= {14'b0,inc_w[17:0]};
end end
always @ (posedge mclk) begin always @ (posedge mclk) begin
en_mclk <= en; en_mclk <= en;
monochrome_pclk <= monochrome;
if (!en_mclk) hist_out <= 0; if (!en_mclk) hist_out <= 0;
else if (hist_done_mclk) hist_out <= 1; else if (hist_done_mclk) hist_out <= 1;
else if (&hist_raddr) hist_out <= 0; else if (&hist_raddr) hist_out <= 0;
...@@ -232,12 +309,13 @@ module sens_histogram #( ...@@ -232,12 +309,13 @@ module sens_histogram #(
if (!en_mclk) hist_raddr <= 0; if (!en_mclk) hist_raddr <= 0;
else if (hist_re) hist_raddr <= hist_raddr + 1; else if (hist_re) hist_raddr <= hist_raddr + 1;
if (!en_mclk) hist_rq_r <= 0; // if (!en_mclk) hist_rq_r <= 0;
else if (hist_out && !hist_re) hist_rq_r <= 1; // else if (hist_out && !hist_re) hist_rq_r <= 1;
hist_rq_r <= en_mclk && hist_out && !(&hist_raddr);
if (!hist_out) hist_re[0] <= 0; if (!hist_out || (&hist_raddr[7:0])) hist_re[0] <= 0;
else if (hist_grant) hist_re[0] <= 1; else if (hist_grant && hist_out) hist_re[0] <= 1;
else if (&hist_raddr[7:0]) hist_re[0] <= 0;
hist_re[2:1] <= hist_re[1:0]; hist_re[2:1] <= hist_re[1:0];
...@@ -274,6 +352,17 @@ module sens_histogram #( ...@@ -274,6 +352,17 @@ module sens_histogram #(
.data (pio_data), // output[31:0] .data (pio_data), // output[31:0]
.we (pio_stb) // output .we (pio_stb) // output
); );
pulse_cross_clock pulse_cross_clock_hlstart_start_i (
.rst (prst), // input
.src_clk (pclk), // input
.dst_clk (pclk2x), // input
.in_pulse (hcntr_zero_w && left_margin && hact_d[0]), // input
.out_pulse (hlstart), // output
.busy() // output
);
pulse_cross_clock pulse_cross_clock_lt_i ( pulse_cross_clock pulse_cross_clock_lt_i (
.rst (mrst), // input .rst (mrst), // input
...@@ -310,13 +399,13 @@ module sens_histogram #( ...@@ -310,13 +399,13 @@ module sens_histogram #(
.out_pulse (hist_xfer_done), // output .out_pulse (hist_xfer_done), // output
.busy() // output .busy() // output
); );
/*
clk_to_clk2x clk_to_clk2x_i ( clk_to_clk2x clk_to_clk2x_i (
.clk (pclk), // input .clk (pclk), // input
.clk2x (pclk2x), // input .clk2x (pclk2x), // input
.clk_sync (pclk_sync) // output .clk_sync (pclk_sync) // output
); );
*/
//TODO: make it double cycle in timing //TODO: make it double cycle in timing
// select between 18-bit wide histogram data using a single BRAM or 2 BRAMs having full 32 bits // select between 18-bit wide histogram data using a single BRAM or 2 BRAMs having full 32 bits
...@@ -325,7 +414,7 @@ module sens_histogram #( ...@@ -325,7 +414,7 @@ module sens_histogram #(
sens_hist_ram_double sens_hist_ram_i ( sens_hist_ram_double sens_hist_ram_i (
.pclk2x (pclk2x), // input .pclk2x (pclk2x), // input
.addr_a ({hist_bank_pclk,hist_rwaddr[9:0]}), // input[10:0] .addr_a ({hist_bank_pclk,hist_rwaddr[9:0]}), // input[10:0]
.data_in_a (inc_r), // input[31:0] .data_in_a (inc_sat), // input[31:0]
.data_out_a (hist_new), // output[31:0] .data_out_a (hist_new), // output[31:0]
.en_a (hist_rwen), // input .en_a (hist_rwen), // input
.regen_a (hist_regen[1]), // input .regen_a (hist_regen[1]), // input
...@@ -340,7 +429,7 @@ module sens_histogram #( ...@@ -340,7 +429,7 @@ module sens_histogram #(
sens_hist_ram_single sens_hist_ram_i ( sens_hist_ram_single sens_hist_ram_i (
.pclk2x (pclk2x), // input .pclk2x (pclk2x), // input
.addr_a ({hist_bank_pclk,hist_rwaddr[9:0]}), // input[10:0] .addr_a ({hist_bank_pclk,hist_rwaddr[9:0]}), // input[10:0]
.data_in_a (inc_r), // input[31:0] .data_in_a (inc_sat), // input[31:0]
.data_out_a (hist_new), // output[31:0] .data_out_a (hist_new), // output[31:0]
.en_a (hist_rwen), // input .en_a (hist_rwen), // input
.regen_a (hist_regen[1]), // input .regen_a (hist_regen[1]), // input
...@@ -355,7 +444,7 @@ module sens_histogram #( ...@@ -355,7 +444,7 @@ module sens_histogram #(
sens_hist_ram_nobuff sens_hist_ram_i ( sens_hist_ram_nobuff sens_hist_ram_i (
.pclk2x (pclk2x), // input .pclk2x (pclk2x), // input
.addr_a ({hist_bank_pclk,hist_rwaddr[9:0]}), // input[10:0] .addr_a ({hist_bank_pclk,hist_rwaddr[9:0]}), // input[10:0]
.data_in_a (inc_r), // input[31:0] .data_in_a (inc_sat), // input[31:0]
.data_out_a (hist_new), // output[31:0] .data_out_a (hist_new), // output[31:0]
.en_a (hist_rwen), // input .en_a (hist_rwen), // input
.regen_a (hist_regen[1]), // input .regen_a (hist_regen[1]), // input
......
sensor/sens_histogram_mux.v
View file @ daf46a7e
...@@ -62,6 +62,7 @@ module sens_histogram_mux( ...@@ -62,6 +62,7 @@ module sens_histogram_mux(
reg busy_r; reg busy_r;
reg [1:0] mux_sel; reg [1:0] mux_sel;
wire start_w; wire start_w;
// reg start_r;
reg started; reg started;
wire dav_in; wire dav_in;
reg dav_out; reg dav_out;
...@@ -100,7 +101,7 @@ module sens_histogram_mux( ...@@ -100,7 +101,7 @@ module sens_histogram_mux(
busy_r <= busy_w; busy_r <= busy_w;
if (!en || busy_r) started <= 0; if (!en || busy_r) started <= 0;
else if (enc_rq[2]) started <= 1; else if (enc_rq[2]) started <= 1;
if (start_w) mux_sel <= enc_rq[1:0]; if (start_w) mux_sel <= enc_rq[1:0];
dav_out <= dav_in; dav_out <= dav_in;
dout_r <= din; dout_r <= din;
...@@ -122,8 +123,11 @@ module sens_histogram_mux( ...@@ -122,8 +123,11 @@ module sens_histogram_mux(
if (!en) chn_grant <= 0; if (!en) chn_grant <= 0;
else chn_grant <= {4{grant}} & chn_sel; else chn_grant <= {4{grant}} & chn_sel;
// start_r <= en & start_w;
rq_out <= en && rq_in; if (!en ) rq_out <= 0;
else if (started) rq_out <= 1;
else if (rq_out) rq_out <= rq_in;
// rq_out <= en && rq_in;
end end
endmodule endmodule
......
sensor/sensor_channel.v
View file @ daf46a7e
...@@ -241,6 +241,8 @@ module sensor_channel#( ...@@ -241,6 +241,8 @@ module sensor_channel#(
output [31:0] hist_data // output[31:0] histogram data output [31:0] hist_data // output[31:0] histogram data
); );
localparam HIST_MONOCHROME = 1'b0; // TODO:make it configurable (at expense of extra hardware)
localparam SENSOR_BASE_ADDR = (SENSOR_GROUP_ADDR + SENSOR_NUMBER * SENSOR_BASE_INC); localparam SENSOR_BASE_ADDR = (SENSOR_GROUP_ADDR + SENSOR_NUMBER * SENSOR_BASE_INC);
localparam SENSI2C_STATUS_REG = (SENSI2C_STATUS_REG_BASE + SENSOR_NUMBER * SENSI2C_STATUS_REG_INC + SENSI2C_STATUS_REG_REL); localparam SENSI2C_STATUS_REG = (SENSI2C_STATUS_REG_BASE + SENSOR_NUMBER * SENSI2C_STATUS_REG_INC + SENSI2C_STATUS_REG_REL);
...@@ -649,7 +651,7 @@ module sensor_channel#( ...@@ -649,7 +651,7 @@ module sensor_channel#(
.mclk (mclk), // input .mclk (mclk), // input
.cmd_ad (cmd_ad), // input[7:0] .cmd_ad (cmd_ad), // input[7:0]
.cmd_stb (cmd_stb), // input .cmd_stb (cmd_stb), // input
.bayer_out (gamma_bayer) // output [1:0] .bayer_out (gamma_bayer) // output [1:0]
); );
// TODO: Use generate to generate 1-4 histogram modules // TODO: Use generate to generate 1-4 histogram modules
...@@ -678,7 +680,8 @@ module sensor_channel#( ...@@ -678,7 +680,8 @@ module sensor_channel#(
.hist_do (hist_do0), // output[31:0] .hist_do (hist_do0), // output[31:0]
.hist_dv (hist_dv[0]), // output .hist_dv (hist_dv[0]), // output
.cmd_ad (cmd_ad), // input[7:0] .cmd_ad (cmd_ad), // input[7:0]
.cmd_stb (cmd_stb) // input .cmd_stb (cmd_stb), // input
.monochrome (HIST_MONOCHROME) // input
); );
else else
sens_histogram_dummy sens_histogram_dummy_i ( sens_histogram_dummy sens_histogram_dummy_i (
...@@ -712,7 +715,8 @@ module sensor_channel#( ...@@ -712,7 +715,8 @@ module sensor_channel#(
.hist_do (hist_do1), // output[31:0] .hist_do (hist_do1), // output[31:0]
.hist_dv (hist_dv[1]), // output .hist_dv (hist_dv[1]), // output
.cmd_ad (cmd_ad), // input[7:0] .cmd_ad (cmd_ad), // input[7:0]
.cmd_stb (cmd_stb) // input .cmd_stb (cmd_stb), // input
.monochrome (HIST_MONOCHROME) // input
); );
else else
sens_histogram_dummy sens_histogram_dummy_i ( sens_histogram_dummy sens_histogram_dummy_i (
...@@ -746,7 +750,8 @@ module sensor_channel#( ...@@ -746,7 +750,8 @@ module sensor_channel#(
.hist_do (hist_do2), // output[31:0] .hist_do (hist_do2), // output[31:0]
.hist_dv (hist_dv[2]), // output .hist_dv (hist_dv[2]), // output
.cmd_ad (cmd_ad), // input[7:0] .cmd_ad (cmd_ad), // input[7:0]
.cmd_stb (cmd_stb) // input .cmd_stb (cmd_stb), // input
.monochrome (HIST_MONOCHROME) // input
); );
else else
sens_histogram_dummy sens_histogram_dummy_i ( sens_histogram_dummy sens_histogram_dummy_i (
...@@ -780,7 +785,8 @@ module sensor_channel#( ...@@ -780,7 +785,8 @@ module sensor_channel#(
.hist_do (hist_do3), // output[31:0] .hist_do (hist_do3), // output[31:0]
.hist_dv (hist_dv[3]), // output .hist_dv (hist_dv[3]), // output
.cmd_ad (cmd_ad), // input[7:0] .cmd_ad (cmd_ad), // input[7:0]
.cmd_stb (cmd_stb) // input .cmd_stb (cmd_stb), // input
.monochrome (HIST_MONOCHROME) // input
); );
else else
sens_histogram_dummy sens_histogram_dummy_i ( sens_histogram_dummy sens_histogram_dummy_i (
...@@ -792,7 +798,7 @@ module sensor_channel#( ...@@ -792,7 +798,7 @@ module sensor_channel#(
sens_histogram_mux sens_histogram_mux_i ( sens_histogram_mux sens_histogram_mux_i (
.mclk (mclk), // input .mclk (mclk), // input
.en (!(|hist_nrst)), // input .en (|hist_nrst), // input
.rq0 (hist_rq[0]), // input .rq0 (hist_rq[0]), // input
.grant0 (hist_gr[0]), // output .grant0 (hist_gr[0]), // output
.dav0 (hist_dv[0]), // input .dav0 (hist_dv[0]), // input
......
sensor/sensor_membuf.v
View file @ daf46a7e
...@@ -24,6 +24,8 @@ module sensor_membuf #( ...@@ -24,6 +24,8 @@ module sensor_membuf #(
parameter WADDR_WIDTH=9 // for 36Kb RAM parameter WADDR_WIDTH=9 // for 36Kb RAM
)( )(
input pclk, input pclk,
input prst, // reset @ posedge pclk
input mrst, // reset @ posedge mclk
input [15:0] px_data, // @posedge pclk pixel (pixel pair) data from the sensor channel input [15:0] px_data, // @posedge pclk pixel (pixel pair) data from the sensor channel
input px_valid, // px_data valid input px_valid, // px_data valid
input last_in_line, // valid with px_valid - last px_data in line input last_in_line, // valid with px_valid - last px_data in line
...@@ -31,7 +33,7 @@ module sensor_membuf #( ...@@ -31,7 +33,7 @@ module sensor_membuf #(
input mclk, // memory interface clock input mclk, // memory interface clock
input rpage_set, // set internal read page to rpage_in (reset pointers) input rpage_set, // set internal read page to rpage_in (reset pointers)
input rpage_next, // advance to next page (and reset lower bits to 0) input rpage_next, // advance to next page (and reset lower bits to 0)
input buf_rd, // read buffer to memory, increment read address (regester enable will be delayed) input buf_rd, // read buffer to memory, increment read address (register enable will be delayed)
output [63:0] buf_dout, // data out output [63:0] buf_dout, // data out
output page_written // buffer page (full or partial) is written to the memory buffer output page_written // buffer page (full or partial) is written to the memory buffer
...@@ -41,7 +43,7 @@ module sensor_membuf #( ...@@ -41,7 +43,7 @@ module sensor_membuf #(
reg [1:0] wpage; reg [1:0] wpage;
reg [WADDR_WIDTH-1:0] waddr; reg [WADDR_WIDTH-1:0] waddr;
reg sim_rst = 1; // jsut for simulation - reset from system reset to the first rpage_set // reg sim_rst = 1; // jsut for simulation - reset from system reset to the first rpage_set
reg [2:0] rst_pntr; reg [2:0] rst_pntr;
wire rst_wpntr; wire rst_wpntr;
wire inc_wpage_w; wire inc_wpage_w;
...@@ -49,19 +51,19 @@ module sensor_membuf #( ...@@ -49,19 +51,19 @@ module sensor_membuf #(
assign inc_wpage_w = px_valid && (last_in_line || (&waddr)); assign inc_wpage_w = px_valid && (last_in_line || (&waddr));
always @ (posedge mclk) begin always @ (posedge mclk) begin
rst_pntr <= {rst_pntr[1] &~rst_pntr[0], rst_pntr[0], rpage_set}; rst_pntr <= {rst_pntr[1] &~rst_pntr[0], rst_pntr[0], rpage_set};
if (rpage_set) sim_rst <= 0; // if (rpage_set) sim_rst <= 0;
end end
always @ (posedge pclk) begin always @ (posedge pclk) begin
if (rst_wpntr || (px_valid && last_in_line)) waddr <= 0; if (prst || rst_wpntr || (px_valid && last_in_line)) waddr <= 0;
else if (px_valid) waddr <= waddr + 1; else if (px_valid) waddr <= waddr + 1;
if (rst_wpntr) wpage <= 0; if (prst || rst_wpntr) wpage <= 0;
else if (inc_wpage_w) wpage <= wpage + 1; else if (inc_wpage_w) wpage <= wpage + 1;
end end
pulse_cross_clock rst_wpntr_i ( pulse_cross_clock rst_wpntr_i (
.rst (sim_rst), .rst (mrst), // sim_rst),
.src_clk (mclk), .src_clk (mclk),
.dst_clk (pclk), .dst_clk (pclk),
.in_pulse (rst_pntr[2]), .in_pulse (rst_pntr[2]),
...@@ -70,7 +72,7 @@ module sensor_membuf #( ...@@ -70,7 +72,7 @@ module sensor_membuf #(
); );
pulse_cross_clock page_written_i ( pulse_cross_clock page_written_i (
.rst (sim_rst), .rst (prst), // sim_rst || rpage_set),
.src_clk (pclk), .src_clk (pclk),
.dst_clk (mclk), .dst_clk (mclk),
.in_pulse (inc_wpage_w), .in_pulse (inc_wpage_w),
......
sensor/sensors393.v
View file @ daf46a7e
...@@ -512,6 +512,8 @@ module sensors393 #( ...@@ -512,6 +512,8 @@ module sensors393 #(
.WADDR_WIDTH(9) .WADDR_WIDTH(9)
) sensor_membuf_i ( ) sensor_membuf_i (
.pclk (pclk), // input .pclk (pclk), // input
.prst (prst), // input
.mrst (mrst), // input
.px_data (px_data[16 * i +: 16]), // input[15:0] .px_data (px_data[16 * i +: 16]), // input[15:0]
.px_valid (px_valid[i]), // input .px_valid (px_valid[i]), // input
.last_in_line (last_in_line[i]), // input .last_in_line (last_in_line[i]), // input
......
x393_testbench02.tf
View file @ daf46a7e
...@@ -1857,7 +1857,9 @@ task setup_sensor_channel; ...@@ -1857,7 +1857,9 @@ task setup_sensor_channel;
window_height, // input [31:0] window_height; // 16 bit window_height, // input [31:0] window_height; // 16 bit
window_left, // input [31:0] window_left; window_left, // input [31:0] window_left;
window_top); // input [31:0] window_top; window_top); // input [31:0] window_top;
// Enable arbitration of sensor-to-memory controller
enable_memcntrl_en_dis(4'h8 + {2'b0,num_sensor}, 1);
TEST_TITLE = "CAMSYNC_SETUP"; TEST_TITLE = "CAMSYNC_SETUP";
$display("===================== TEST_%s =========================",TEST_TITLE); $display("===================== TEST_%s =========================",TEST_TITLE);
...@@ -1952,8 +1954,8 @@ task setup_sensor_channel; ...@@ -1952,8 +1954,8 @@ task setup_sensor_channel;
// add mode "DIRECT", "ASAP", "RELATIVE", "ABSOLUTE" and frame number // add mode "DIRECT", "ASAP", "RELATIVE", "ABSOLUTE" and frame number
19'h20000, // 0, // input [18:0] AX; 19'h20000, // 0, // input [18:0] AX;
19'h20000, // 0, // input [18:0] AY; 19'h20000, // 0, // input [18:0] AY;
0, // input [20:0] BX; 21'h180000, //0, // input [20:0] BX;
0, // input [20:0] BY; 21'h180000, //0, // input [20:0] BY;
'h8000, // input [18:0] C; 'h8000, // input [18:0] C;
32768, // input [16:0] scales0; 32768, // input [16:0] scales0;
32768, // input [16:0] scales1; 32768, // input [16:0] scales1;
...@@ -1983,8 +1985,8 @@ task setup_sensor_channel; ...@@ -1983,8 +1985,8 @@ task setup_sensor_channel;
0, // input [1:0] subchannel; // subchannel number (for multiplexed images) 0, // input [1:0] subchannel; // subchannel number (for multiplexed images)
HISTOGRAM_LEFT, // input [15:0] left; HISTOGRAM_LEFT, // input [15:0] left;
HISTOGRAM_TOP, // input [15:0] top; HISTOGRAM_TOP, // input [15:0] top;
HISTOGRAM_WIDTH-2, // input [15:0] width_m1; // one less than window width. If 0 - use frame right margin (end of HACT) HISTOGRAM_WIDTH-1, // input [15:0] width_m1; // one less than window width. If 0 - use frame right margin (end of HACT)
HISTOGRAM_HEIGHT-2); // input [15:0] height_m1; // one less than window height. If 0 - use frame bottom margin (end of VACT) HISTOGRAM_HEIGHT-1); // input [15:0] height_m1; // one less than window height. If 0 - use frame bottom margin (end of VACT)
set_sensor_histogram_saxi_addr ( set_sensor_histogram_saxi_addr (
num_sensor, // input [1:0] num_sensor; // sensor channel number (0..3) num_sensor, // input [1:0] num_sensor; // sensor channel number (0..3)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment