testbench: dont build testbench, tools and topologies in the source directory #9871
Conversation
lgirdwood
requested review from
plbossart,
mmaka1,
lbetlej,
dbaluta and
kv2019i
as code owners
|
I expect this to break CI if we have hard coded assumptions of where to find certain binaries. |
scripts/sof-testbench-helper.sh
Outdated
| echo Converting raw output to "$OUTWAV" | ||
| if [[ "$BITS" == "24" ]]; then | ||
| sox --encoding signed-integer -L -r "$RATE_OUT" -c "$CHANNELS_OUT" -b 32 "$OUTFILE1" "$OUTWAV" vol 256 | ||
| sox --encoding signed-integer -L -r "$RATE_OUT" -c "$CHANNELS_OUT" -b 32 \ |
There was a problem hiding this comment.
The original indentation seems to have been correct. Also this and the following line shouldn't have equal indentation
There was a problem hiding this comment.
This file is a mixture of tabs/spaces for indentation. Fixed this part.
| echo "Error: environment variable SOF_WORKSPACE need to be set to top level sof directory" | ||
|
|
||
| # check if we are in the sof FW directory | ||
| if [ -f "Kconfig.sof" ]; then |
There was a problem hiding this comment.
can we maybe use something like $(dirname "$0") to identify the target directory, where we have to switch to? Then it'll be possible to call the script from anywhere
There was a problem hiding this comment.
That adds a bit of complexity if we say this is allowed to be executed from anywhere, in general this will be called from the SOF directory or the parent SOF workspace directory.
There was a problem hiding this comment.
Ok, simplified this for non default installs - it will now check for SOF_WORKSPACE environment if set.
There was a problem hiding this comment.
No blockers, @singalsu probably better to comment on the end-user impact on testbench scripting (see my comment).
This will need to be merged at the same time with Jenkins build changes. Another option is to make the build-outside-src an option, merge this in SOF and let Jenkins adopt this when it is ready (no flag day approach).
lgirdwood
force-pushed
the
lrg/topic/testbench
branch
from
5d17e7d to
a4b62b7
Compare
|
This depends on #9870 so DNM as for now. |
There was a problem hiding this comment.
Looks good so far, please add these changes to keep Matlab script tests working
diff --git a/tools/test/audio/comp_run.sh b/tools/test/audio/comp_run.sh
index 096ff2c34..6beaf74f5 100755
--- a/tools/test/audio/comp_run.sh
+++ b/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"
}
a4b62b7 to
36f7844
Compare
|
Changes for V2:
|
lgirdwood
force-pushed
the
lrg/topic/testbench
branch
from
36f7844 to
4417390
Compare
|
depends on #9870 |
|
@jsarha fyi - was meaning this one. |
lgirdwood
force-pushed
the
lrg/topic/testbench
branch
from
4417390 to
03dbc88
Compare
|
Rebased now that #9870 is merged |
Yeah - hopefully the last one. @cgturner1 pls see jenkins build i.e. we no longer build tools in the src directory. |
|
ok will need to take a look...a lot of the issues stem from the user settings (in scripts/sudo-cwd.sh) being done in the docker which seem to be from the way it mounts uses the local volumes as a workspace and it sems to restrict the user "cwd" from creating directories in certain places ...ideally this docker should run as the sof user and we would be fine..i'll need to figure out the change to get this to cooperate at least to get the mkdir to work. will run some tests and update when i get this updated |
Allow both scripts to be executed from the SOF FW directory or the parent SOF workspace directory using an environment variable or the default SOF workspace. This simplifies usage and opens the way for vscode integration. Signed-off-by: Liam Girdwood <[email protected]>
Dont built binaries in the source directory, build in the workspace. Signed-off-by: Liam Girdwood <[email protected]>
Fix the indentation. Signed-off-by: Liam Girdwood <[email protected]>
Move all testbench build and test collateral outside of the SOF source directory to the workspace directory. Signed-off-by: Liam Girdwood <[email protected]>
Move the test data files outside of the source directory and add more context to their names for easier lookup. Do the same with the outfile and generate it if we keep the temporary files. Signed-off-by: Liam Girdwood <[email protected]>
Add a simple deployment option fro topology2 to copy topologies to the staging build directory. Simple today as only Intel use tplg2. Signed-off-by: Liam Girdwood <[email protected]>
lgirdwood
force-pushed
the
lrg/topic/testbench
branch
from
03dbc88 to
2aba76b
Compare
Currently all topologies, testbench and some tools are built within the FW source directory unlike FW which has separate binary destination directories outside of the main FW source directory.
This series moves all tools, testbench and topologies binaries to outside the source directory to the parent SOF "workspace" directory alongside the FW build output directories.