From 980dbad0437d08a172a4621b4561cdda428a56f8 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Mon, 24 Apr 2017 11:00:09 +0200 Subject: [PATCH] Update placement of serdes in combiner --- combiner/combiner.lpf | 16 ++++++++++------ combiner/combiner.prj | 1 + combiner/config_compile_frankfurt.pl | 4 ++-- combiner/par.p2t | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/combiner/combiner.lpf b/combiner/combiner.lpf index 7272085..992e5e0 100644 --- a/combiner/combiner.lpf +++ b/combiner/combiner.lpf @@ -14,18 +14,22 @@ FREQUENCY NET "THE_MEDIA*/clk_tx_full" 200 MHz; # HOLD_MARGIN 500 ps -LOCATE COMP "THE_MEDIA_INTERFACE/THE_SERDES/PCSD_INST" SITE "PCSC" ; +LOCATE COMP "THE_MEDIA_INTERFACE/gen_pcs0.THE_SERDES/PCSD_INST" SITE "PCSC" ; LOCATE COMP "THE_MEDIA_4_DOWN_A/THE_SERDES/PCSD_INST" SITE "PCSA" ; LOCATE COMP "THE_MEDIA_4_DOWN_B/THE_SERDES/PCSD_INST" SITE "PCSB" ; LOCATE COMP "THE_MEDIA_4_DOWN_D/THE_SERDES/PCSD_INST" SITE "PCSD" ; +REGION "MEDIA_A" "R93C91D" 22 36; +REGION "MEDIA_B" "R93C55D" 22 36; +REGION "MEDIA_C" "R93C127D" 22 36; +REGION "MEDIA_D" "R93C19D" 22 36; -REGION "MEDIA_DOWN1" "R93C10D" 22 160; -LOCATE UGROUP "THE_MEDIA_4_DOWN_A/media_interface_group" REGION "MEDIA_DOWN1" ; -LOCATE UGROUP "THE_MEDIA_4_DOWN_B/media_interface_group" REGION "MEDIA_DOWN1" ; -LOCATE UGROUP "THE_MEDIA_4_DOWN_D/media_interface_group" REGION "MEDIA_DOWN1" ; -LOCATE UGROUP "THE_MEDIA_INTERFACE/media_interface_group" REGION "MEDIA_DOWN1" ; +#REGION "MEDIA_DOWN1" "R93C10D" 22 160; +LOCATE UGROUP "THE_MEDIA_4_DOWN_A/media_interface_group" REGION "MEDIA_A" ; +LOCATE UGROUP "THE_MEDIA_4_DOWN_B/media_interface_group" REGION "MEDIA_B" ; +LOCATE UGROUP "THE_MEDIA_4_DOWN_D/media_interface_group" REGION "MEDIA_D" ; +LOCATE UGROUP "THE_MEDIA_INTERFACE/media_interface_group" REGION "MEDIA_C" ; diff --git a/combiner/combiner.prj b/combiner/combiner.prj index b81ab7f..eb8b23b 100644 --- a/combiner/combiner.prj +++ b/combiner/combiner.prj @@ -93,6 +93,7 @@ add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x256_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x512_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x1k_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x2k_oreg.vhd" +add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x8k_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_9x2k_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp2m/fifo/fifo_var_oreg.vhd" add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_19x16_obuf.vhd" diff --git a/combiner/config_compile_frankfurt.pl b/combiner/config_compile_frankfurt.pl index 8e9c749..383cf48 100644 --- a/combiner/config_compile_frankfurt.pl +++ b/combiner/config_compile_frankfurt.pl @@ -1,11 +1,11 @@ TOPNAME => "combiner", 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.7_x64', +lattice_path => '/d/jspc29/lattice/diamond/3.8_x64', synplify_path => '/d/jspc29/lattice/synplify/K-2015.09/', # 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 52238 jmichel\@cerberus \"cd /home/jmichel/git/dirich/combiner/workdir; LM_LICENSE_FILE=27000\@lxcad01.gsi.de /opt/synplicity/L-2016.09-1/bin/synplify_premier_dp -batch ../combiner.prj\" #", nodelist_file => 'nodelist_frankfurt.txt', diff --git a/combiner/par.p2t b/combiner/par.p2t index 25473ed..a89b69b 100644 --- a/combiner/par.p2t +++ b/combiner/par.p2t @@ -4,7 +4,7 @@ -n 1 -y -s 12 --t 28 +-t 31 -c 1 -e 2 #-g guidefile.ncd -- 2.43.0