From 85b2e20f4e4ce415e506534a945c2f5cb178c0ec Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Tue, 18 Jul 2017 18:40:39 +0200 Subject: [PATCH] Update compile settings to defaults from Diamond --- combiner/config_compile_frankfurt.pl | 4 +- dirich/config_compile_frankfurt.pl | 3 +- dirich/diamond/dirich.ldf | 2 +- dirich/diamond/dirich1.sty | 2 + dirich/dirich.prj | 61 ++++++++++++++-------------- dirich/par.p2t | 18 ++++---- 6 files changed, 48 insertions(+), 42 deletions(-) diff --git a/combiner/config_compile_frankfurt.pl b/combiner/config_compile_frankfurt.pl index 383cf48..c92c501 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.8_x64', +lattice_path => '/d/jspc29/lattice/diamond/3.9_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\" #", +#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/dirich/config_compile_frankfurt.pl b/dirich/config_compile_frankfurt.pl index b440f7f..600380b 100644 --- a/dirich/config_compile_frankfurt.pl +++ b/dirich/config_compile_frankfurt.pl @@ -8,7 +8,8 @@ TOPNAME => "dirich", 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/L-2016.09-1/', +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\" #", diff --git a/dirich/diamond/dirich.ldf b/dirich/diamond/dirich.ldf index f98bc48..f3c8efb 100644 --- a/dirich/diamond/dirich.ldf +++ b/dirich/diamond/dirich.ldf @@ -2,7 +2,7 @@ - + diff --git a/dirich/diamond/dirich1.sty b/dirich/diamond/dirich1.sty index 02f8941..d01cd92 100644 --- a/dirich/diamond/dirich1.sty +++ b/dirich/diamond/dirich1.sty @@ -189,6 +189,7 @@ + @@ -196,6 +197,7 @@ + diff --git a/dirich/dirich.prj b/dirich/dirich.prj index 5035fd1..0941661 100644 --- a/dirich/dirich.prj +++ b/dirich/dirich.prj @@ -10,42 +10,41 @@ set_option -speed_grade -8 set_option -part_companion "" # compilation/mapping options -set_option -default_enum_encoding sequential -set_option -symbolic_fsm_compiler 1 set_option -top_module "dirich" -set_option -resource_sharing false - -# map options -set_option -frequency 120 -set_option -fanout_limit 100 -set_option -disable_io_insertion 0 -set_option -retiming 1 -set_option -pipe 1 -set_option -forcegsr false -set_option -fixgatedclocks 3 -set_option -fixgeneratedclocks 3 -set_option -compiler_compatible true -set_option -multi_file_compilation_unit 1 - -set_option -max_parallel_jobs 3 -#set_option -automatic_compile_point 1 -#set_option -continue_on_error 1 -set_option -resolve_multiple_driver 1 - -# simulation options -set_option -write_verilog 0 -set_option -write_vhdl 1 - -# automatic place and route (vendor) options -set_option -write_apr_constraint 0 - # set result format/file last project -result_format "edif" project -result_file "workdir/dirich.edf" -set_option log_file "workdir/dirich_project.srf" -#implementation attributes + +#compilation/mapping options +set_option -symbolic_fsm_compiler true +set_option -resource_sharing true + +#use verilog 2001 standard option set_option -vlog_std v2001 + +#map options +set_option -frequency auto +set_option -maxfan 1000 +set_option -auto_constrain_io 0 +set_option -disable_io_insertion false +set_option -retiming false; +set_option -pipe true +set_option -force_gsr false +set_option -compiler_compatible 0 +set_option -dup false + +set_option -default_enum_encoding default + +#automatic place and route (vendor) options +set_option -write_apr_constraint 1 + +#synplifyPro options +set_option -fix_gated_and_generated_clocks 1 +set_option -update_models_cp 0 +set_option -resolve_multiple_driver 0 + + set_option -project_relative_includes 1 impl -active "workdir" @@ -206,7 +205,7 @@ add_file -vhdl -lib work "tdc_release/TDC_record.vhd" add_file -vhdl -lib work "tdc_release/TriggerHandler.vhd" add_file -vhdl -lib work "tdc_release/up_counter.vhd" -add_file -vhdl -lib work "../../tdc/base/cores/ecp5/TDC/Adder_288/Adder_288.vhd" +#add_file -vhdl -lib work "../../tdc/base/cores/ecp5/TDC/Adder_288/Adder_288.vhd" add_file -vhdl -lib work "../../tdc/base/cores/ecp5/FIFO/FIFO_DC_36x128_DynThr_OutReg/FIFO_DC_36x128_DynThr_OutReg.vhd" add_file -vhdl -lib work "../../tdc/base/cores/ecp5/FIFO/FIFO_DC_36x128_OutReg/FIFO_DC_36x128_OutReg.vhd" add_file -vhdl -lib work "../../tdc/base/cores/ecp5/FIFO/FIFO_DC_36x64_OutReg/FIFO_DC_36x64_OutReg.vhd" diff --git a/dirich/par.p2t b/dirich/par.p2t index 37870ba..2491d2d 100644 --- a/dirich/par.p2t +++ b/dirich/par.p2t @@ -1,16 +1,19 @@ -w --y +#-y -l 5 #-m nodelist.txt # Controlled by the compile.pl script. #-n 1 # Controlled by the compile.pl script. --s 12 +-s 1 -t 1 --c 1 --e 2 --i 15 --exp parCDP=1:parCDR=1:parPlcInLimit=0:parPlcInNeighborSize=1:parPathBased=ON:parHold=ON:parHoldLimit=10000:paruseNBR=1: - +-c 0 +-e 0 +-i 6 +-exp parCDP=auto:parCDR=1:parPathBased=OFF:paruseNBR=1 +#-exp parPlcInLimit=0 +#-exp parPlcInNeighborSize=1 +#-exp parHold=ON +#-exp parHoldLimit=10000 #General PAR Command Line Options # -w With this option, any files generated will overwrite existing files # (e.g., any .par, .pad files). @@ -67,3 +70,4 @@ # parHold. # parPlcInLimit Cannot find in the online help # parPlcInNeighborSize Cannot find in the online help + -- 2.43.0