scripts: testbench: move build output outside of source directory

Move all testbench build and test collateral outside of the SOF source
directory to the workspace directory.

Signed-off-by: Liam Girdwood <liam.r.girdwood@intel.com>

Author: lgirdwood

scripts/rebuild-testbench.sh

@@ -5,16 +5,32 @@
 # stop on most errors
 set -e
 
-SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
-SOF_REPO=$(dirname "$SCRIPT_DIR")
-TESTBENCH_DIR="$SOF_REPO"/tools/testbench
+# This script can be executed from the sof firmware toplevel or workspace directory
+# First check for the worksapce environment variable
+if [ -z "$SOF_WORKSPACE" ]; then
+    # Environment variable is empty or unset so use default
+    BASE_DIR="$HOME/work/sof"
+else
+    # Environment variable exists and has a value
+    BASE_DIR="$SOF_WORKSPACE"
+fi
+cd "$BASE_DIR"
+
+# check we are in the workspace directory
+if [ ! -d "sof" ]; then
+    echo "Error: can't find SOF firmware directory. Please check your installation."
+    exit 1
+fi
+
+TESTBENCH_DIR=$BASE_DIR/sof/tools/testbench
 
 # Defaults
 BUILD_BACKEND='make'
 BUILD_TYPE=native
-BUILD_DIR_NAME=build_testbench
+BUILD_DIR_NAME=$BASE_DIR/build_testbench
 BUILD_TARGET=install
 : "${SOF_AFL:=$HOME/sof/work/AFL/afl-gcc}"
+SCRIPT_DIR=$BASE_DIR/sof/scripts
 
 print_usage()
 {
@@ -59,7 +75,7 @@ setup_xtensa_tools_build()
 {
     BUILD_TYPE=xt
     BUILD_TARGET=
-    BUILD_DIR_NAME=build_xt_testbench
+    BUILD_DIR_NAME=$BASE_DIR/build_xt_testbench
 
     # check needed environment variables
     test -n "${XTENSA_TOOLS_ROOT}" || die "XTENSA_TOOLS_ROOT need to be set.\n"
@@ -90,7 +106,7 @@ setup_xtensa_tools_build()
 
 export_xtensa_setup()
 {
-    export_dir=$TESTBENCH_DIR/$BUILD_DIR_NAME
+    export_dir=$BUILD_DIR_NAME
     export_script=$export_dir/xtrun_env.sh
     xtbench=$export_dir/sof-testbench4
     xtbench_run="XTENSA_CORE=$XTENSA_CORE \$XTENSA_TOOLS_ROOT/$install_bin/xt-run $xtbench"
@@ -114,14 +130,14 @@ Success!
 
 For temporary, interactive Kconfiguration use:
 
-   $BUILD_BACKEND -C $TESTBENCH_DIR/$BUILD_DIR_NAME/sof_ep/build/  menuconfig
+   $BUILD_BACKEND -C $BUILD_DIR_NAME/sof_ep/build/  menuconfig
 
 Permanent configuration is "src/arch/host/configs/library_defconfig".
 
 For instant, incremental build:
 
    $src_env_msg
-   $BUILD_BACKEND -C $TESTBENCH_DIR/$BUILD_DIR_NAME/ -j$(nproc)
+   $BUILD_BACKEND -C $BUILD_DIR_NAME/ -j$(nproc)
 
 EOF0
 

scripts/sof-testbench-build-profile.sh

@@ -34,7 +34,7 @@ fi
 
 #set default values
 PLATFORM=none
-PDIR=$PWD/sof/tools/testbench/profile
+PDIR=$PWD/testbench/profile
 
 while getopts "hp:d:" opt; do
     case "${opt}" in

scripts/sof-testbench-helper.sh

@@ -130,14 +130,14 @@ if [[ "$BITS" == "24" ]]; then
 else
     sox --encoding signed-integer "$CLIP" -L -r "$RATE_IN" -c "$CHANNELS_IN" -b "$BITS" "$INFILE1"
 fi
-
-TB4="$PWD/sof/tools/testbench/build_testbench/install/bin/sof-testbench4"
-XTB4="$PWD/sof/tools/testbench/build_xt_testbench/sof-testbench4"
-XTB4_SETUP="$PWD/sof/tools/testbench/build_xt_testbench/xtrun_env.sh"
+TOOLSDIR="$PWD/build_tools/testbench"
+TB4="$PWD/build-testbench/install/bin/sof-testbench4"
+XTB4="$PWD/build-xt-testbench/sof-testbench4"
+XTB4_SETUP="$PWD/build-xt-testbench/xtrun_env.sh"
 if [ -z "$TPLG0" ]; then
-    TPLG="$PWD/sof/tools/build_tools/topology/topology2/development/sof-hda-benchmark-${MODULE}${BITS}.tplg"
+    TPLG="$PWD/build_tools/topology/topology2/development/sof-hda-benchmark-${MODULE}${BITS}.tplg"
 else
-    TPLG="$PWD/sof/tools/build_tools/topology/topology2/$TPLG0"
+    TPLG="$PWD/build_tools/topology/topology2/$TPLG0"
 fi
 FMT="S${BITS}_LE"
 OPTS="-r $RATE_IN -R $RATE_OUT -c $CHANNELS_IN -c $CHANNELS_OUT -b $FMT -p $PIPELINES -t $TPLG -i $INFILE1 -o $OUTFILE1"

tools/test/audio/comp_run.sh

@@ -132,13 +132,13 @@ run_testbench ()
 parse_args "$@"
 
 # Path to topologies
-TPLG_DIR=../../build_tools/test/topology
+TPLG_DIR=../../../../build_tools/test/topology
 
 # Testbench path and executable
 if [[ -z $XTRUN ]]; then
-    PATH_TESTBENCH=../../testbench/build_testbench/install/bin/$TESTBENCH
+    PATH_TESTBENCH=../../../../build_testbench/install/bin/$TESTBENCH
 else
-    BUILD_DIR=../../testbench/build_xt_testbench
+    BUILD_DIR=../../../../build_xt_testbench
     PATH_TESTBENCH="$BUILD_DIR"/$TESTBENCH
     source "$BUILD_DIR"/xtrun_env.sh
     XTRUN_CMD=$XTENSA_PATH/$XTRUN
@@ -168,7 +168,7 @@ PIPELINES=
     [[ $DIRECTION == "playback" ]] && PIPELINES="-p 1,2"
     [[ $DIRECTION == "capture" ]] && PIPELINES="-p 3,4"
     TPLGFN=sof-hda-benchmark-${COMP}${BITS_IN}.tplg
-    TPLG_DIR="../../build_tools/topology/topology2/development"
+    TPLG_DIR="../../../../build_tools/topology/topology2/development"
     TPLG_BUILD_TIP="Please run scripts/build-tools.sh"
 }