Fix SDx/Scout paths in run scripts (Xilinx#1415)

build/board.sh

@@ -19,7 +19,8 @@ run=1
 tests=
 csv=
 select="PASS"
-rel=2018.3
+rel=2019.1
+sdxp="Scout"
 
 usage()
 {
@@ -28,7 +29,7 @@ usage()
     echo
     echo "[-help]                        List this help"
     echo "[-board <kcu1500|vcu1525|...>] Board to use"
-    echo "[-rel <2018.2|2018.3>          Select branch to havest xclbins from (default: 2018.3)"
+    echo "[-rel <2018.2|2018.3|...>      Select branch to havest xclbins from (default: $rel)"
     echo "[-select <regex>]              Pattern to grep for in csv to pick test (default: PASS)"
     echo "[-sync]                        Sync from sprite"
     echo "[-norun]                       Don't run, just rsync all tests"
@@ -41,28 +42,28 @@ usage()
     echo ""
     echo "With no optional options, this script runs all previously synced tests in"
     echo "current directory. "
-    echo "% board.sh -board vcu1525"
+    echo "% board.sh -board u200_xdma_201830_1"
     echo ""
     echo "Use -sync to sync all $rel UNIT_HW tests from latest sprite run into working directory."
-    echo "% board.sh -board vcu1525 -sync "
+    echo "% board.sh -board u200_xdma_201830_1 -sync"
     echo ""
     echo "Use -rel <release> to sync sprite tests from specified release"
-    echo "% board.sh -board u200 -rel 2018.2 -sync "
+    echo "% board.sh -board ... -rel 2019.1 -sync "
     echo ""
     echo "Use -tests <file> (without -sync) to run a subset of curently synced tests.  "
     echo "The specified file should have one tests per line"
-    echo "% board.sh -board vcu1525 -tests ~/tmp/files.txt"
+    echo "% board.sh -board u200 -tests ~/tmp/files.txt"
     echo ""
     echo "Use -csv (with -sync) to explicity specify a csv file to parse for tests to sync."
     echo "The board script supports any csv file for any suite.  By default the board script"
     echo "syncs the UNIT_HW test suite, so use -csv option to sync a different suite."
     echo "The path to the csv file must be a absolute path to sprite generated file."
-    echo "% board.sh -board vcu1525 -sync -csv /proj/fisdata2/results/sdx_${rel}/SDX_UNIT_HWBRD/sdx_u_hw_20180611_232013_lnx64.csv"
-    echo "% board.sh -board u200 -sync -csv /proj/fisdata2/results/sdx_2018.3/SDX_CRS_HWBRD/sdx_crs_hw_20181024_223210_lnx64.csv"
+    echo "% board.sh -board ... -sync -csv /proj/fisdata2/results/sdx_${rel}/SDX_UNIT_HWBRD/sdx_u_hw_20190411_232013_lnx64.csv"
+    echo "% board.sh -board ... -sync -csv /proj/fisdata2/results/sdx_2019.1/SDX_CRS_HWBRD/sdx_crs_hw_20190510_223210_lnx64.csv"
     echo ""
     echo "When selecting tests from csv file, only PASS tests are selected by default."
     echo "Use the -select option to pick any tests that matches the regular expression."
-    echo "% board.sh -board u200 -sync -select 'PASS|INTR' -csv <csv>"
+    echo "% board.sh -board ... -sync -select 'PASS|INTR' -csv <csv>"
     exit 1
 }
 
@@ -130,14 +131,18 @@ while [ $# -gt 0 ]; do
     esac
 done
 
-sdx=/proj/xbuilds/${rel}_daily_latest/installs/lin64/SDx/${rel}
+sdx=/proj/xbuilds/${rel}_daily_latest/installs/lin64/Scout/${rel}
+if [[ $rel < 2019.2 ]]; then
+    sdx=/proj/xbuilds/${rel}_daily_latest/installs/lin64/SDx/${rel}
+fi
 
 ################################################################
 # Environment
 ################################################################
-if [ "X$ini" != "X" ] ; then
- echo "SDACCEL_INI_PATH=$ini"
+if [[ "X$ini" != "X" ]] ; then
+ echo "XRT_INI_PATH=$ini"
  export SDACCEL_INI_PATH=$ini
+ export XRT_INI_PATH=$ini
 fi
 
 
@@ -157,6 +162,7 @@ export DSA=`${XILINX_XRT}/bin/xbutil list | grep '\[0\]' | cut -d' ' -f3`
 
 echo "XILINX_XRT      = $XILINX_XRT"
 echo "XILINX_SDX      = $XILINX_SDX"
+echo "XILINX_SCOUT    = $XILINX_SDX"
 echo "XILINX_OPENCL   = $XILINX_OPENCL"
 echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
 

build/run.sh

@@ -12,11 +12,10 @@ XRTBUILD=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 # and Vivado tools in addition to using XRT.
 
 # Set to location of your preferred SDx install
-sdx=/proj/xbuilds/2019.1_daily_latest/installs/lin64/SDx/2019.1
-#sdx=/home/soeren/perforce/sbx-p4/REL/2018.2/prep/rdi/sdx
+sdx=/proj/xbuilds/2019.2_daily_latest/installs/lin64/Scout/2019.2
 
 # Set to location of your preferred Vivado install
-vivado=/proj/xbuilds/2019.1_daily_latest/installs/lin64/Vivado/2019.1
+vivado=/proj/xbuilds/2019.2_daily_latest/installs/lin64/Vivado/2019.2
 
 ext=.o
 rel="Release"
@@ -114,6 +113,7 @@ fi
 
 if [[ "X$sdx" != "X" && -d "$sdx" ]] ; then
  export XILINX_SDX=${XILINX_SDX:=$sdx}
+ export XILINX_SCOUT=$XILINX_SDX
  export XILINX_OPENCL=$XILINX_SDX
  export SDX_CXX_PATH=${SDX_CXX_PATH:=$XILINX_SDX/bin/xcpp}
  export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$XILINX_SDX/lib/lnx64${ext}/Default:$XILINX_SDX/lib/lnx64${ext}:$XILINX_SDX/runtime/lib/x86_64