Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
x393
Commits
4b42ed42
Commit
4b42ed42
authored
Nov 10, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more fixing jpeg tail
parent
bd5fb565
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
18 deletions
+24
-18
x393_cocotb_03.sav
cocotb/x393_cocotb_03.sav
+10
-10
x393_dut.v
cocotb/x393_dut.v
+7
-2
bit_stuffer_27_32.v
compressor_jp/bit_stuffer_27_32.v
+3
-3
fpga_version.vh
fpga_version.vh
+2
-1
x393_simulation_parameters.vh
includes/x393_simulation_parameters.vh
+2
-2
x393_parallel.bit
x393_parallel.bit
+0
-0
No files found.
cocotb/x393_cocotb_03.sav
View file @
4b42ed42
[*]
[*]
[*] GTKWave Analyzer v3.3.66 (w)1999-2015 BSI
[*] GTKWave Analyzer v3.3.66 (w)1999-2015 BSI
[*] Thu Nov 10
19:05:29
2016
[*] Thu Nov 10
22:29:46
2016
[*]
[*]
[dumpfile] "/home/eyesis/git/x393-neon/simulation/x393_dut-201611101
14854506
.fst"
[dumpfile] "/home/eyesis/git/x393-neon/simulation/x393_dut-201611101
50532005
.fst"
[dumpfile_mtime] "Thu Nov 10
19:05:03
2016"
[dumpfile_mtime] "Thu Nov 10
22:29:04
2016"
[dumpfile_size]
49333165
[dumpfile_size]
118798882
[savefile] "/home/eyesis/git/x393-neon/cocotb/x393_cocotb_03.sav"
[savefile] "/home/eyesis/git/x393-neon/cocotb/x393_cocotb_03.sav"
[timestart] 11
438348
0
[timestart] 11
533360
0
[size] 1814 1171
[size] 1814 1171
[pos] 0 0
[pos] 0 0
*-14.
266726 11444901
0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
*-14.
676100 11545990
0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
[treeopen] x393_dut.
[treeopen] x393_dut.
[treeopen] x393_dut.simul_sensor12bits_2_i.
[treeopen] x393_dut.simul_sensor12bits_2_i.
[treeopen] x393_dut.simul_sensor12bits_3_i.
[treeopen] x393_dut.simul_sensor12bits_3_i.
...
@@ -48,8 +48,8 @@
...
@@ -48,8 +48,8 @@
[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[3].sensor_channel_i.sens_parallel12_i.
[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[3].sensor_channel_i.sens_parallel12_i.
[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[3].sensor_channel_i.sens_sync_i.
[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[3].sensor_channel_i.sens_sync_i.
[treeopen] x393_dut.x393_i.timing393_i.camsync393_i.
[treeopen] x393_dut.x393_i.timing393_i.camsync393_i.
[sst_width] 2
94
[sst_width] 2
30
[signals_width] 3
19
[signals_width] 3
61
[sst_expanded] 1
[sst_expanded] 1
[sst_vpaned_height] 486
[sst_vpaned_height] 486
@820
@820
...
@@ -2079,10 +2079,10 @@ x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuf
...
@@ -2079,10 +2079,10 @@ x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuf
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.dv
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.dv
@22
@22
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.pre_bits_out_w[4:0]
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.pre_bits_out_w[4:0]
@23
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.early_length[5:0]
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.early_length[5:0]
@2
2
@2
3
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.dlen1[5:0]
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.dlen1[5:0]
@22
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.dlen2[5:0]
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.dlen2[5:0]
@800028
@800028
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.stage[1:0]
x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.stage[1:0]
...
...
cocotb/x393_dut.v
View file @
4b42ed42
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
*/
*/
`timescale
1
ns
/
1
ps
`timescale
1
ns
/
1
ps
`define
COCOTB
`define
COCOTB
//`define DISABLE_SENSOR_2
`include
"system_defines.vh"
`include
"system_defines.vh"
module
x393_dut
#(
module
x393_dut
#(
`include
"includes/x393_parameters.vh"
// SuppressThisWarning VEditor - not used
`include
"includes/x393_parameters.vh"
// SuppressThisWarning VEditor - not used
...
@@ -1613,7 +1614,11 @@ simul_axi_hp_wr #(
...
@@ -1613,7 +1614,11 @@ simul_axi_hp_wr #(
.
new_bayer
(
0
)
//SENSOR12BITS_NEW_BAYER) was 1
.
new_bayer
(
0
)
//SENSOR12BITS_NEW_BAYER) was 1
)
simul_sensor12bits_2_i
(
)
simul_sensor12bits_2_i
(
.
MCLK
(
PX2_MCLK
)
,
// input
.
MCLK
(
PX2_MCLK
)
,
// input
`ifdef
DISABLE_SENSOR_2
.
MRST
(
PX2_MRST
&
0
)
,
// input // force reset !!!
.
MRST
(
PX2_MRST
&
0
)
,
// input // force reset !!!
`else
.
MRST
(
PX2_MRST
)
,
// input // force reset !!!
`endif
.
ARO
(
PX2_ARO
)
,
// input
.
ARO
(
PX2_ARO
)
,
// input
.
ARST
(
PX2_ARST
)
,
// input
.
ARST
(
PX2_ARST
)
,
// input
.
OE
(
1'b0
)
,
// input output enable active low
.
OE
(
1'b0
)
,
// input output enable active low
...
...
compressor_jp/bit_stuffer_27_32.v
View file @
4b42ed42
...
@@ -91,8 +91,7 @@ module bit_stuffer_27_32#(
...
@@ -91,8 +91,7 @@ module bit_stuffer_27_32#(
// else if (ds) dlen1 <= early_length; // previous value
// else if (ds) dlen1 <= early_length; // previous value
else
if
(
ds
||
flush_in
)
dlen1
<=
early_length
;
// previous value
else
if
(
ds
||
flush_in
)
dlen1
<=
early_length
;
// previous value
// if (rst) dlen2 <= 0;
if
(
rst
)
dlen2
<=
0
;
if
(
rst
||
flush_stage
[
0
])
dlen2
<=
0
;
// flush_stage[0] - equivalent of "if (flush_in) data1 <= 0;"
else
if
(
stage
[
0
])
dlen2
<=
dlen1
;
// previous value (position)
else
if
(
stage
[
0
])
dlen2
<=
dlen1
;
// previous value (position)
...
@@ -108,6 +107,7 @@ module bit_stuffer_27_32#(
...
@@ -108,6 +107,7 @@ module bit_stuffer_27_32#(
// barrel shifter stage 2 (0/2/4/6)
// barrel shifter stage 2 (0/2/4/6)
if
(
rst
)
data2
<=
'bx
;
if
(
rst
)
data2
<=
'bx
;
else
if
(
flush_stage
[
0
])
data2
<=
0
;
// flush_stage[0] - equivalent of "if (flush_in) data1 <= 0;"
else
if
(
stage
[
0
])
case
(
dlen1
[
2
:
1
])
else
if
(
stage
[
0
])
case
(
dlen1
[
2
:
1
])
2'h0
:
data2
<=
{
data1
,
6'b0
};
2'h0
:
data2
<=
{
data1
,
6'b0
};
2'h1
:
data2
<=
{
2'b0
,
data1
,
4'b0
};
2'h1
:
data2
<=
{
2'b0
,
data1
,
4'b0
};
...
...
fpga_version.vh
View file @
4b42ed42
...
@@ -35,7 +35,8 @@
...
@@ -35,7 +35,8 @@
* contains all the components and scripts required to completely simulate it
* contains all the components and scripts required to completely simulate it
* with at least one of the Free Software programs.
* with at least one of the Free Software programs.
*/
*/
parameter FPGA_VERSION = 32'h039300c8; //parallel - trying to fix "premature..." -0.121/21, 80.2%
parameter FPGA_VERSION = 32'h039300c9; //parallel - trying more ...-0.123/32 79.82%
// parameter FPGA_VERSION = 32'h039300c8; //parallel - trying to fix "premature..." -0.121/21, 80.2%
// parameter FPGA_VERSION = 32'h039300c7; //parallel - disable SoF when channel disabled: met, 80.32%
// parameter FPGA_VERSION = 32'h039300c7; //parallel - disable SoF when channel disabled: met, 80.32%
// parameter FPGA_VERSION = 32'h039300c6; //parallel - same -0.132 /31, 80.73%
// parameter FPGA_VERSION = 32'h039300c6; //parallel - same -0.132 /31, 80.73%
// parameter FPGA_VERSION = 32'h039300c5; //parallel - made i2c ahead of system frame number for eof -0.027/12 , 82.08%
// parameter FPGA_VERSION = 32'h039300c5; //parallel - made i2c ahead of system frame number for eof -0.027/12 , 82.08%
...
...
includes/x393_simulation_parameters.vh
View file @
4b42ed42
...
@@ -63,8 +63,8 @@
...
@@ -63,8 +63,8 @@
// parameter SENSOR12BITS_NBPF = 20, //16; // bpf length
// parameter SENSOR12BITS_NBPF = 20, //16; // bpf length
parameter SENSOR_IMAGE_TYPE0 = "RUN1", //"NORM", // "RUN1", "HIST_TEST"
parameter SENSOR_IMAGE_TYPE0 = "RUN1", //"NORM", // "RUN1", "HIST_TEST"
parameter SENSOR_IMAGE_TYPE1 = "RUN1",
parameter SENSOR_IMAGE_TYPE1 = "RUN1",
parameter SENSOR_IMAGE_TYPE2 = "RUN1", // "NORM", // "RUN1",
parameter SENSOR_IMAGE_TYPE2 = "
NORM", // "
RUN1", // "NORM", // "RUN1",
parameter SENSOR_IMAGE_TYPE3 = "RUN1",
parameter SENSOR_IMAGE_TYPE3 = "
NORM", // "
RUN1",
parameter SIMULATE_CMPRS_CMODE0 = CMPRS_CBIT_CMODE_JPEG18,
parameter SIMULATE_CMPRS_CMODE0 = CMPRS_CBIT_CMODE_JPEG18,
parameter SIMULATE_CMPRS_CMODE1 = CMPRS_CBIT_CMODE_JPEG18,
parameter SIMULATE_CMPRS_CMODE1 = CMPRS_CBIT_CMODE_JPEG18,
...
...
x393_parallel.bit
View file @
4b42ed42
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment