From bb7739fd7d070141023a483f08853c3c00c9c3aa Mon Sep 17 00:00:00 2001 From: Rick Altherr Date: Mon, 18 Dec 2017 15:35:22 -0800 Subject: [PATCH] fuzzers: use env vars to refer to tools Signed-off-by: Rick Altherr Signed-off-by: Tim 'mithro' Ansell --- fuzzers/011-ffconfig/generate.sh | 4 ++-- fuzzers/012-clbn5ffmux/generate.sh | 4 ++-- fuzzers/013-clbncy0/generate.sh | 4 ++-- fuzzers/014-ffsrcemux/generate.sh | 4 ++-- fuzzers/015-clbnffmux/generate.sh | 4 ++-- fuzzers/016-clbnoutmux/generate.sh | 4 ++-- fuzzers/016-clbnoutmux/o6.segbits | 8 -------- fuzzers/017-clbprecyinit/generate.sh | 4 ++-- 8 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 fuzzers/016-clbnoutmux/o6.segbits diff --git a/fuzzers/011-ffconfig/generate.sh b/fuzzers/011-ffconfig/generate.sh index d272452b..e6a8b5ba 100644 --- a/fuzzers/011-ffconfig/generate.sh +++ b/fuzzers/011-ffconfig/generate.sh @@ -2,7 +2,7 @@ set -ex -. ../../utils/genheader.sh +source ${XRAY_GENHEADER} #echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh @@ -10,7 +10,7 @@ python3 ../top.py >top.v vivado -mode batch -source ../generate.tcl for x in design*.bit; do - ../../../build/tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x + ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done python3 ../generate.py diff --git a/fuzzers/012-clbn5ffmux/generate.sh b/fuzzers/012-clbn5ffmux/generate.sh index 35c20d37..54774bf8 100644 --- a/fuzzers/012-clbn5ffmux/generate.sh +++ b/fuzzers/012-clbn5ffmux/generate.sh @@ -2,7 +2,7 @@ set -ex -. ../../utils/genheader.sh +source ${XRAY_GENHEADER} #echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh @@ -11,7 +11,7 @@ vivado -mode batch -source ../generate.tcl test -z "$(fgrep CRITICAL vivado.log)" for x in design*.bit; do - ../../../build/tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x + ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done python3 ../generate.py diff --git a/fuzzers/013-clbncy0/generate.sh b/fuzzers/013-clbncy0/generate.sh index 35c20d37..54774bf8 100644 --- a/fuzzers/013-clbncy0/generate.sh +++ b/fuzzers/013-clbncy0/generate.sh @@ -2,7 +2,7 @@ set -ex -. ../../utils/genheader.sh +source ${XRAY_GENHEADER} #echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh @@ -11,7 +11,7 @@ vivado -mode batch -source ../generate.tcl test -z "$(fgrep CRITICAL vivado.log)" for x in design*.bit; do - ../../../build/tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x + ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done python3 ../generate.py diff --git a/fuzzers/014-ffsrcemux/generate.sh b/fuzzers/014-ffsrcemux/generate.sh index d272452b..e6a8b5ba 100644 --- a/fuzzers/014-ffsrcemux/generate.sh +++ b/fuzzers/014-ffsrcemux/generate.sh @@ -2,7 +2,7 @@ set -ex -. ../../utils/genheader.sh +source ${XRAY_GENHEADER} #echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh @@ -10,7 +10,7 @@ python3 ../top.py >top.v vivado -mode batch -source ../generate.tcl for x in design*.bit; do - ../../../build/tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x + ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done python3 ../generate.py diff --git a/fuzzers/015-clbnffmux/generate.sh b/fuzzers/015-clbnffmux/generate.sh index 35c20d37..54774bf8 100644 --- a/fuzzers/015-clbnffmux/generate.sh +++ b/fuzzers/015-clbnffmux/generate.sh @@ -2,7 +2,7 @@ set -ex -. ../../utils/genheader.sh +source ${XRAY_GENHEADER} #echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh @@ -11,7 +11,7 @@ vivado -mode batch -source ../generate.tcl test -z "$(fgrep CRITICAL vivado.log)" for x in design*.bit; do - ../../../build/tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x + ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done python3 ../generate.py diff --git a/fuzzers/016-clbnoutmux/generate.sh b/fuzzers/016-clbnoutmux/generate.sh index 35c20d37..54774bf8 100644 --- a/fuzzers/016-clbnoutmux/generate.sh +++ b/fuzzers/016-clbnoutmux/generate.sh @@ -2,7 +2,7 @@ set -ex -. ../../utils/genheader.sh +source ${XRAY_GENHEADER} #echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh @@ -11,7 +11,7 @@ vivado -mode batch -source ../generate.tcl test -z "$(fgrep CRITICAL vivado.log)" for x in design*.bit; do - ../../../build/tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x + ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done python3 ../generate.py diff --git a/fuzzers/016-clbnoutmux/o6.segbits b/fuzzers/016-clbnoutmux/o6.segbits deleted file mode 100644 index 1ebfe71b..00000000 --- a/fuzzers/016-clbnoutmux/o6.segbits +++ /dev/null @@ -1,8 +0,0 @@ -CLB.SLICE_X0.AMUX.O6 30_11 -CLB.SLICE_X0.BMUX.O6 30_20 -CLB.SLICE_X0.CMUX.O6 30_45 -CLB.SLICE_X0.DMUX.O6 30_56 -CLB.SLICE_X1.AMUX.O6 31_09 -CLB.SLICE_X1.BMUX.O6 31_20 -CLB.SLICE_X1.CMUX.O6 31_43 -CLB.SLICE_X1.DMUX.O6 31_56 diff --git a/fuzzers/017-clbprecyinit/generate.sh b/fuzzers/017-clbprecyinit/generate.sh index 35c20d37..54774bf8 100644 --- a/fuzzers/017-clbprecyinit/generate.sh +++ b/fuzzers/017-clbprecyinit/generate.sh @@ -2,7 +2,7 @@ set -ex -. ../../utils/genheader.sh +source ${XRAY_GENHEADER} #echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh @@ -11,7 +11,7 @@ vivado -mode batch -source ../generate.tcl test -z "$(fgrep CRITICAL vivado.log)" for x in design*.bit; do - ../../../build/tools/bitread -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x + ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done python3 ../generate.py