Skip to content

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

continue hardware debugging, fixed gamma and histograms

parent da2d549d
Show whitespace changes
Inline Side-by-side
Showing with 225 additions and 42 deletions
.project
View file @ 608bcbd9
...@@ -62,42 +62,42 @@ ...@@ -62,42 +62,42 @@
<link> <link>
<name>vivado_logs/VivadoBitstream.log</name> <name>vivado_logs/VivadoBitstream.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoBitstream-20150905203536090.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoBitstream-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoOpt.log</name> <name>vivado_logs/VivadoOpt.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoOpt-20150905202638924.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoOpt-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoOptPhys.log</name> <name>vivado_logs/VivadoOptPhys.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoOptPhys-20150905202638924.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoOptPhys-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoOptPower.log</name> <name>vivado_logs/VivadoOptPower.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoOptPower-20150905202638924.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoOptPower-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoPlace.log</name> <name>vivado_logs/VivadoPlace.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoPlace-20150905202638924.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoPlace-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoRoute.log</name> <name>vivado_logs/VivadoRoute.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoRoute-20150905202638924.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoRoute-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoSynthesis.log</name> <name>vivado_logs/VivadoSynthesis.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoSynthesis-20150905202128057.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoSynthesis-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoTimimgSummaryReportImplemented.log</name> <name>vivado_logs/VivadoTimimgSummaryReportImplemented.log</name>
<type>1</type> <type>1</type>
<location>/home/andrey/git/x393/vivado_logs/VivadoTimimgSummaryReportImplemented-20150905202638924.log</location> <location>/home/andrey/git/x393/vivado_logs/VivadoTimimgSummaryReportImplemented-20150906141832703.log</location>
</link> </link>
<link> <link>
<name>vivado_logs/VivadoTimimgSummaryReportSynthesis.log</name> <name>vivado_logs/VivadoTimimgSummaryReportSynthesis.log</name>
......
axi/cmprs_afi_mux.v
View file @ 608bcbd9
...@@ -55,6 +55,10 @@ each group of 4 bits per channel : bits [1:0] - select, bit[2] - sset (0 - nop), ...@@ -55,6 +55,10 @@ each group of 4 bits per channel : bits [1:0] - select, bit[2] - sset (0 - nop),
parameter CMPRS_AFIMUX_WIDTH = 26, // maximal for status: currently only works with 26) parameter CMPRS_AFIMUX_WIDTH = 26, // maximal for status: currently only works with 26)
parameter CMPRS_AFIMUX_CYCBITS = 3, parameter CMPRS_AFIMUX_CYCBITS = 3,
parameter AFI_MUX_BUF_LATENCY = 4'd2 // buffers read latency from fifo_ren* to fifo_rdata* valid : 2 if no register layers are used parameter AFI_MUX_BUF_LATENCY = 4'd2 // buffers read latency from fifo_ren* to fifo_rdata* valid : 2 if no register layers are used
`ifdef DEBUG_RING
,parameter DEBUG_CMD_LATENCY = 2
`endif
)( )(
// input rst, // input rst,
input mclk, // for command/status input mclk, // for command/status
...@@ -137,7 +141,15 @@ each group of 4 bits per channel : bits [1:0] - select, bit[2] - sset (0 - nop), ...@@ -137,7 +141,15 @@ each group of 4 bits per channel : bits [1:0] - select, bit[2] - sset (0 - nop),
input [ 7:0] afi_wcount, input [ 7:0] afi_wcount,
input [ 5:0] afi_wacount, input [ 5:0] afi_wacount,
output afi_wrissuecap1en output afi_wrissuecap1en
`ifdef DEBUG_RING
,output debug_do, // output to the debug ring
input debug_sl, // 0 - idle, (1,0) - shift, (1,1) - load // SuppressThisWarning VEditor - not used
input debug_di // input from the debug ring
`endif
); );
//`ifdef DEBUG_RING
// assign debug_do = debug_di; // just temporarily to short-circuit the ring
//`endif
reg en; // enable mux reg en; // enable mux
reg en_d; // or use it to reset all channels? reg en_d; // or use it to reset all channels?
reg [3:0] en_chn; // per-channel enable reg [3:0] en_chn; // per-channel enable
...@@ -262,7 +274,26 @@ each group of 4 bits per channel : bits [1:0] - select, bit[2] - sset (0 - nop), ...@@ -262,7 +274,26 @@ each group of 4 bits per channel : bits [1:0] - select, bit[2] - sset (0 - nop),
assign afi_awqos = 4'h0; assign afi_awqos = 4'h0;
assign afi_wstrb = 8'hff; assign afi_wstrb = 8'hff;
assign afi_wrissuecap1en = 1'b0; assign afi_wrissuecap1en = 1'b0;
`ifdef DEBUG_RING
debug_slave #(
.SHIFT_WIDTH (32),
.READ_WIDTH (32),
.WRITE_WIDTH (32),
.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
) debug_slave_i (
.mclk (mclk), // input
.mrst (mrst), // input
.debug_di (debug_di), // input
.debug_sl (debug_sl), // input
.debug_do (debug_do), // output
.rd_data ({
32'b0
}), // input[31:0]
.wr_data (), // output[31:0] - not used
.stb () // output - not used
);
`endif
always @ (posedge mclk) begin always @ (posedge mclk) begin
if (cmd_we_sa_len_w) begin if (cmd_we_sa_len_w) begin
sa_len_d <= cmd_data[26:0]; sa_len_d <= cmd_data[26:0];
......
axi/histogram_saxi.v
View file @ 608bcbd9
...@@ -36,6 +36,9 @@ module histogram_saxi#( ...@@ -36,6 +36,9 @@ module histogram_saxi#(
parameter HIST_SAXI_MODE_ADDR_MASK = 'h7ff, parameter HIST_SAXI_MODE_ADDR_MASK = 'h7ff,
// parameter HIST_SAXI_STATUS_REG = 'h34, // parameter HIST_SAXI_STATUS_REG = 'h34,
parameter NUM_FRAME_BITS = 4 // number of bits use for frame number parameter NUM_FRAME_BITS = 4 // number of bits use for frame number
`ifdef DEBUG_RING
,parameter DEBUG_CMD_LATENCY = 2
`endif
)( )(
// input rst, // input rst,
input mclk, // for command/status input mclk, // for command/status
...@@ -103,15 +106,26 @@ module histogram_saxi#( ...@@ -103,15 +106,26 @@ module histogram_saxi#(
output saxi_bready, // AXI PS Slave GP0 BREADY, input output saxi_bready, // AXI PS Slave GP0 BREADY, input
input [ 5:0] saxi_bid, // AXI PS Slave GP0 BID[5:0], output //TODO: Update range !!! // @SuppressThisWarning VEditor unused input [ 5:0] saxi_bid, // AXI PS Slave GP0 BID[5:0], output //TODO: Update range !!! // @SuppressThisWarning VEditor unused
input [ 1:0] saxi_bresp // AXI PS Slave GP0 BRESP[1:0], output // @SuppressThisWarning VEditor unused input [ 1:0] saxi_bresp // AXI PS Slave GP0 BRESP[1:0], output // @SuppressThisWarning VEditor unused
`ifdef DEBUG_RING
,output debug_do, // output to the debug ring
input debug_sl, // 0 - idle, (1,0) - shift, (1,1) - load
input debug_di // input from the debug ring
`endif
); );
/*
`ifdef DEBUG_RING
localparam DEBUG_RING_LENGTH = 1; // for now - just connect the histogram(s) module(s)
wire [DEBUG_RING_LENGTH:0] debug_ring; // TODO: adjust number of bits
assign debug_do = debug_ring[0];
assign debug_ring[DEBUG_RING_LENGTH] = debug_di;
`endif
*/
localparam ATTRIB_WIDTH = NUM_FRAME_BITS + 4 +2; localparam ATTRIB_WIDTH = NUM_FRAME_BITS + 4 +2;
reg [HIST_SAXI_MODE_WIDTH-1:0] mode; reg [HIST_SAXI_MODE_WIDTH-1:0] mode;
wire en = mode[HIST_SAXI_EN] & mode[HIST_SAXI_NRESET]; wire en = mode[HIST_SAXI_EN] & mode[HIST_SAXI_NRESET];
reg [3:0] awcache_mode; reg [3:0] awcache_mode;
reg confirm_write; reg confirm_write;
// wire nreset = mode[HIST_SAXI_NRESET]; wire nreset = mode[HIST_SAXI_NRESET];
wire we_mode; wire we_mode;
wire we_addr; wire we_addr;
wire [31:0] cmd_data; wire [31:0] cmd_data;
...@@ -154,6 +168,8 @@ module histogram_saxi#( ...@@ -154,6 +168,8 @@ module histogram_saxi#(
wire page_sent_aclk; // page sent over saxi wire page_sent_aclk; // page sent over saxi
reg preen_aclk; reg preen_aclk;
reg en_aclk; reg en_aclk;
reg prenreset_aclk;
reg nreset_aclk;
wire page_written_aclk; wire page_written_aclk;
reg [2:0] pages_in_buf_rd; // pages in buffer (as seen from read side), 0..4 reg [2:0] pages_in_buf_rd; // pages in buffer (as seen from read side), 0..4
reg [1:0] page_rd; // page number being read reg [1:0] page_rd; // page number being read
...@@ -188,6 +204,71 @@ module histogram_saxi#( ...@@ -188,6 +204,71 @@ module histogram_saxi#(
// reg [9:0] buf_raddr; // nuffer read address {page[1:0], addr [7:0]} // reg [9:0] buf_raddr; // nuffer read address {page[1:0], addr [7:0]}
`ifdef DEBUG_RING
reg [7:0] extra_wa;
reg [7:0] extra_ra;
reg [15:0] num_addr_saxi;
reg [15:0] num_data_saxi;
always @ (posedge mclk) begin
if (!en) extra_wa <= 0;
else if (burst_done_w) extra_wa <= extra_wa + 1;
end
always @ (posedge aclk) begin
if (!en_aclk) extra_ra <= 0;
else if (page_sent_aclk) extra_ra <= extra_ra + 1;
if (!nreset_aclk) num_addr_saxi <= 0;
else if (saxi_awvalid && saxi_awready) num_addr_saxi <= num_addr_saxi + 1;
if (!nreset_aclk) num_data_saxi <= 0;
else if (saxi_wvalid && saxi_wready) num_data_saxi <= num_data_saxi + 1;
end
debug_slave #(
.SHIFT_WIDTH (160),
.READ_WIDTH (160),
.WRITE_WIDTH (32),
.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
) debug_slave_i (
.mclk (mclk), // input
.mrst (mrst), // input
.debug_di (debug_di), // input
.debug_sl (debug_sl), // input
.debug_do (debug_do), // output
.rd_data ({
num_addr_saxi,
num_data_saxi,
extra_wa[7:0],page_wa[7:0],
extra_ra[7:0],page_ra[7:0],
// 16'b0,
3'b0,num_bursts_in_buf,
3'b0,num_bursts_pending,
page_wr[1:0],page_rd[1:0],3'b0, saxi_wlast,
saxi_wready, saxi_wvalid, saxi_wid[5:0],
6'b0,saxi_awready,saxi_awvalid,
saxi_awlock[1:0], saxi_awid[5:0],
saxi_awcache[3:0], 1'b0,saxi_awprot[2:0],
saxi_awlen[3:0], saxi_awburst[1:0], saxi_awsize[1:0],
2'b0 ,hist_chn0[1:0],frame0[3:0],
chn_grant[3:0],
1'b0, busy_w, busy_r, started,
1'b0, burst[2:0], 1'b0,pages_in_buf_wr[2:0],
start_w, enc_rq[2:0], pri_rq[3:0]
}), // input[31:0]
.wr_data (), // output[31:0] - not used
.stb () // output - not used
);
`endif
assign pri_rq = {hist_request3 & ~hist_request2 & ~hist_request1 & ~hist_request0, assign pri_rq = {hist_request3 & ~hist_request2 & ~hist_request1 & ~hist_request0,
hist_request2 & ~hist_request1 & ~ hist_request0, hist_request2 & ~hist_request1 & ~ hist_request0,
...@@ -207,7 +288,7 @@ module histogram_saxi#( ...@@ -207,7 +288,7 @@ module histogram_saxi#(
assign hist_grant2 = chn_grant[2]; assign hist_grant2 = chn_grant[2];
assign hist_grant3 = chn_grant[3]; assign hist_grant3 = chn_grant[3];
assign block_start_w = !(|block_run[2:0]) && !buf_empty; assign block_start_w = !(|block_run[2:0]) && !buf_empty && en_aclk ; // make it finish all started transactions
assign attrib_chn = attrib_r[NUM_FRAME_BITS+2+:4]; assign attrib_chn = attrib_r[NUM_FRAME_BITS+2+:4];
assign attrib_frame = attrib_r[2+:NUM_FRAME_BITS]; assign attrib_frame = attrib_r[2+:NUM_FRAME_BITS];
...@@ -272,7 +353,8 @@ module histogram_saxi#( ...@@ -272,7 +353,8 @@ module histogram_saxi#(
if (start_w) mux_sel <= enc_rq[1:0]; if (start_w) mux_sel <= enc_rq[1:0];
dav_r <= dav; if (!en) dav_r <= 0;
else dav_r <= dav;
din_r <= din; din_r <= din;
sub_chn_r <=sub_chn_w; sub_chn_r <=sub_chn_w;
...@@ -306,7 +388,10 @@ module histogram_saxi#( ...@@ -306,7 +388,10 @@ module histogram_saxi#(
// Buffer read, SAXI send logic // Buffer read, SAXI send logic
always @(posedge aclk) begin always @(posedge aclk) begin
preen_aclk <= en; preen_aclk <= en;
en_aclk <= preen_aclk; en_aclk <= preen_aclk && en;
prenreset_aclk <= nreset;
nreset_aclk <= prenreset_aclk && nreset;
if (!en_aclk) page_rd <= 0; if (!en_aclk) page_rd <= 0;
else if (page_sent_aclk) page_rd <= page_rd + 1; else if (page_sent_aclk) page_rd <= page_rd + 1;
...@@ -321,10 +406,10 @@ module histogram_saxi#( ...@@ -321,10 +406,10 @@ module histogram_saxi#(
else if ( page_written_aclk && !page_sent_aclk) pages_in_buf_rd <= pages_in_buf_rd + 1; else if ( page_written_aclk && !page_sent_aclk) pages_in_buf_rd <= pages_in_buf_rd + 1;
else if (!page_written_aclk && page_sent_aclk) pages_in_buf_rd <= pages_in_buf_rd - 1; else if (!page_written_aclk && page_sent_aclk) pages_in_buf_rd <= pages_in_buf_rd - 1;
if (!en_aclk) block_run <= 0; if (!nreset_aclk) block_run <= 0;
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 (!nreset_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}; else block_start_r <= {block_start_r[2:0], block_start_w};
...@@ -337,9 +422,9 @@ module histogram_saxi#( ...@@ -337,9 +422,9 @@ module histogram_saxi#(
if (arst || 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 (!nreset_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
else if (saxi_start_burst_w) first_burst <=0; else if (saxi_start_burst_w) first_burst <= 0;
if (block_start_r[0]) awcache_mode <= mode[HIST_SAXI_AWCACHE+:4]; if (block_start_r[0]) awcache_mode <= mode[HIST_SAXI_AWCACHE+:4];
if (block_start_r[0]) confirm_write <= mode[HIST_CONFIRM_WRITE]; if (block_start_r[0]) confirm_write <= mode[HIST_CONFIRM_WRITE];
...@@ -349,7 +434,7 @@ module histogram_saxi#( ...@@ -349,7 +434,7 @@ module histogram_saxi#(
saxi_bvalid_r <=saxi_bvalid; saxi_bvalid_r <=saxi_bvalid;
buf_re <= {buf_re[1:0],buf_re_w}; buf_re <= {buf_re[1:0],buf_re_w};
if (!en_aclk) wburst_cntr <= 0; if (!nreset_aclk) wburst_cntr <= 0;
else if (fifo_re) wburst_cntr <= wburst_cntr +1; else if (fifo_re) wburst_cntr <= wburst_cntr +1;
if (block_start_r[0]) num_bursts_in_buf <= 5'h10; // change [2]? if (block_start_r[0]) num_bursts_in_buf <= 5'h10; // change [2]?
......
compressor_jp/compressor393.v
View file @ 608bcbd9
...@@ -243,7 +243,7 @@ module compressor393 # ( ...@@ -243,7 +243,7 @@ module compressor393 # (
); );
`ifdef DEBUG_RING `ifdef DEBUG_RING
localparam DEBUG_RING_LENGTH = 4; localparam DEBUG_RING_LENGTH = 5 + ((CMPRS_NUM_AFI_CHN > 1)?1:0);
wire [DEBUG_RING_LENGTH:0] debug_ring; // TODO: adjust number of bits wire [DEBUG_RING_LENGTH:0] debug_ring; // TODO: adjust number of bits
assign debug_do = debug_ring[0]; assign debug_do = debug_ring[0];
assign debug_ring[DEBUG_RING_LENGTH] = debug_di; assign debug_ring[DEBUG_RING_LENGTH] = debug_di;
...@@ -451,6 +451,10 @@ module compressor393 # ( ...@@ -451,6 +451,10 @@ module compressor393 # (
.CMPRS_AFIMUX_WIDTH (CMPRS_AFIMUX_WIDTH), .CMPRS_AFIMUX_WIDTH (CMPRS_AFIMUX_WIDTH),
.CMPRS_AFIMUX_CYCBITS (CMPRS_AFIMUX_CYCBITS), .CMPRS_AFIMUX_CYCBITS (CMPRS_AFIMUX_CYCBITS),
.AFI_MUX_BUF_LATENCY (AFI_MUX_BUF_LATENCY) .AFI_MUX_BUF_LATENCY (AFI_MUX_BUF_LATENCY)
`ifdef DEBUG_RING
,.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
`endif
) cmprs_afi0_mux_i ( ) cmprs_afi0_mux_i (
// .rst (rst), // input // .rst (rst), // input
.mclk (mclk), // input .mclk (mclk), // input
...@@ -516,6 +520,12 @@ module compressor393 # ( ...@@ -516,6 +520,12 @@ module compressor393 # (
.afi_wcount (afi0_wcount), // input[7:0] .afi_wcount (afi0_wcount), // input[7:0]
.afi_wacount (afi0_wacount), // input[5:0] .afi_wacount (afi0_wacount), // input[5:0]
.afi_wrissuecap1en(afi0_wrissuecap1en) // output .afi_wrissuecap1en(afi0_wrissuecap1en) // output
`ifdef DEBUG_RING
,.debug_do (debug_ring[4]), // output
.debug_sl (debug_sl), // input
.debug_di (debug_ring[5]) // input
`endif
); );
cmprs_afi_mux #( cmprs_afi_mux #(
...@@ -530,6 +540,9 @@ module compressor393 # ( ...@@ -530,6 +540,9 @@ module compressor393 # (
.CMPRS_AFIMUX_WIDTH (CMPRS_AFIMUX_WIDTH), .CMPRS_AFIMUX_WIDTH (CMPRS_AFIMUX_WIDTH),
.CMPRS_AFIMUX_CYCBITS (CMPRS_AFIMUX_CYCBITS), .CMPRS_AFIMUX_CYCBITS (CMPRS_AFIMUX_CYCBITS),
.AFI_MUX_BUF_LATENCY (AFI_MUX_BUF_LATENCY) .AFI_MUX_BUF_LATENCY (AFI_MUX_BUF_LATENCY)
`ifdef DEBUG_RING
,.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
`endif
) cmprs_afi1_mux_i ( ) cmprs_afi1_mux_i (
// .rst (rst), // input // .rst (rst), // input
.mclk (mclk), // input .mclk (mclk), // input
...@@ -593,6 +606,11 @@ module compressor393 # ( ...@@ -593,6 +606,11 @@ module compressor393 # (
.afi_wcount (afi1_wcount), // input[7:0] .afi_wcount (afi1_wcount), // input[7:0]
.afi_wacount (afi1_wacount), // input[5:0] .afi_wacount (afi1_wacount), // input[5:0]
.afi_wrissuecap1en(afi1_wrissuecap1en) // output .afi_wrissuecap1en(afi1_wrissuecap1en) // output
`ifdef DEBUG_RING
,.debug_do (debug_ring[5]), // output
.debug_sl (debug_sl), // input
.debug_di (debug_ring[DEBUG_RING_LENGTH]) // input
`endif
); );
end else begin end else begin
cmprs_afi_mux #( cmprs_afi_mux #(
...@@ -607,6 +625,9 @@ module compressor393 # ( ...@@ -607,6 +625,9 @@ module compressor393 # (
.CMPRS_AFIMUX_WIDTH (CMPRS_AFIMUX_WIDTH), .CMPRS_AFIMUX_WIDTH (CMPRS_AFIMUX_WIDTH),
.CMPRS_AFIMUX_CYCBITS (CMPRS_AFIMUX_CYCBITS), .CMPRS_AFIMUX_CYCBITS (CMPRS_AFIMUX_CYCBITS),
.AFI_MUX_BUF_LATENCY (AFI_MUX_BUF_LATENCY) .AFI_MUX_BUF_LATENCY (AFI_MUX_BUF_LATENCY)
`ifdef DEBUG_RING
,.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
`endif
) cmprs_afi0_mux_i ( ) cmprs_afi0_mux_i (
// .rst (rst), // input // .rst (rst), // input
.mclk (mclk), // input .mclk (mclk), // input
...@@ -670,6 +691,11 @@ module compressor393 # ( ...@@ -670,6 +691,11 @@ module compressor393 # (
.afi_wcount (afi0_wcount), // input[7:0] .afi_wcount (afi0_wcount), // input[7:0]
.afi_wacount (afi0_wacount), // input[5:0] .afi_wacount (afi0_wacount), // input[5:0]
.afi_wrissuecap1en(afi0_wrissuecap1en) // output .afi_wrissuecap1en(afi0_wrissuecap1en) // output
`ifdef DEBUG_RING
,.debug_do (debug_ring[4]), // output
.debug_sl (debug_sl), // input
.debug_di (debug_ring[5]) // input
`endif
); );
assign afi1_awaddr = 0; assign afi1_awaddr = 0;
assign afi1_awvalid = 0; assign afi1_awvalid = 0;
......
compressor_jp/jp_channel.v
View file @ 608bcbd9
...@@ -179,9 +179,9 @@ module jp_channel#( ...@@ -179,9 +179,9 @@ module jp_channel#(
input debug_di // input from the debug ring input debug_di // input from the debug ring
`endif `endif
); );
`ifdef DEBUG_RING //`ifdef DEBUG_RING
assign debug_do = debug_di; // just temporarily to short-circuit the ring // assign debug_do = debug_di; // just temporarily to short-circuit the ring
`endif //`endif
localparam CMPRS_ADDR = CMPRS_GROUP_ADDR + CMPRS_NUMBER * CMPRS_BASE_INC; localparam CMPRS_ADDR = CMPRS_GROUP_ADDR + CMPRS_NUMBER * CMPRS_BASE_INC;
localparam CMPRS_STATUS_REG_ADDR = CMPRS_STATUS_REG_BASE + CMPRS_NUMBER * CMPRS_STATUS_REG_INC; localparam CMPRS_STATUS_REG_ADDR = CMPRS_STATUS_REG_BASE + CMPRS_NUMBER * CMPRS_STATUS_REG_INC;
...@@ -343,6 +343,27 @@ module jp_channel#( ...@@ -343,6 +343,27 @@ module jp_channel#(
// assign buf_ren = buf_rd[0]; // assign buf_ren = buf_rd[0];
// assign buf_regen = buf_rd[1]; // assign buf_regen = buf_rd[1];
`ifdef DEBUG_RING
debug_slave #(
.SHIFT_WIDTH (32),
.READ_WIDTH (32),
.WRITE_WIDTH (32),
.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
) debug_slave_i (
.mclk (mclk), // input
.mrst (mrst), // input
.debug_di (debug_di), // input
.debug_sl (debug_sl), // input
.debug_do (debug_do), // output
.rd_data ({
32'b0
}), // input[31:0]
.wr_data (), // output[31:0] - not used
.stb () // output - not used
);
`endif
cmd_deser #( cmd_deser #(
.ADDR (CMPRS_ADDR), .ADDR (CMPRS_ADDR),
.ADDR_MASK (CMPRS_MASK), .ADDR_MASK (CMPRS_MASK),
......
fpga_version.vh
View file @ 608bcbd9
parameter FPGA_VERSION = 32'h03930016; parameter FPGA_VERSION = 32'h0393001d;
\ No newline at end of file \ No newline at end of file
py393/x393_sens_cmprs.py
View file @ 608bcbd9
...@@ -116,7 +116,7 @@ class X393SensCmprs(object): ...@@ -116,7 +116,7 @@ class X393SensCmprs(object):
return BUFFER_ADDRESS return BUFFER_ADDRESS
def get_circbuf_byte_start(self): # should be 4KB page aligned def get_circbuf_byte_start(self): # should be 4KB page aligned
global BUFFER_ADDRESS global BUFFER_ADDRESS
return BUFFER_ADDRESS + 16 * 4096 return BUFFER_ADDRESS + 4096* (1 << vrlg.NUM_FRAME_BITS)* 16 # 16 subchannels
def get_circbuf_byte_end(self): # should be 4KB page aligned def get_circbuf_byte_end(self): # should be 4KB page aligned
global BUFFER_ADDRESS, BUFFER_LEN global BUFFER_ADDRESS, BUFFER_LEN
return BUFFER_ADDRESS + BUFFER_LEN return BUFFER_ADDRESS + BUFFER_LEN
...@@ -375,7 +375,7 @@ class X393SensCmprs(object): ...@@ -375,7 +375,7 @@ class X393SensCmprs(object):
AY = 0, # 0x20000 AY = 0, # 0x20000
BX = 0, # 0x180000 BX = 0, # 0x180000
BY = 0, # 0x180000 BY = 0, # 0x180000
C = 0, # 0x8000 C = 0x8000,
scales0 = 0x8000, scales0 = 0x8000,
scales1 = 0x8000, scales1 = 0x8000,
scales2 = 0x8000, scales2 = 0x8000,
...@@ -406,12 +406,12 @@ class X393SensCmprs(object): ...@@ -406,12 +406,12 @@ class X393SensCmprs(object):
self.x393Sensor.set_sensor_histogram_saxi_addr ( self.x393Sensor.set_sensor_histogram_saxi_addr (
num_sensor = num_sensor, num_sensor = num_sensor,
subchannel = 0, subchannel = 0,
page = histogram_start_phys_page) page = histogram_start_phys_page) # for the channel/subchannel = 0/0
self.x393Sensor.set_sensor_histogram_saxi ( self.x393Sensor.set_sensor_histogram_saxi (
en = True, en = True,
nrst = True, nrst = True,
confirm_write = True, confirm_write = False, # True,
cache_mode = 3) cache_mode = 3)
if exit_step == 18: return False if exit_step == 18: return False
......
py393/x393_sensor.py
View file @ 608bcbd9
...@@ -770,8 +770,11 @@ class X393Sensor(object): ...@@ -770,8 +770,11 @@ class X393Sensor(object):
print("num_sensor = ", num_sensor) print("num_sensor = ", num_sensor)
print("subchannel = ", subchannel) print("subchannel = ", subchannel)
print("page = ", page) print("page = ", page)
num_histogram_frames = 1 << vrlg.NUM_FRAME_BITS
channel = ((num_sensor & 3) << 2) + (subchannel & 3) channel = ((num_sensor & 3) << 2) + (subchannel & 3)
self.x393_axi_tasks.write_control_register(vrlg.SENSOR_GROUP_ADDR + vrlg.HIST_SAXI_ADDR_REL + channel,page) channel_page = page + num_histogram_frames * channel
self.x393_axi_tasks.write_control_register(vrlg.SENSOR_GROUP_ADDR + vrlg.HIST_SAXI_ADDR_REL + channel,
channel_page)
def setup_sensor_memory (self, def setup_sensor_memory (self,
num_sensor, num_sensor,
......
sensor/sens_histogram.v
View file @ 608bcbd9
...@@ -482,7 +482,7 @@ module sens_histogram #( ...@@ -482,7 +482,7 @@ module sens_histogram #(
// 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
generate generate
if (HISTOGRAM_RAM_MODE=="BUF18") if (HISTOGRAM_RAM_MODE=="BUF32")
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]
...@@ -497,7 +497,7 @@ module sens_histogram #( ...@@ -497,7 +497,7 @@ module sens_histogram #(
.re_b (hist_re[0]), // input .re_b (hist_re[0]), // input
.regen_b (hist_re[1]) // input .regen_b (hist_re[1]) // input
); );
else if (HISTOGRAM_RAM_MODE=="BUF32") else if (HISTOGRAM_RAM_MODE=="BUF18")
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]
......
sensor/sensor_channel.v
View file @ 608bcbd9
...@@ -394,8 +394,8 @@ module sensor_channel#( ...@@ -394,8 +394,8 @@ module sensor_channel#(
end end
debug_slave #( debug_slave #(
.SHIFT_WIDTH (64), .SHIFT_WIDTH (128),
.READ_WIDTH (64), .READ_WIDTH (128),
.WRITE_WIDTH (32), .WRITE_WIDTH (32),
.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY) .DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
) debug_slave_i ( ) debug_slave_i (
...@@ -405,7 +405,14 @@ module sensor_channel#( ...@@ -405,7 +405,14 @@ module sensor_channel#(
.debug_sl (debug_sl), // input .debug_sl (debug_sl), // input
.debug_do (debug_ring[4]), // output .debug_do (debug_ring[4]), // output
// .rd_data ({height_m1[15:0], vcntr[15:0], width_m1[15:0], hcntr[15:0]}), // input[31:0] // .rd_data ({height_m1[15:0], vcntr[15:0], width_m1[15:0], hcntr[15:0]}), // input[31:0]
.rd_data ({vact_cntr[15:0], hact_cntr[15:0], debug_lines[15:0], debug_line_cntr[15:0]}), // input[31:0] // .rd_data ({vact_cntr[15:0], hact_cntr[15:0], debug_lines[15:0], debug_line_cntr[15:0]}), // input[31:0]
// .rd_data ({6'b0,hist_grant,hist_request, hist_gr[3:0], hist_rq[3:0], hact_cntr[15:0], debug_lines[15:0], debug_line_cntr[15:0]}), // input[31:0]
.rd_data ({
lens_pxd_in, gamma_pxd_in[15:0],
pxd_to_fifo[11:0],pxd[11:0],gamma_pxd_out[7:0],
6'b0,hist_grant,hist_request, hist_gr[3:0], hist_rq[3:0], hact_cntr[15:0],
debug_lines[15:0], debug_line_cntr[15:0]}), // input[31:0]
//debug_lines <= debug_line_cntr //debug_lines <= debug_line_cntr
.wr_data (), // output[31:0] - not used .wr_data (), // output[31:0] - not used
.stb () // output - not used .stb () // output - not used
...@@ -543,7 +550,8 @@ module sensor_channel#( ...@@ -543,7 +550,8 @@ module sensor_channel#(
end end
always @ (posedge mclk) begin always @ (posedge mclk) begin
hist_rq0_r <= en_mclk & (hist_rq[0] ^ hist_rq0_r); // hist_rq0_r <= en_mclk & (hist_rq[0] ^ hist_rq0_r);
hist_rq0_r <= hist_rq[0];
hist_gr0_r <= hist_gr[0]; hist_gr0_r <= hist_gr[0];
end end
......
sensor/sensors393.v
View file @ 608bcbd9
...@@ -316,7 +316,7 @@ module sensors393 #( ...@@ -316,7 +316,7 @@ module sensors393 #(
); );
`ifdef DEBUG_RING `ifdef DEBUG_RING
localparam DEBUG_RING_LENGTH = 4; localparam DEBUG_RING_LENGTH = 5;
wire [DEBUG_RING_LENGTH:0] debug_ring; // TODO: adjust number of bits wire [DEBUG_RING_LENGTH:0] debug_ring; // TODO: adjust number of bits
assign debug_do = debug_ring[0]; assign debug_do = debug_ring[0];
assign debug_ring[DEBUG_RING_LENGTH] = debug_di; assign debug_ring[DEBUG_RING_LENGTH] = debug_di;
...@@ -563,6 +563,9 @@ module sensors393 #( ...@@ -563,6 +563,9 @@ module sensors393 #(
.HIST_SAXI_AWCACHE (HIST_SAXI_AWCACHE), .HIST_SAXI_AWCACHE (HIST_SAXI_AWCACHE),
.HIST_SAXI_MODE_ADDR_MASK (HIST_SAXI_MODE_ADDR_MASK), .HIST_SAXI_MODE_ADDR_MASK (HIST_SAXI_MODE_ADDR_MASK),
.NUM_FRAME_BITS (NUM_FRAME_BITS) .NUM_FRAME_BITS (NUM_FRAME_BITS)
`ifdef DEBUG_RING
,.DEBUG_CMD_LATENCY (DEBUG_CMD_LATENCY)
`endif
) histogram_saxi_i ( ) histogram_saxi_i (
// .rst (rst), // input // .rst (rst), // input
.mclk (mclk), // input .mclk (mclk), // input
...@@ -616,6 +619,11 @@ module sensors393 #( ...@@ -616,6 +619,11 @@ module sensors393 #(
.saxi_bready (saxi_bready), // output .saxi_bready (saxi_bready), // output
.saxi_bid (saxi_bid), // input[5:0] .saxi_bid (saxi_bid), // input[5:0]
.saxi_bresp (saxi_bresp) // input[1:0] .saxi_bresp (saxi_bresp) // input[1:0]
`ifdef DEBUG_RING
,.debug_do (debug_ring[4]), // output
.debug_sl (debug_sl), // input
.debug_di (debug_ring[5]) // input
`endif
); );
status_router4 status_router4_i ( status_router4 status_router4_i (
......
util_modules/cmd_frame_sequencer.v
View file @ 608bcbd9
...@@ -134,7 +134,8 @@ module cmd_frame_sequencer#( ...@@ -134,7 +134,8 @@ module cmd_frame_sequencer#(
// assign pre_wpage_inc = (!cmd_we && !(|cmd_we_r) ) && (!wpage_inc[0] && !wpage_inc[1]) && ((next_frame_rq && initialized) || reset_on) ; // assign pre_wpage_inc = (!cmd_we && !(|cmd_we_r) ) && (!wpage_inc[0] && !wpage_inc[1]) && ((next_frame_rq && initialized) || reset_on) ;
// During reset_on write pointer every cycle: // During reset_on write pointer every cycle:
assign pre_wpage_inc = (!cmd_we && !(|cmd_we_r) ) && ((next_frame_rq && initialized) || reset_on) ; // assign pre_wpage_inc = (!cmd_we && !(|cmd_we_r) ) && ((next_frame_rq && initialized) || reset_on) ;
assign pre_wpage_inc = (!cmd_we && !(|cmd_we_r) ) && ((next_frame_rq && !wpage_inc[0] && initialized) || reset_on) ;
assign commands_pending = rpointer != fifo_wr_pointers_outr_r; // only look at the current page different pages will trigger page increment first assign commands_pending = rpointer != fifo_wr_pointers_outr_r; // only look at the current page different pages will trigger page increment first
assign pre_cmd_seq_w = commands_pending & ~(|page_r_inc) & seq_enrun; assign pre_cmd_seq_w = commands_pending & ~(|page_r_inc) & seq_enrun;
assign valid = valid_r; assign valid = valid_r;
......
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