Commit 4b42ed42 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

more fixing jpeg tail

parent bd5fb565

cocotb/x393_cocotb_03.sav

+10 −10
Original line number Diff line number Diff line 
[*]

[*] 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-20161110114854506.fst"

[dumpfile_mtime] "Thu Nov 10 19:05:03 2016"

[dumpfile_size] 49333165

[dumpfile] "/home/eyesis/git/x393-neon/simulation/x393_dut-20161110150532005.fst"

[dumpfile_mtime] "Thu Nov 10 22:29:04 2016"

[dumpfile_size] 118798882

[savefile] "/home/eyesis/git/x393-neon/cocotb/x393_cocotb_03.sav"

[timestart] 114383480

[timestart] 115333600

[size] 1814 1171

[pos] 0 0

*-14.266726 114449010 -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 115459900 -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.simul_sensor12bits_2_i.

[treeopen] x393_dut.simul_sensor12bits_3_i.
@@ -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_sync_i.

[treeopen] x393_dut.x393_i.timing393_i.camsync393_i.

[sst_width] 294

[signals_width] 319

[sst_width] 230

[signals_width] 361

[sst_expanded] 1

[sst_vpaned_height] 486

@820
@@ -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

@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]

@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]

@22

@23

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]

@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]

cocotb/x393_dut.v

+7 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
 */

`timescale 1ns/1ps

`define COCOTB

//`define DISABLE_SENSOR_2

`include "system_defines.vh"

module  x393_dut#(

`include "includes/x393_parameters.vh" // SuppressThisWarning VEditor - not used
@@ -1613,7 +1614,11 @@ simul_axi_hp_wr #( 
        .new_bayer (0) //SENSOR12BITS_NEW_BAYER) was 1

    ) simul_sensor12bits_2_i (

        .MCLK  (PX2_MCLK), // input

`ifdef DISABLE_SENSOR_2

        .MRST  (PX2_MRST & 0), // input // force reset !!!

`else 

        .MRST  (PX2_MRST), // input // force reset !!!

`endif 

        .ARO   (PX2_ARO),  // input 

        .ARST  (PX2_ARST), // input 

        .OE    (1'b0),     // input output enable active low

compressor_jp/bit_stuffer_27_32.v

+3 −3
Original line number Diff line number Diff line
@@ -91,8 +91,7 @@ module bit_stuffer_27_32#( 
//        else if (ds)       dlen1 <= early_length; // previous value

        else if (ds || flush_in)  dlen1 <= early_length; // previous value



//        if      (rst)      dlen2 <= 0;

        if      (rst || flush_stage[0]) dlen2 <= 0; // flush_stage[0] - equivalent of "if (flush_in) data1 <= 0;"

        if      (rst)        dlen2 <= 0;

        else if (stage[0])   dlen2 <= dlen1; // previous value (position)
@@ -108,6 +107,7 @@ module bit_stuffer_27_32#( 
    

        // barrel shifter stage 2 (0/2/4/6)

        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])

            2'h0: data2 <= {      data1, 6'b0};

            2'h1: data2 <= { 2'b0,data1, 4'b0};

fpga_version.vh

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
 * contains all the components and scripts required to completely simulate it

 * 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'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%

includes/x393_simulation_parameters.vh

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ 
//    parameter SENSOR12BITS_NBPF =       20,   //16; // bpf length

    parameter SENSOR_IMAGE_TYPE0 =       "RUN1", //"NORM", // "RUN1", "HIST_TEST"

    parameter SENSOR_IMAGE_TYPE1 =       "RUN1",

    parameter SENSOR_IMAGE_TYPE2 =       "RUN1", // "NORM", // "RUN1",

    parameter SENSOR_IMAGE_TYPE3 =       "RUN1",

    parameter SENSOR_IMAGE_TYPE2 =       "NORM", // "RUN1", // "NORM", // "RUN1",

    parameter SENSOR_IMAGE_TYPE3 =       "NORM", // "RUN1",

    

    parameter SIMULATE_CMPRS_CMODE0 =     CMPRS_CBIT_CMODE_JPEG18,

    parameter SIMULATE_CMPRS_CMODE1 =     CMPRS_CBIT_CMODE_JPEG18,