Skip to content

[TEST][DNM] make 3 components modular #9296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lyakh wants to merge 12 commits into from
Closed

[TEST][DNM] make 3 components modular #9296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7e4837
llext: fix Windows builds
lyakh Jun 7, 2024
b95d626
ipc4: a failure to find a driver might not be fatal
lyakh Jun 7, 2024
95a0aeb
samples: (cosmetic) clean up Kconfig spacing
lyakh Jun 13, 2024
543272f
llext: add maximum instance count support
lyakh Jun 14, 2024
8891fb2
rimage: propagate maximum module instance counts
lyakh Jun 14, 2024
b06f65b
llext: remove logging during module freeing
lyakh Jun 17, 2024
261dd24
llext: disable when testing reproducible builds
lyakh Jul 2, 2024
918bf13
kcps: fix 0 module CPC case
lyakh Jun 26, 2024
de7e4a7
llext: make 3 components modular by default on MTL
lyakh Jul 11, 2024
2d727e5
perf: fix SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=n
lyakh Jul 11, 2024
5a62148
llext: disable performance, it breaks llext
lyakh Jul 11, 2024
8bb79f8
Disable KCPS_DYNAMIC_CLOCK_CONTROL to test speaker-test
lyakh Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
llext: fix Windows builds 
Under windows the Python interpreter has to be called explicitly.
Without it an attempt to execute a Python script fails silently.

Signed-off-by: Guennadi Liakhovetski <[email protected]>
  • Loading branch information
@lyakh
lyakh committed Jul 11, 2024
commit b7e483752f23d31d3d272ce5cae27dac3b80d08a
14 changes: 13 additions & 1 deletion scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import gzip
import dataclasses
import concurrent.futures as concurrent
import re

from west import configuration as west_config

Expand Down Expand Up @@ -945,7 +946,18 @@ def install_lib(sof_lib_dir, abs_build_dir, platform_wconfig):
llext_input = entry_path / (llext_base + '.llext')
llext_output = entry_path / (llext_file + '.ri')

sign_cmd = [platform_wconfig.get("rimage.path"), "-o", str(llext_output),
# on Windows platform_wconfig.get("rimage.path") returns a string
# with multiple nested single and double quotes, which then break
# execution:
# In dir: D:\a\sof\sof\workspace; running command:
# ''"'"'D:\a\sof\sof\workspace\build-rimage\rimage.EXE'"'"'' -o
# 'D:\a\sof\sof\workspace\build-mtl\zephyr\eq_iir_llext\eq_iir.llext.ri' -e
# -c 'D:\a\sof\sof\workspace\build-mtl\zephyr\eq_iir_llext\rimage_config.toml'
# -k 'D:\a\sof\sof\workspace\sof\keys\otc_private_key_3k.pem' -l
# -r 'D:\a\sof\sof\workspace\build-mtl\zephyr\eq_iir_llext\eq_iir.llext'
# The regex below cleans them up
rimage_cmd = re.sub(r"[\"']", "", platform_wconfig.get("rimage.path"))
sign_cmd = [rimage_cmd, "-o", str(llext_output),
"-e", "-c", str(rimage_cfg),
"-k", str(signing_key), "-l", "-r",
str(llext_input)]
Expand Down
2 changes: 1 addition & 1 deletion zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function(sof_llext_build module)
get_target_property(proc_out_file ${module} pkg_input)
add_llext_command(TARGET ${module}
POST_BUILD
COMMAND ${SOF_BASE}scripts/llext_link_helper.py
COMMAND ${PYTHON_EXECUTABLE} ${SOF_BASE}scripts/llext_link_helper.py
--text-addr="${SOF_LLEXT_TEXT_ADDR}" -f ${proc_in_file} ${CMAKE_C_COMPILER} --
-o ${proc_out_file} ${EXTRA_LINKER_PARAMS}
$<TARGET_OBJECTS:${module}_llext_lib>
Expand Down