From: Jan Michel Date: Thu, 14 Jun 2018 14:39:51 +0000 (+0200) Subject: fix calibration clock for DiRich 3 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e4464123088379b0d9463bb4078e41d38d967324;p=dirich.git fix calibration clock for DiRich 3 --- diff --git a/dirich/config_compile_frankfurt.pl b/dirich/config_compile_frankfurt.pl index 0865713..7a12e89 100644 --- a/dirich/config_compile_frankfurt.pl +++ b/dirich/config_compile_frankfurt.pl @@ -9,10 +9,7 @@ lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de"; lm_license_file_for_par => "1702\@jspc29", lattice_path => '/d/jspc29/lattice/diamond/3.9_x64', synplify_path => '/d/jspc29/lattice/synplify/K-2015.09/', -#synplify_path => '/d/jspc29/lattice/synplify/L-2016.09-1/', -# synplify_command => "/d/jspc29/lattice/diamond/3.7_x64/bin/lin64/synpwrap -fg -options", -# synplify_command => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp", -# synplify_command => "ssh -p 59222 jmichel\@cerberus \"cd /home/jmichel/git/trb3sc/template/workdir; LM_LICENSE_FILE=27000\@lxcad01.gsi.de /opt/synplicity/K-2015.09/bin/synplify_premier_dp -batch ../trb3sc_basic.prj\" #", + nodelist_file => '../nodelist_frankfurt.txt', pinout_file => 'dirich2', par_options => '../par.p2t', diff --git a/dirich/dirich.prj b/dirich/dirich.prj index 19661f6..b7b5841 100644 --- a/dirich/dirich.prj +++ b/dirich/dirich.prj @@ -210,7 +210,8 @@ add_file -vhdl -lib work "../../tdc/base/cores/ecp5/FIFO/FIFO_DC_36x32_OutReg/FI add_file -vhdl -lib work "../../tdc/base/cores/ecp5/FIFO/FIFO_36x128_OutReg/FIFO_36x128_OutReg.vhd" add_file -vhdl -lib work "../../tdc/base/cores/ecp5/FIFO/FIFO_36x64_OutReg/FIFO_36x64_OutReg.vhd" add_file -vhdl -lib work "../../tdc/base/cores/ecp5/FIFO/FIFO_36x32_OutReg/FIFO_36x32_OutReg.vhd" -add_file -vhdl -lib work "../../tdc/base/cores/ecp5/PLL/pll_in125_out33/pll_in125_out33.vhd" +#add_file -vhdl -lib work "../../tdc/base/cores/ecp5/PLL/pll_in125_out33/pll_in125_out33.vhd" +add_file -vhdl -lib work "../../tdc/base/cores/ecp5/PLL/pll_in3125_out50/pll_in3125_out50.vhd" add_file -vhdl -lib work "./dirich.vhd" diff --git a/dirich/dirich.vhd b/dirich/dirich.vhd index 7e701d4..a7b1b5a 100644 --- a/dirich/dirich.vhd +++ b/dirich/dirich.vhd @@ -65,7 +65,7 @@ architecture dirich_arch of dirich is attribute syn_keep : boolean; attribute syn_preserve : boolean; - signal clk_sys, clk_full, clk_full_osc : std_logic; + signal clk_sys, clk_full, clk_full_osc, clk_cal : std_logic; signal GSR_N : std_logic; signal reset_i : std_logic; signal clear_i : std_logic; @@ -137,6 +137,7 @@ begin port map( CLOCK_IN => CLOCK_IN, RESET_FROM_NET => med2int(0).stat_op(13), + SEND_RESET_IN => med2int(0).stat_op(15), BUS_RX => bustc_rx, BUS_TX => bustc_tx, @@ -165,6 +166,11 @@ begin -- end if; -- end process; +THE_CAL_PLL : entity work.pll_in3125_out50 + port map( + CLKI => CLOCK_CAL, + CLKOP => clk_cal + ); --------------------------------------------------------------------------- -- TrbNet Uplink @@ -222,7 +228,7 @@ begin DATA_BUFFER_FULL_THRESH => 2**EVENT_BUFFER_SIZE-EVENT_MAX_SIZE, TRG_RELEASE_AFTER_DATA => c_YES, HEADER_BUFFER_DEPTH => 9, - HEADER_BUFFER_FULL_THRESH => 2**8 + HEADER_BUFFER_FULL_THRESH => 2**9-16 ) port map( @@ -430,7 +436,7 @@ link_stat_in_reg <= link_stat_in when rising_edge(clk_full_osc); CLK_READOUT => clk_sys, -- Clock for the readout REFERENCE_TIME => TRIG_IN, -- Reference time input HIT_IN => hit_in_i(NUM_TDC_CHANNELS-1 downto 1), -- Channel start signals - HIT_CAL_IN => CLOCK_CAL, -- Hits for calibrating the TDC + HIT_CAL_IN => clk_cal, -- Hits for calibrating the TDC -- Trigger signals from handler BUSRDO_RX => readout_rx, BUSRDO_TX => readout_tx(0), diff --git a/dirich/nodelist_frankfurt.txt b/dirich/nodelist_frankfurt.txt index 826989f..dab616f 100644 --- a/dirich/nodelist_frankfurt.txt +++ b/dirich/nodelist_frankfurt.txt @@ -1,13 +1,21 @@ // nodes file for parallel place&route -[jspc29] + +[jspc37] SYSTEM = linux -CORENUM = 3 +CORENUM = 4 ENV = /d/jspc29/lattice/39_settings.sh WORKDIR = /d/jspc22/trb/git/dirich/dirich/workdir + [jspc57] SYSTEM = linux -CORENUM = 7 +CORENUM = 4 +ENV = /d/jspc29/lattice/39_settings.sh +WORKDIR = /d/jspc22/trb/git/dirich/dirich/workdir + +[jspc29] +SYSTEM = linux +CORENUM = 3 ENV = /d/jspc29/lattice/39_settings.sh WORKDIR = /d/jspc22/trb/git/dirich/dirich/workdir diff --git a/dirich/par.p2t b/dirich/par.p2t index 94b6535..90aad2c 100644 --- a/dirich/par.p2t +++ b/dirich/par.p2t @@ -4,10 +4,10 @@ #-m nodelist.txt # Controlled by the compile.pl script. #-n 1 # Controlled by the compile.pl script. -s 10 --t 3 --c 0 --e 0 --i 6 +-t 12 +-c 2 +-e 2 +-i 10 #-exp parPlcInLimit=0 #-exp parPlcInNeighborSize=1 #General PAR Command Line Options @@ -66,4 +66,4 @@ # parHold. # parPlcInLimit Cannot find in the online help # parPlcInNeighborSize Cannot find in the online help --exp parHold=ON:parHoldLimit=10000:parCDP=auto:parCDR=1:parPathBased=OFF:paruseNBR=1:parHold=2 +-exp parHold=ON:parHoldLimit=10000:parCDP=1:parCDR=1:parPathBased=OFF:paruseNBR=1