Tools: Test: Changes for process_test.m run with xt-xcc

This patch adds to process_test() sixth argument to run the tests
with xt-run environment with argument set to 'xt-run' or
'xt-run --turbo'.

The set and print of LD_LIBRARY_PATH is no more needed with static
testbench version.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

Author: singalsu

tools/test/audio/comp_run.sh

@@ -27,7 +27,8 @@ FS_OUT=48000
 FN_IN=input.raw
 FN_OUT=output.raw
 FN_TRACE:=trace.txt # This is default value if FN_TRACE is not set via -e option
-VALGRIND=yes
+VALGRIND=true
+XTRUN=
 EOFHELP
 }
 
@@ -42,10 +43,11 @@ parse_args ()
     FS_IN=48000
     FS_OUT=
     VALGRIND=true
-    DEBUG=
+    DEBUG=-q
     SOURCED_CONFIG=false
     FN_TRACE=
     EXTRA_OPTS=
+    XTRUN=
 
     while getopts ":he:t:" opt; do
 	case "${opt}" in
@@ -121,18 +123,42 @@ run_testbench ()
 
 parse_args "$@"
 
-# Paths
-HOST_ROOT=../../testbench/build_testbench
-HOST_EXE=$HOST_ROOT/install/bin/testbench
-HOST_LIB=$HOST_ROOT/sof_ep/install/lib
-TPLG_LIB=$HOST_ROOT/sof_parser/install/lib
+# Path to topologies
 TPLG_DIR=../../build_tools/test/topology
 
+# Testbench path and executable
+if [[ -z $XTRUN ]]; then
+    TESTBENCH=../../testbench/build_testbench/install/bin/testbench
+else
+    BUILD_DIR=../../testbench/build_xt_testbench
+    TESTBENCH="$BUILD_DIR"/testbench
+    source "$BUILD_DIR"/xtrun_env.sh
+    XTRUN_CMD=$XTENSA_PATH/$XTRUN
+    if $VALGRIND; then
+	>&2 printf "WARNING: Ignoring VALGRIND with xt-run\n"
+	VALGRIND=false
+    fi
+fi
+
+if $VALGRIND; then
+    VALGRIND_CMD="valgrind --leak-check=yes --error-exitcode=1"
+else
+    VALGRIND_CMD=
+fi
+
+HOST_EXE="$XTRUN_CMD $TESTBENCH"
+
 # Use topology from component test topologies
 INFMT=s${BITS_IN}le
 OUTFMT=s${BITS_OUT}le
 TPLGFN=test-${DIRECTION}-ssp5-mclk-0-I2S-${COMP}-${INFMT}-${OUTFMT}-48k-24576k-codec.tplg
 TPLG=${TPLG_DIR}/${TPLGFN}
+[ -f "$TPLG" ] || {
+    echo
+    echo "Error: topology $TPLG does not exist."
+    echo "Please run scripts/build-tools.sh -t"
+    exit 1
+}
 
 # If binary test vectors
 if [ "${FN_IN: -4}" == ".raw" ]; then
@@ -146,17 +172,9 @@ OPTS="$DEBUG -r $FS_IN -R $FS_OUT -c $CHANNELS_IN -n $CHANNELS_OUT $BINFMT -t $T
 DATA="-i $FN_IN -o $FN_OUT"
 ARG="$OPTS $EXTRA_OPTS $DATA"
 CMD="$HOST_EXE $ARG"
-if "$VALGRIND"; then
-    VALGRIND_CMD="valgrind --leak-check=yes --error-exitcode=1"
-else
-    VALGRIND_CMD=
-fi
-
-export LD_LIBRARY_PATH=$HOST_LIB:$TPLG_LIB
 
 # Run test bench
 echo "Command:         $HOST_EXE"
 echo "Argument:        $ARG"
-echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
 
 run_testbench

tools/test/audio/process_test.m

@@ -1,12 +1,24 @@
 % process_test - test objective audio quality parameters
 %
-% process_test(comp, bits_in_list, bits_out_list, fs)
+% process_test(comp, bits_in_list, bits_out_list, fs, fulltest, xtrun)
+%
+% Inputs
+%   comp - component to test
+%   bits_in_list - input word lengths
+%   bits_out_list - output workd lengths
+%   fs - sample rate
+%   fulltest - 0 perform only chirp test, 1 perform all
+%   xtrun - set to 'xt-run' or 'xt-run --turbo' to test with xt-testbench
+%
+% E.g.
+% process_test('eq-iir', 32, 32, 48000, 0, 'xt-run --turbo');
+% process_test('eq-iir', 32, 32);
 
 % SPDX-License-Identifier: BSD-3-Clause
 % Copyright(c) 2017-2022 Intel Corporation. All rights reserved.
 % Author: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
 
-function  [n_fail, n_pass, n_na] = process_test(comp, bits_in_list, bits_out_list, fs, fulltest)
+function  [n_fail, n_pass, n_na] = process_test(comp, bits_in_list, bits_out_list, fs, fulltest, xtrun)
 	%% Defaults for call parameters
 	if nargin < 1
 		comp = 'EQIIR';
@@ -28,6 +40,10 @@
 		fulltest = 1;
 	end
 
+	if nargin < 6
+		xtrun = '';
+	end
+
 	%% Paths
 	t.blobpath = '../../topology/topology1/m4';
 	plots = 'plots';
@@ -44,6 +60,7 @@
 	t.bits_in = bits_in_list;              % Input word length from func arguments
 	t.bits_out = bits_out_list;            % Output word length from func arguments
 	t.full_test = fulltest;                % 0 is quick check only, 1 is full test
+	t.xtrun = xtrun;
 
 	%% Show graphics or not. With visible plot windows Octave may freeze if too
 	%  many windows are kept open. As workaround setting close windows to
@@ -335,6 +352,7 @@
 	test.ch = t.ch;
 	test.fs = t.fs;
 	test.plot_visible = t.plot_visible;
+	test.xtrun = t.xtrun;
 
 	% Misc
 	test.quick = 0;

tools/test/audio/test_utils/test_run.m

@@ -86,6 +86,12 @@
 	fprintf(fh, 'FN_TRACE=\"/dev/null"\n');
 end
 
+if isfield(test, 'xtrun')
+	fprintf(fh, 'XTRUN=\"%s\"\n', test.xtrun);
+else
+	fprintf(fh, 'XTRUN=\n');
+end
+
 % Override defaults in comp_run.sh
 fprintf(fh, 'VALGRIND=false\n');
 fclose(fh);