From 6b7b8f4f0340f88225c277275f09145bb47fa8e1 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 12 Jun 2013 10:19:52 +0200 Subject: [PATCH] committed old changes --- cts/compile_central_frankfurt.pl | 2 +- cts/nodelist_frankfurt.txt | 14 ++++++++++ cts/trb3_central.p2t | 4 +-- cts/trb3_central.vhd | 47 ++++++++++++++++---------------- cts/trb3_central_constraints.lpf | 24 ++++++++-------- 5 files changed, 53 insertions(+), 38 deletions(-) create mode 100644 cts/nodelist_frankfurt.txt diff --git a/cts/compile_central_frankfurt.pl b/cts/compile_central_frankfurt.pl index 0a46f69..67247fb 100755 --- a/cts/compile_central_frankfurt.pl +++ b/cts/compile_central_frankfurt.pl @@ -121,7 +121,7 @@ $c=qq|$lattice_path/ispfpga/bin/lin/map -retime -split_node -a execute($c); -$c=qq|multipar -pr "$TOPNAME.prf" -o "mpar_$TOPNAME.rpt" -log "mpar_$TOPNAME.log" -p "../$TOPNAME.p2t" "$tpmap.ncd" "$TOPNAME.ncd"|; +$c=qq|multipar -m ../nodelist_frankfurt.txt -pr "$TOPNAME.prf" -o "mpar_$TOPNAME.rpt" -log "mpar_$TOPNAME.log" -p "../$TOPNAME.p2t" "$tpmap.ncd" "$TOPNAME.ncd"|; #$c=qq|$lattice_path/ispfpga/bin/lin/par -f "../$TOPNAME.p2t" "$tpmap.ncd" "$TOPNAME.ncd" "$TOPNAME.prf"|; #$c=qq|$lattice_path/ispfpga/bin/lin/par -f "../$TOPNAME.p2t" "$tpmap.ncd" "$TOPNAME.dir" "$TOPNAME.prf"|; execute($c); diff --git a/cts/nodelist_frankfurt.txt b/cts/nodelist_frankfurt.txt new file mode 100644 index 0000000..571f5cc --- /dev/null +++ b/cts/nodelist_frankfurt.txt @@ -0,0 +1,14 @@ + + +[jspc22] +system = linux +corenum = 2 +env = /d/jspc29/lattice/diamond_settings.sh +workdir = /d/jspc22/trb/git/trb3/cts/workdir + +[jspc48] +system = linux +corenum = 3 +env = /d/jspc29/lattice/diamond_settings.sh +workdir = /d/jspc22/trb/git/trb3/cts/workdir + diff --git a/cts/trb3_central.p2t b/cts/trb3_central.p2t index dfb9e2a..64664cc 100644 --- a/cts/trb3_central.p2t +++ b/cts/trb3_central.p2t @@ -1,13 +1,13 @@ -w -l 5 -i 6 --n 3 +-n 5 -t 2 -s 100 -c 0 -e 0 -stopzero --exp parUseNBR=0:parCDP=auto:parCDR=1:parPathBased=OFF:parHold=OFF:parDisablePgroup=0 +-exp parUseNBR=0:parCDP=auto:parCDR=1:parPathBased=OFF:parDisablePgroup=0:parHold=ON diff --git a/cts/trb3_central.vhd b/cts/trb3_central.vhd index 58e2689..a8cf95b 100644 --- a/cts/trb3_central.vhd +++ b/cts/trb3_central.vhd @@ -617,15 +617,16 @@ THE_MAIN_PLL : pll_in200_out100 LOCK => pll_lock ); --- generates hits for calibration uncorrelated with tdc clk -THE_CALIBRATION_PLL : pll_in125_out20 - port map ( - CLK => CLK_GPLL_RIGHT, - CLKOP => clk_20_i, - CLKOK => clk_125_i, - LOCK => open); +-- -- generates hits for calibration uncorrelated with tdc clk +-- THE_CALIBRATION_PLL : pll_in125_out20 +-- port map ( +-- CLK => CLK_GPLL_RIGHT, +-- CLKOP => clk_20_i, +-- CLKOK => clk_125_i, +-- LOCK => open); - + clk_125_i <= CLK_GPLL_RIGHT; + clk_20_i <= '0'; --------------------------------------------------------------------------- -- The TrbNet media interface (SFP) @@ -1405,21 +1406,21 @@ end process; --------------------------------------------------------------------------- -- AddOn Connector --------------------------------------------------------------------------- - PWM_OUT <= "00"; - - JOUT1 <= x"0"; - JOUT2 <= x"0"; - JOUTLVDS <= x"00"; - JTTL <= x"0000"; - TRG_FANOUT_ADDON <= '0'; - - LED_BANK <= x"FF"; - LED_RJ_GREEN <= "111111"; - LED_RJ_RED <= "111111"; - LED_FAN_GREEN <= '1'; - LED_FAN_ORANGE <= '1'; - LED_FAN_RED <= '1'; - LED_FAN_YELLOW <= '1'; +-- PWM_OUT <= "00"; +-- +-- JOUT1 <= x"0"; +-- JOUT2 <= x"0"; +-- JOUTLVDS <= x"00"; +-- JTTL <= x"0000"; +-- TRG_FANOUT_ADDON <= '0'; +-- +-- LED_BANK <= x"FF"; +-- LED_RJ_GREEN <= "111111"; +-- LED_RJ_RED <= "111111"; +-- LED_FAN_GREEN <= '1'; +-- LED_FAN_ORANGE <= '1'; +-- LED_FAN_RED <= '1'; +-- LED_FAN_YELLOW <= '1'; --------------------------------------------------------------------------- diff --git a/cts/trb3_central_constraints.lpf b/cts/trb3_central_constraints.lpf index 66bcbda..71986c0 100644 --- a/cts/trb3_central_constraints.lpf +++ b/cts/trb3_central_constraints.lpf @@ -47,19 +47,19 @@ MULTICYCLE TO CELL "gen_single_sfp_THE_MEDIA_UPLINK/SCI_DATA_OUT*" 50 ns; MULTICYCLE TO CELL "gen_four_sfp_THE_MEDIA_UPLINK/SCI_DATA_OUT*" 50 ns; #SPI Interface -REGION "REGION_SPI" "R10C111D" 12 16 DEVSIZE; -LOCATE UGROUP "THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; -LOCATE UGROUP "THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ; +REGION "REGION_SPI" "R13C150D" 12 16 DEVSIZE; +#LOCATE UGROUP "THE_SPI_MASTER/SPI_group" REGION "REGION_SPI" ; +#LOCATE UGROUP "THE_SPI_MEMORY/SPI_group" REGION "REGION_SPI" ; -REGION "REGION_CTS" "R40C135D" 70 46 DEVSIZE; -UGROUP "cts_group" - BLKNAME THE_CTS; -LOCATE UGROUP "cts_group" REGION "REGION_CTS"; +REGION "REGION_CTS" "R42C38D" 37 57 DEVSIZE; +# UGROUP "cts_group" +# BLKNAME THE_CTS; +# LOCATE UGROUP "cts_group" REGION "REGION_CTS"; MULTICYCLE TO CELL "THE_MBS/trg_sync" 20 ns; MULTICYCLE TO CELL "THE_MBS/error_reg" 20 ns; #TrbNet Hub -REGION "REGION_IOBUF" "R40C75D" 65 80 DEVSIZE; +REGION "REGION_IOBUF" "R40C90D" 55 75 DEVSIZE; LOCATE UGROUP "THE_HUB/THE_HUB/gen_muxes_0_MPLEX/MUX_group" REGION "REGION_IOBUF" ; LOCATE UGROUP "THE_HUB/THE_HUB/gen_muxes_1_MPLEX/MUX_group" REGION "REGION_IOBUF" ; LOCATE UGROUP "THE_HUB/THE_HUB/gen_muxes_2_MPLEX/MUX_group" REGION "REGION_IOBUF" ; @@ -208,12 +208,12 @@ UGROUP "gbe_rx_tx" BLKNAME GBE/setup_imp_gen_SETUP; -REGION "GBE_REGION" "R45C20D" 33 37 DEVSIZE; -REGION "MED0" "R81C5D" 34 35 DEVSIZE; +REGION "GBE_REGION" "R44C45D" 36 42 DEVSIZE; +REGION "MED0" "R81C10D" 34 40 DEVSIZE; LOCATE UGROUP "gbe_rx_tx" REGION "GBE_REGION" ; FREQUENCY NET "GBE/imp_gen_serdes_intclk_gen_PCS_SERDES/un1_PCS_SERDES_1" 125.000000 MHz ; FREQUENCY NET "GBE/serdes_clk_125_c" 125.000000 MHz ; -REGION "GBE_MAIN_REGION" "R69C30C" 46 44 DEVSIZE; +REGION "GBE_MAIN_REGION" "R78C50C" 37 34 DEVSIZE; LOCATE UGROUP "controllers" REGION "GBE_MAIN_REGION" ; LOCATE UGROUP "tsmac" REGION "MED0" ; BLOCK JTAGPATHS ; @@ -282,7 +282,7 @@ UGROUP "pcs_rx_to_mac" BLKNAME GBE/pcs_rxd_qq_5 BLKNAME GBE/pcs_rxd_qq_6 BLKNAME GBE/pcs_rxd_qq_7; -# USE PRIMARY NET "CLK_GPLL_RIGHT_c" ; +USE PRIMARY NET "CLK_GPLL_RIGHT_c" ; FREQUENCY NET "GBE/serdes_rx_clk_c" 125.000000 MHz PAR_ADJ 25.000000 ; FREQUENCY NET "GBE/imp_gen_serdes_intclk_gen_PCS_SERDES/clk_int_SERDES_GBE/FF_TX_F_CLK_0" 125.000000 MHz PAR_ADJ 25.000000 ; FREQUENCY NET "GBE/imp_gen_serdes_intclk_gen_PCS_SERDES/clk_int_SERDES_GBE/FF_TX_F_CLK_1" 125.000000 MHz PAR_ADJ 25.000000 ; -- 2.43.0