WIP: tflm test module for WOV

app/boards/intel_adsp_ace15_mtpm.conf

@@ -17,6 +17,11 @@ CONFIG_FORMAT_CONVERT_HIFI3=n
 CONFIG_SAMPLE_KEYPHRASE=y
 CONFIG_COMP_PHASE_VOCODER=y
 CONFIG_COMP_STFT_PROCESS=y
+CONFIG_SOF_STAGING=y
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
+CONFIG_COMP_TENSORFLOW=m
+CONFIG_STACK_SIZE_EDF=32768
 
 # SOF / audio modules / mocks
 # This mock is part of official sof-bin releases because the CI that
@@ -52,7 +57,7 @@ CONFIG_SOF_LOG_LEVEL_INF=y
 CONFIG_DEBUG_COREDUMP=y
 CONFIG_DEBUG_COREDUMP_BACKEND_INTEL_ADSP_MEM_WINDOW=y
 CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y
-CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_HEAP_MEM_POOL_SIZE=32768
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_LLEXT_EXPERIMENTAL=y

app/boards/intel_adsp_ace30_ptl.conf

@@ -15,6 +15,12 @@ CONFIG_FORMAT_CONVERT_HIFI3=n
 CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=m
 CONFIG_GOOGLE_RTC_AUDIO_PROCESSING_MOCK=y
 CONFIG_COMP_STFT_PROCESS=y
+CONFIG_SOF_STAGING=y
+CONFIG_COMP_KPB=y
+CONFIG_COMP_TENSORFLOW=y
+CONFIG_COMP_MFCC=y
+CONFIG_COMP_VOLUME=y
+CONFIG_COMP_GAIN=y
 
 # SOF / infrastructure
 CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
@@ -29,7 +35,7 @@ CONFIG_COLD_STORE_EXECUTE_DRAM=y
 CONFIG_INTEL_MODULES=y
 CONFIG_LIBRARY_AUTH_SUPPORT=y
 CONFIG_LIBRARY_MANAGER=y
-CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000
+CONFIG_LIBRARY_BASE_ADDRESS=0xa0700000
 CONFIG_LIBRARY_BUILD_LIB=y
 CONFIG_LIBRARY_DEFAULT_MODULAR=y
 

app/llext_relocatable.conf

@@ -1 +1,2 @@
 CONFIG_LLEXT_TYPE_ELF_RELOCATABLE=y
+CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID=y

scripts/llext_link_helper.py

@@ -77,6 +77,23 @@ def main():
 
 	command = [args.command]
 
+	# If the linker command is clang, extract --target= and --ld-path= from params
+	# and add them to the command (before the linker flags). Without --target,
+	# clang uses the host target (x86_64) when invoking the linker, which fails
+	# for cross-compiled (e.g. xtensa) object files.
+	clang_flags_to_hoist = []
+	remaining_params = []
+	for p_arg in args.params:
+		if p_arg.startswith('--target=') or p_arg.startswith('--ld-path='):
+			clang_flags_to_hoist.append(p_arg)
+		else:
+			remaining_params.append(p_arg)
+	if clang_flags_to_hoist:
+		command.extend(clang_flags_to_hoist)
+		args.params = remaining_params
+
+	is_relocatable = '-r' in args.params
+
 	executable = []
 	writable = []
 	readonly = []
@@ -111,7 +128,8 @@ def main():
 				text_found = True
 				text_addr = max_alignment(text_addr, 0x1000, s_alignment)
 				text_size = s_size
-				command.append(f'-Wl,-Ttext=0x{text_addr:x}')
+				if not is_relocatable:
+					command.append(f'-Wl,-Ttext=0x{text_addr:x}')
 			else:
 				executable.append(section)
 
@@ -164,7 +182,8 @@ def main():
 
 		dram_addr = align_up(dram_addr, s_alignment)
 
-		command.append(f'-Wl,--section-start={s_name}=0x{dram_addr:x}')
+		if not is_relocatable:
+			command.append(f'-Wl,--section-start={s_name}=0x{dram_addr:x}')
 
 		dram_addr += section.header['sh_size']
 
@@ -177,7 +196,8 @@ def main():
 
 		dram_addr = align_up(dram_addr, s_alignment)
 
-		command.append(f'-Wl,--section-start={s_name}=0x{dram_addr:x}')
+		if not is_relocatable:
+			command.append(f'-Wl,--section-start={s_name}=0x{dram_addr:x}')
 
 		dram_addr += section.header['sh_size']
 
@@ -189,7 +209,8 @@ def main():
 
 		start_addr = align_up(start_addr, s_alignment)
 
-		command.append(f'-Wl,--section-start={s_name}=0x{start_addr:x}')
+		if not is_relocatable:
+			command.append(f'-Wl,--section-start={s_name}=0x{start_addr:x}')
 
 		start_addr += section.header['sh_size']
 
@@ -201,12 +222,22 @@ def main():
 
 		start_addr = align_up(start_addr, s_alignment)
 
-		if s_name == '.data':
-			command.append(f'-Wl,-Tdata=0x{start_addr:x}')
-		else:
-			command.append(f'-Wl,--section-start={s_name}=0x{start_addr:x}')
-
-		start_addr += section.header['sh_size']
+		if not is_relocatable:
+			if s_name == '.data':
+				command.append(f'-Wl,-Tdata=0x{start_addr:x}')
+			else:
+				command.append(f'-Wl,--section-start={s_name}=0x{start_addr:x}')
+
+	ld_script_path = pathlib.Path(args.file).parent / 'llext_merge.ld'
+	with open(ld_script_path, 'w') as f_ld:
+		f_ld.write('SECTIONS\n{\n'
+			   '  .text : { *(.text .text.* .stub .gnu.linkonce.t.*) }\n'
+			   '  .literal : { *(.literal .literal.*) }\n'
+			   '  .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }\n'
+			   '  .data : { *(.data .data.* .gnu.linkonce.d.*) }\n'
+			   '  .bss : { *(.bss .bss.* COMMON) }\n'
+			   '}\n')
+	command.append(f'-Wl,-T,{ld_script_path}')
 
 	command.extend(['-o', f'{args.file}.tmp'])
 	command.extend(args.params)
@@ -215,6 +246,18 @@ def main():
 
 	copy_command = [args.copy]
 
+	copy_command.extend([
+		'--strip-debug',
+		'--remove-section=.comment',
+		'--remove-section=.llvm_addrsig',
+		'--remove-section=.eh_frame',
+		'--remove-section=.rela.eh_frame',
+		'--remove-section=.xt.prop',
+		'--remove-section=.rela.xt.prop',
+		'--remove-section=.xt.lit',
+		'--remove-section=.rela.xt.lit',
+	])
+
 	if first_dram_text:
 		copy_command.extend(['--set-section-alignment', f'{first_dram_text}=4096'])
 	if first_dram_rodata:

scripts/llext_offset_calc.py

@@ -47,6 +47,9 @@ def get_elf_size(elf_name):
 			if section.header['sh_addr'] + section.header['sh_size'] > end:
 				end = section.header['sh_addr'] + section.header['sh_size']
 
+		if start == 0xffffffff:
+			return 0
+
 		size = end - start
 
 	return size