luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid combined flags in bitread invocations. 

Combined flags (i.e. -zy) are not universally supported.  Switch to
individual flags (-z -y) in existing scripts to prepare for move to
gflags.

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
This commit is contained in:
Rick Altherr 2017-11-14 16:08:07 -08:00 committed by Tim 'mithro' Ansell
parent f19e57b97b
commit 4f74941fcd
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
experiments/clbpips/generate.sh
View File

@ -6,6 +6,6 @@ echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh
vivado -mode batch -source ../generate.tcl
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -zy design.bit
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
python3 ../generate.py

4
experiments/example/generate.sh
View File

@ -73,8 +73,8 @@ EOT
rm -rf design design.log
vivado -nojournal -log design.log -mode batch -source design.tcl
#../../../tools/bitread -o design_roi.bits -zy design_roi_partial.bit
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -zy design.bit
#../../../tools/bitread -o design_roi.bits -z -y design_roi_partial.bit
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design.pgm -p design.bit
python3 ../segdata.py

2
experiments/lutbuf/generate.sh
View File

@ -7,7 +7,7 @@ echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh
vivado -mode batch -source ../generate.tcl
for x in design*.bit; do
../../../tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -zy $x
../../../tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x
done
python3 ../generate.py

2
fuzzers/005-tilegrid/generate.sh
View File

@ -5,7 +5,7 @@
vivado -mode batch -source ../generate.tcl
for x in design*.bit; do
../../../tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -zy $x
../../../tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x
done
for x in design_*.bits; do

2
fuzzers/010-lutinit/generate.sh
View File

@ -7,7 +7,7 @@ echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh
vivado -mode batch -source ../generate.tcl
for i in 0 1 2; do
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design_$i.bits -zy design_$i.bit
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design_$i.bits -z -y design_$i.bit
done
for i in 0 1 2; do

2
fuzzers/011-ffconfig/generate.sh
View File

@ -7,7 +7,7 @@ echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh
vivado -mode batch -source ../generate.tcl
for i in {0..9}; do
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design_$i.bits -zy design_$i.bit
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design_$i.bits -z -y design_$i.bit
done
for i in {0..9}; do

2
fuzzers/012-lut5/generate.sh
View File

@ -7,7 +7,7 @@ echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh
vivado -mode batch -source ../generate.tcl
for x in design*.bit; do
../../../tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -zy $x
../../../tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x
done
python3 ../generate.py

2
fuzzers/013-intpips/generate.sh
View File

@ -6,6 +6,6 @@ echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh
vivado -mode batch -source ../generate.tcl
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -zy design.bit
../../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
python3 ../generate.py

4
gridinfo/runme.sh
View File

@ -57,8 +57,8 @@ vivado -nojournal -log design.log -mode batch -source design.tcl
for f0 in logicframes_SLICE_*_0.bit; do
f1=${f0%_0.bit}_1.bit
../tools/bitread -xo ${f0%.bit}.asc $f0 > /dev/null
../tools/bitread -xo ${f1%.bit}.asc $f1 > /dev/null
../tools/bitread -x -o ${f0%.bit}.asc $f0 > /dev/null
../tools/bitread -x -o ${f1%.bit}.asc $f1 > /dev/null
f0=${f0%.bit}.asc
f1=${f1%.bit}.asc
n=${f0%_0.asc}

2
minitests/clbconfigs/runme.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
set -ex
vivado -mode batch -source runme.tcl
../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -zy design.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
python3 ../../utils/segprint.py design.bits SLICE_X16Y100 SLICE_X16Y101 SLICE_X16Y102 SLICE_X16Y103

2
minitests/ffcfg/runme.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
set -ex
vivado -mode batch -source runme.tcl
../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -zy design.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
python3 ../../utils/segprint.py design.bits SLICE_X16Y100 SLICE_X16Y101 SLICE_X16Y102 SLICE_X16Y103

4
minitests/lvb_long_mux/runme.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -ex
vivado -mode batch -source runme.tcl
../../tools/bitread -F $XRAY_ROI_FRAMES -o design_a.bits -zy design_a.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o design_b.bits -zy design_b.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o design_a.bits -z -y design_a.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o design_b.bits -z -y design_b.bit
python3 ../../utils/segprint.py design_a.bits INT_L_X12Y132 INT_L_X14Y132 INT_L_X16Y132
python3 ../../utils/segprint.py design_b.bits INT_L_X12Y132 INT_L_X14Y132 INT_L_X16Y132

4
minitests/switchboxes/runme.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
vivado -mode batch -source runme.tcl
../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -zy design.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o routes.bits -zy routes.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
../../tools/bitread -F $XRAY_ROI_FRAMES -o routes.bits -z -y routes.bit
python3 ../../utils/segprint.py routes.bits INT_L_X12Y119 INT_L_X12Y117 INT_L_X12Y115
python3 ../../utils/segprint.py routes.bits INT_R_X13Y118 INT_R_X13Y116 INT_R_X13Y114