From 3abce31d6afdbbcb67b9dd5a160643a06d092861 Mon Sep 17 00:00:00 2001 From: "Pavel V. Shatov (Meister)" Date: Sat, 18 Aug 2018 02:08:54 +0300 Subject: 1. Disabled SmartGuide as it can thwart reproducible implementation. 2. Enabled multi-threading for MAP and PAR, the corresponding switch is -mt. MAP supports -mt off|2, PAR supports -mt off|2|3|4. Please revert back to -mt off if the build system has only two cores. --- build/xilinx.mk | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/build/xilinx.mk b/build/xilinx.mk index abeff7b..8c56319 100644 --- a/build/xilinx.mk +++ b/build/xilinx.mk @@ -33,8 +33,8 @@ coregen_work_dir ?= ./coregen-tmp #map_opts ?= -timing -ol high -detail -pr b -register_duplication -w -xe n # from https://github.com/fpga-logi/logi-hard/blob/master/build_lib/synth/xilinx.mk: -map_opts ?= -w -logic_opt off -ol high -t 1 -xt 0 -register_duplication off -r 4 -global_opt off -mt off -ir off -pr off -lc off -power off -par_opts ?= -ol high +map_opts ?= -w -logic_opt off -ol high -t 1 -xt 0 -register_duplication off -r 4 -global_opt off -mt 2 -ir off -pr off -lc off -power off +par_opts ?= -ol high -mt 4 isedir ?= /opt/Xilinx/13.3/ISE_DS xil_env ?= . $(isedir)/settings32.sh flashsize ?= 8192 @@ -117,14 +117,17 @@ junk += $(project)_par.grf $(project)_par.ptwx junk += $(project)_par.unroutes $(project)_par.xpi $(project).ncd: $(project).ngd - if [ -r $(project)_par.ncd ]; then \ - cp $(project)_par.ncd smartguide.ncd; \ - smartguide="-smartguide smartguide.ncd"; \ - else \ - smartguide=""; \ - fi; \ + #if [ -r $(project)_par.ncd ]; then \ + # cp $(project)_par.ncd smartguide.ncd; \ + # smartguide="-smartguide smartguide.ncd"; \ + #else \ + # smartguide=""; \ + #fi; \ + #$(xil_env); \ + #map $(intstyle) $(map_opts) $$smartguide $< $(xil_env); \ - map $(intstyle) $(map_opts) $$smartguide $< + map $(intstyle) $(map_opts) $< + junk += $(project).ncd $(project).pcf $(project).ngm $(project).mrp $(project).map junk += smartguide.ncd $(project).psr junk += $(project)_summary.xml $(project)_usage.xml -- cgit v1.2.3