Remove obsolete env vars from run and board scripts (#5530)

Also remove dead code related to these variables.

Author: stsoe

build/board.sh

@@ -20,7 +20,6 @@ tests=
 csv=
 select="PASS"
 rel=2019.1
-sdxp="Scout"
 
 usage()
 {
@@ -38,7 +37,6 @@ usage()
     echo "[-csv <path>]                  Path to csv file to parse for tests"
     echo "[-ini <path>]                  Path to sdaccel.ini file"
     echo "[-xrt <path>]                  Path to XRT install (default: $xrt)"
-    echo "[-sdx <path>]                  Path to SDx install (default: $sdx)"
     echo ""
     echo "With no optional options, this script runs all previously synced tests in"
     echo "current directory. "
@@ -104,11 +102,6 @@ while [ $# -gt 0 ]; do
             csv=$1
             shift
             ;;
-        -sdx)
-            shift
-            sdx=$1
-            shift
-            ;;
         -select)
             shift
             select=$1
@@ -131,11 +124,6 @@ while [ $# -gt 0 ]; do
     esac
 done
 
-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
 ################################################################
@@ -150,24 +138,14 @@ if [[ "X$xrt" != "X" && -d "$xrt" ]] ; then
  export XILINX_XRT=${XILINX_XRT:=$xrt}
  export LD_LIBRARY_PATH=$XILINX_XRT/lib
  export PATH=$XILINX_XRT/bin:${PATH}
- echo "echo $XILINX_XRT/lib/libxilinxopencl.so > /etc/OpenCL/vendors/xilinx.icd"
- echo "$XILINX_XRT/lib/libxilinxopencl.so" | sudo tee /etc/OpenCL/vendors/xilinx.icd > /dev/null
-fi
-
-if [[ "X$sdx" != "X" && -d "$sdx" ]] ; then
- export XILINX_SDX=${XILINX_SDX:=$sdx}
- export XILINX_OPENCL=$XILINX_SDX
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$XILINX_SDX/lib/lnx64.o/Default:$XILINX_SDX/lib/lnx64.o:$XILINX_SDX/runtime/lib/x86_64
+ export OCL_ICD_VENDORS=$XILINX_XRT/lib/libxilinxopencl.so
 fi
 
 export DSA=`${XILINX_XRT}/bin/xbutil scan | grep '\[0\]' | cut -d':' -f5 | cut -d'(' -f1`
 
 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"
-
+echo "OCL_ICD_VENDORS = $OCL_ICD_VENDORS"
 
 ################################################################
 # Test extraction
@@ -235,8 +213,6 @@ for f in ${tests[*]}; do
   echo "================================================================"
   echo "RUNDIR          = $PWD"
   echo "XILINX_XRT      = $XILINX_XRT"
-  echo "XILINX_SDX      = $XILINX_SDX"
-  echo "XILINX_OPENCL   = $XILINX_OPENCL"
   echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
   echo "DSA		= $DSA"
   echo "================================================================"

build/run.sh

@@ -7,15 +7,8 @@
 #  % run.sh -dbg emacs
 XRTBUILD=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
-# Define SDX and VIVADO to allow this loader script to be used
-# through other scripts (e.g. sprite scripts) that invoke SDx
-# and Vivado tools in addition to using XRT.
-
-# Set to location of your preferred SDx install
-vitis=/proj/xbuilds/2020.2_released/installs/lin64/Vitis/2020.2
-
-# Set to location of your preferred Vivado install
-vivado=/proj/xbuilds/2020.2_released/installs/lin64/Vivado/2020.2
+# Set to location of your preferred Vitis install
+vitis=/proj/xbuilds/2021.1_released/installs/lin64/Vitis/2021.1
 
 ext=.o
 rel="Release"
@@ -34,7 +27,6 @@ usage()
     echo "[-conf]                    Run conformance mode testing"
     echo "[-ini <path>]              Set SDACCEL_INI_PATH"
     echo "[-vitis <path>]            Specify Vitis install (default: $vitis)"
-    echo "[-vivado <path>]           Specify Vivado install (default: $vivado)"
     echo "[-xrt <path>]              Path to XRT install (default: $XRTBUILD/opt/xilinx/xrt)"
     echo "[-ldp <path>]              Prepend path to LD_LIBRARY_PATH"
     echo "[--]                       End option parsing for this script invocation"
@@ -71,11 +63,6 @@ while [ $# -gt 0 ]; do
             vitis=$1
             shift
             ;;
-        -vivado)
-            shift
-            vivado=$1
-            shift
-            ;;
         -ini)
             shift
             ini=$1
@@ -126,24 +113,16 @@ fi
 
 if [[ "X$vitis" != "X" && -d "$vitis" ]] ; then
  export XILINX_VITIS=${XILINX_VITIS:=$vitis}
- export XILINX_OPENCL=$XILINX_VITIS
  export VITIS_CXX_PATH=${VITIS_CXX_PATH:=$XILINX_VITIS/bin/xcpp}
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$XILINX_VITIS/lib/lnx64${ext}/Default:$XILINX_VITIS/lib/lnx64${ext}:$XILINX_VITIS/runtime/lib/x86_64
-fi
-
-if [[ "X$vivado" != "X" && -d "$vivado" ]] ; then
- export XILINX_VIVADO=${XILINX_VIVADO:=$vivado}
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$XILINX_VIVADO/lib/lnx64${ext}
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$XILINX_VITIS/lib/lnx64${ext}
 fi
 
 if [ "X$ldp" != "X" ] ; then
  export LD_LIBRARY_PATH=$ldp:${LD_LIBRARY_PATH}
 fi
 
-echo "XILINX_OPENCL=$XILINX_OPENCL"
 echo "XILINX_XRT=$XILINX_XRT"
 echo "XILINX_VITIS=$XILINX_VITIS"
-echo "XILINX_VIVADO=$XILINX_VIVADO"
 echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 echo "OCL_ICD_VENDORS=$OCL_ICD_VENDORS"
 echo "PATH=$PATH"

src/runtime_src/xocl/core/platform.cpp

@@ -35,18 +35,6 @@ namespace {
 
 static xocl::platform* g_platform = nullptr;
 
-static const char*
-value_or_empty(const char* value)
-{
-  return value ? value : "";
-}
-
-static std::string
-get_env(const char* env)
-{
-  return value_or_empty(std::getenv(env));
-}
-
 } // namespace
 
 namespace xocl {
@@ -175,18 +163,4 @@ get_num_platforms()
   return g_platform ? 1 : 0;
 }
 
-std::string
-get_xilinx_opencl()
-{
-  static std::string xilinx_opencl = get_env("XILINX_OPENCL");
-  return xilinx_opencl;
-}
-
-std::string
-get_xilinx_sdx()
-{
-  static std::string xilinx_sdx = get_env("XILINX_SDX");
-  return xilinx_sdx;
-}
-
 } // xocl

src/runtime_src/xocl/core/platform.h

@@ -117,30 +117,6 @@ get_shared_platform();
 unsigned int
 get_num_platforms();
 
-/**
- * @return
- *   The value of XILINX_OPENCL if set, empty otherwise
- */
-std::string
-get_xilinx_opencl();
-
-/**
- * @return
- *   The value of XILINX_SDX if set, empty otherwise
- */
-std::string
-get_xilinx_sdx();
-
-/**
- * @return
- *   The install root (same as xilinx_opencl)
- */
-inline std::string
-get_install_root()
-{
-  return get_xilinx_opencl();
-}
-
 } // xocl
 
 #endif