diff --git a/experiments/clbpips/generate.sh b/experiments/clbpips/generate.sh index 81fce495..d7436dc8 100644 --- a/experiments/clbpips/generate.sh +++ b/experiments/clbpips/generate.sh @@ -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 diff --git a/experiments/example/generate.sh b/experiments/example/generate.sh index ab59ddcd..a7e33f58 100644 --- a/experiments/example/generate.sh +++ b/experiments/example/generate.sh @@ -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 diff --git a/experiments/lutbuf/generate.sh b/experiments/lutbuf/generate.sh index d40bb231..1dfb2d44 100644 --- a/experiments/lutbuf/generate.sh +++ b/experiments/lutbuf/generate.sh @@ -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 diff --git a/fuzzers/005-tilegrid/generate.sh b/fuzzers/005-tilegrid/generate.sh index c3136884..465f25b2 100644 --- a/fuzzers/005-tilegrid/generate.sh +++ b/fuzzers/005-tilegrid/generate.sh @@ -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 diff --git a/fuzzers/010-lutinit/generate.sh b/fuzzers/010-lutinit/generate.sh index e0bcd7aa..2370b66d 100644 --- a/fuzzers/010-lutinit/generate.sh +++ b/fuzzers/010-lutinit/generate.sh @@ -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 diff --git a/fuzzers/011-ffconfig/generate.sh b/fuzzers/011-ffconfig/generate.sh index ea220557..8694068f 100644 --- a/fuzzers/011-ffconfig/generate.sh +++ b/fuzzers/011-ffconfig/generate.sh @@ -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 diff --git a/fuzzers/012-lut5/generate.sh b/fuzzers/012-lut5/generate.sh index d40bb231..1dfb2d44 100644 --- a/fuzzers/012-lut5/generate.sh +++ b/fuzzers/012-lut5/generate.sh @@ -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 diff --git a/fuzzers/013-intpips/generate.sh b/fuzzers/013-intpips/generate.sh index 81fce495..d7436dc8 100644 --- a/fuzzers/013-intpips/generate.sh +++ b/fuzzers/013-intpips/generate.sh @@ -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 diff --git a/gridinfo/runme.sh b/gridinfo/runme.sh index 91782a4c..5197b8a8 100644 --- a/gridinfo/runme.sh +++ b/gridinfo/runme.sh @@ -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} diff --git a/minitests/clbconfigs/runme.sh b/minitests/clbconfigs/runme.sh index 35013ead..684b3ba1 100644 --- a/minitests/clbconfigs/runme.sh +++ b/minitests/clbconfigs/runme.sh @@ -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 diff --git a/minitests/ffcfg/runme.sh b/minitests/ffcfg/runme.sh index 35013ead..684b3ba1 100644 --- a/minitests/ffcfg/runme.sh +++ b/minitests/ffcfg/runme.sh @@ -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 diff --git a/minitests/lvb_long_mux/runme.sh b/minitests/lvb_long_mux/runme.sh index 16925952..1d1b5f01 100644 --- a/minitests/lvb_long_mux/runme.sh +++ b/minitests/lvb_long_mux/runme.sh @@ -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 diff --git a/minitests/switchboxes/runme.sh b/minitests/switchboxes/runme.sh index c4f95471..fa6a6673 100644 --- a/minitests/switchboxes/runme.sh +++ b/minitests/switchboxes/runme.sh @@ -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