[CI ONLY] Test

lmdk/libraries/dummy/dummy_mtl.toml

@@ -60,7 +60,7 @@ count = 1
 
 	[[module.entry]]
 	name = "DUMMY"
-	uuid = "01010101-0101-0101-0101-010101010101"
+	uuid = "01234567-89AB-CDEF-0102-030405060708"
 	affinity_mask = "0x1"
 	instance_count = "15"
 	domain_types = "0"

lmdk/modules/dummy/dummy.c

@@ -18,7 +18,8 @@ __attribute__((section(".module")))
 const struct sof_man_module_manifest dummy_module_manifest = {
 	.module = {
 		.name = "DUMMY",
-		.uuid = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
+		.uuid = { 0x01234567, 0x89AB, 0xCDEF, { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			  0x08 }},
 		.entry_point = (uint32_t)dummyPackageEntryPoint,
 		.type = {
 			.load_type = SOF_MAN_MOD_TYPE_MODULE,

scripts/cmake/llext_write_uuids.cmake

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Used by LLEXT modules to create a file with module UUIDs
+file(STRINGS ${ZEPHYR_BINARY_DIR}/${MODULE}_llext/rimage_config.toml uuids REGEX "^[ \t]*uuid *=")
+
+set(UUIDS_LIST_FILE ${ZEPHYR_BINARY_DIR}/${MODULE}_llext/llext.uuid)
+file(REMOVE ${UUIDS_LIST_FILE})
+foreach(line IN LISTS uuids)
+	# extract UUID value - drop the 'uuid = ' part of the assignment line
+	string(REGEX REPLACE "^[ \t]*uuid *= \"([0-9A-Fa-f\\-]*)\"" "\\1" uuid ${line})
+	string(TOUPPER ${uuid} uuid)
+	file(APPEND ${UUIDS_LIST_FILE} "${uuid}\n")
+endforeach()

scripts/gen-uuid-reg.py

@@ -31,6 +31,9 @@ def emit_uuid_rec(uu, sym):
     uuidinit = "{ " + ", ".join(wrecs) + ", { " + ", ".join(byts) + " } }"
     out_recs.append(f"#define _UUIDREG_{sym} {uuidinit}")
 
+    uuidstr = uu[:23] + '-' + uu[23:]
+    out_recs.append(f'#define UUIDREG_STR_{sym.upper()} "{uuidstr}"')
+
 def main():
     with open(sys.argv[1]) as f:
         for line in f.readlines():

src/audio/aria/aria.c

@@ -319,13 +319,10 @@ SOF_MODULE_INIT(aria, sys_comp_module_aria_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_ARIA 0x6D, 0x16, 0xF7, 0x99, 0x2C, 0x37, 0xEF, 0x43, 0xF6, 0x81, \
-	0x22, 0x00, 0x7A, 0xA1, 0x5F, 0x03
-
 SOF_LLEXT_MOD_ENTRY(aria, &aria_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("ARIA", aria_llext_entry, 1, UUID_ARIA, 8);
+	SOF_LLEXT_MODULE_MANIFEST("ARIA", aria_llext_entry, 1, SOF_REG_UUID(aria), 8);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/aria/aria.toml

@@ -5,7 +5,7 @@
 	REM # Aria module config
 	[[module.entry]]
 	name = "ARIA"
-	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
+	uuid = UUIDREG_STR_ARIA
 	affinity_mask = "0x1"
 	instance_count = "8"
 	domain_types = "0"

src/audio/asrc/asrc.c

@@ -879,12 +879,10 @@ SOF_MODULE_INIT(asrc, sys_comp_module_asrc_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_ASRC 0x2d, 0x40, 0xb4, 0x66, 0x68, 0xb4, 0xf2, 0x42, \
-		  0x81, 0xa7, 0xb3, 0x71, 0x21, 0x86, 0x3d, 0xd4
 SOF_LLEXT_MOD_ENTRY(asrc, &asrc_interface);
 
 static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used = {
-	SOF_LLEXT_MODULE_MANIFEST("ASRC", asrc_llext_entry, 1, UUID_ASRC, 2),
+	SOF_LLEXT_MODULE_MANIFEST("ASRC", asrc_llext_entry, 1, SOF_REG_UUID(asrc4), 2),
 };
 
 SOF_LLEXT_BUILDINFO;

src/audio/asrc/asrc.toml

@@ -4,7 +4,7 @@
 
 	[[module.entry]]
 	name = "ASRC"
-	uuid = "66B4402D-B468-42F2-81A7-B37121863DD4"
+	uuid = UUIDREG_STR_ASRC4
 	affinity_mask = "0x3"
 	instance_count = "2"
 	domain_types = "0"

src/audio/codec/dts/dts.c

@@ -478,13 +478,10 @@ SOF_MODULE_INIT(dts, sys_comp_module_dts_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_DTS 0x4F, 0xC3, 0x5F, 0xD9, 0x0F, 0x37, 0xC7, 0x4A, 0x86, 0xBC, \
-		0xBF, 0xDC, 0x5B, 0xE2, 0x41, 0xE6
-
 SOF_LLEXT_MOD_ENTRY(dts, &dts_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("DTS", dts_llext_entry, 1, UUID_DTS, 40);
+	SOF_LLEXT_MODULE_MANIFEST("DTS", dts_llext_entry, 1, SOF_REG_UUID(dts), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/codec/dts/dts.toml

@@ -5,7 +5,7 @@
 	REM # dts codec module config
 	[[module.entry]]
 	name = "DTS"
-	uuid = "D95FC34F-370F-4AC7-BC86-BFDC5BE241E6"
+	uuid = UUIDREG_STR_DTS
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/copier/copier.toml

@@ -1,6 +1,6 @@
 	[[module.entry]]
 	name = "COPIER"
-	uuid = "9BA00C83-CA12-4A83-943C-1FA2E82F9DDA"
+	uuid = UUIDREG_STR_COPIER
 	affinity_mask = "0x1"
 	instance_count = "32"
 	domain_types = "0"

src/audio/crossover/crossover.c

@@ -639,13 +639,10 @@ SOF_MODULE_INIT(crossover, sys_comp_module_crossover_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_CROSSOVER 0xD1, 0x9A, 0x8C, 0x94, 0x6A, 0x80, 0x31, 0x41, 0x6C, 0xAD, \
-		0xB2, 0xBD, 0xA9, 0xE3, 0x5A, 0x9F
-
 SOF_LLEXT_MOD_ENTRY(crossover, &crossover_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("XOVER", crossover_llext_entry, 1, UUID_CROSSOVER, 40);
+	SOF_LLEXT_MODULE_MANIFEST("XOVER", crossover_llext_entry, 1, SOF_REG_UUID(crossover), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/crossover/crossover.toml

@@ -7,7 +7,7 @@
 	REM # be appended to the IPC payload. The Extension is needed to know the output pin indices.
 	[[module.entry]]
 	name = "XOVER"
-	uuid = "948C9AD1-806A-4131-AD6C-B2BDA9E35A9F"
+	uuid = UUIDREG_STR_CROSSOVER
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/dcblock/dcblock.c

@@ -264,13 +264,10 @@ SOF_MODULE_INIT(dcblock, sys_comp_module_dcblock_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_DCBLOCK 0xAF, 0xEF, 0x09, 0xB8, 0x81, 0x56, 0xB1, 0x42, 0xD6, 0x9E, \
-		0x04, 0xBB, 0x01, 0x2D, 0xD3, 0x84
-
 SOF_LLEXT_MOD_ENTRY(dcblock, &dcblock_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", dcblock_llext_entry, 1, UUID_DCBLOCK, 40);
+	SOF_LLEXT_MODULE_MANIFEST("DCBLOCK", dcblock_llext_entry, 1, SOF_REG_UUID(dcblock), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/dcblock/dcblock.toml

@@ -5,7 +5,7 @@
 	REM # DCblock module config
 	[[module.entry]]
 	name = "DCBLOCK"
-	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
+	uuid = UUIDREG_STR_DCBLOCK
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/drc/drc.c

@@ -410,13 +410,10 @@ SOF_MODULE_INIT(drc, sys_comp_module_drc_interface_init);
 #include <module/module/api_ver.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_DRC 0xda, 0xe4, 0x6e, 0xb3, 0x6f, 0x00, 0xf9, 0x47, \
-		 0xa0, 0x6d, 0xfe, 0xcb, 0xe2, 0xd8, 0xb6, 0xce
-
 SOF_LLEXT_MOD_ENTRY(drc, &drc_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("DRC", drc_llext_entry, 1, UUID_DRC, 40);
+	SOF_LLEXT_MODULE_MANIFEST("DRC", drc_llext_entry, 1, SOF_REG_UUID(drc), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/drc/drc.toml

@@ -5,7 +5,7 @@
 	REM # DRC module config
 	[[module.entry]]
 	name = "DRC"
-	uuid = "B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE"
+	uuid = UUIDREG_STR_DRC
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/eq_fir/eq_fir.c

@@ -488,13 +488,10 @@ SOF_MODULE_INIT(eq_fir, sys_comp_module_eq_fir_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_EQFIR 0xe7, 0x0c, 0xa9, 0x43, 0xa5, 0xf3, 0xdf, 0x41, \
-		 0xac, 0x06, 0xba, 0x98, 0x65, 0x1a, 0xe6, 0xa3
-
 SOF_LLEXT_MOD_ENTRY(eq_fir, &eq_fir_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("EQFIR", eq_fir_llext_entry, 1, UUID_EQFIR, 40);
+	SOF_LLEXT_MODULE_MANIFEST("EQFIR", eq_fir_llext_entry, 1, SOF_REG_UUID(eq_fir), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/eq_fir/eq_fir.toml

@@ -5,7 +5,7 @@
 	REM # eq fir module config
 	[[module.entry]]
 	name = "EQFIR"
-	uuid = "43A90CE7-F3A5-41DF-AC06-BA98651AE6A3"
+	uuid = UUIDREG_STR_EQ_FIR
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/eq_iir/eq_iir.c

@@ -258,13 +258,10 @@ SOF_MODULE_INIT(eq_iir, sys_comp_module_eq_iir_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_EQIIR 0xE6, 0xC0, 0x50, 0x51, 0xF9, 0x27, 0xC8, 0x4E, \
-		0x83, 0x51, 0xC7, 0x05, 0xB6, 0x42, 0xD1, 0x2F
-
 SOF_LLEXT_MOD_ENTRY(eq_iir, &eq_iir_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("EQIIR", eq_iir_llext_entry, 1, UUID_EQIIR, 40);
+	SOF_LLEXT_MODULE_MANIFEST("EQIIR", eq_iir_llext_entry, 1, SOF_REG_UUID(eq_iir), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/eq_iir/eq_iir.toml

@@ -5,7 +5,7 @@
 	REM # eq iir module config
 	[[module.entry]]
 	name = "EQIIR"
-	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
+	uuid = UUIDREG_STR_EQ_IIR
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/google/google_ctc_audio_processing.c

@@ -466,14 +466,11 @@ SOF_MODULE_INIT(google_ctc_audio_processing,
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_GOOGLE_CTC 0xBC, 0x1B, 0x0E, 0xBF, 0x6A, 0xDC, 0xFE, 0x45, 0x90, 0xBC, \
-	 0x25, 0x54, 0xCB, 0x13, 0x7A, 0xB4
-
 SOF_LLEXT_MOD_ENTRY(google_ctc_audio_processing, &google_ctc_audio_processing_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
 	SOF_LLEXT_MODULE_MANIFEST("CTC", google_ctc_audio_processing_llext_entry,
-				  1, UUID_GOOGLE_CTC, 40);
+				  1, SOF_REG_UUID(google_ctc_audio_processing), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/google/google_ctc_audio_processing.toml

@@ -5,7 +5,7 @@
 	REM # CTC module config
 	[[module.entry]]
 	name = "CTC"
-	uuid = "BF0E1BBC-DC6A-45FE-BC90-2554CB137AB4"
+	uuid = UUIDREG_STR_GOOGLE_CTC_AUDIO_PROCESSING
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/google/google_rtc_audio_processing.c

@@ -861,14 +861,11 @@ SOF_MODULE_INIT(google_rtc_audio_processing,
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_GOOGLE_RTC_AEC 0xA6, 0xA0, 0x80, 0xB7, 0x9F, 0x26, 0x6F, 0x46, 0x77, 0xB4, \
-		 0x23, 0xDF, 0xA0, 0x5A, 0xF7, 0x58
-
 SOF_LLEXT_MOD_ENTRY(google_rtc_audio_processing, &google_rtc_audio_processing_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
 	SOF_LLEXT_MODULE_MANIFEST("RTC_AEC", google_rtc_audio_processing_llext_entry,
-				  7, UUID_GOOGLE_RTC_AEC, 1);
+				  7, SOF_REG_UUID(google_rtc_audio_processing), 1);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/google/google_rtc_audio_processing.toml

@@ -4,7 +4,7 @@
 
 	[[module.entry]]
 	name = "RTC_AEC"
-	uuid = "B780A0A6-269F-466F-B477-23DFA05AF758"
+	uuid = UUIDREG_STR_GOOGLE_RTC_AUDIO_PROCESSING
 	REM # bit #i = 1 means core #i is allowed.
 	affinity_mask = "0x7"
 	instance_count = "1"

src/audio/igo_nr/igo_nr.c

@@ -893,13 +893,10 @@ SOF_MODULE_INIT(igo_nr, sys_comp_module_igo_nr_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_IGO_NR 0xBC, 0xE2, 0x6A, 0x69, 0x77, 0x28, 0xEB, 0x11, 0xC1, 0xAD, \
-		0x02, 0x42, 0xAC, 0x12, 0x00, 0x02
-
 SOF_LLEXT_MOD_ENTRY(igo_nr, &igo_nr_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("IGO_NR", igo_nr_llext_entry, 1, UUID_IGO_NR, 40);
+	SOF_LLEXT_MODULE_MANIFEST("IGO_NR", igo_nr_llext_entry, 1, SOF_REG_UUID(igo_nr), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/igo_nr/igo_nr.toml

@@ -5,7 +5,7 @@
 	REM # IGO_NR module config
 	[[module.entry]]
 	name = "IGO_NR"
-	uuid = "696AE2BC-2877-11EB-ADC1-0242AC120002"
+	uuid = UUIDREG_STR_IGO_NR
 	affinity_mask = "0x1"
 	instance_count = "40"
 	domain_types = "0"

src/audio/kpb.toml

@@ -1,6 +1,6 @@
 	[[module.entry]]
 	name = "KPB"
-	uuid = "A8A0CB32-4A77-4DB1-85C7-53D7EE07BCE6"
+	uuid = UUIDREG_STR_KPB4
 	affinity_mask = "0x1"
 	instance_count = "1"
 	domain_types = "0"

src/audio/mfcc/mfcc.c

@@ -266,13 +266,10 @@ SOF_MODULE_INIT(mfcc, sys_comp_module_mfcc_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_MFCC 0x73, 0xA7, 0x10, 0xDB, 0xA4, 0x1A, 0xEA, 0x4C, 0x1F, 0xA2, \
-		0x2D, 0x57, 0xA5, 0xC9, 0x82, 0xEB
-
 SOF_LLEXT_MOD_ENTRY(mfcc, &mfcc_interface);
 
 static const struct sof_man_module_manifest mod_manifest __section(".module") __used =
-	SOF_LLEXT_MODULE_MANIFEST("MFCC", mfcc_llext_entry, 1, UUID_MFCC, 40);
+	SOF_LLEXT_MODULE_MANIFEST("MFCC", mfcc_llext_entry, 1, SOF_REG_UUID(mfcc), 40);
 
 SOF_LLEXT_BUILDINFO;
 

src/audio/mfcc/mfcc.toml

@@ -5,7 +5,7 @@
 REM # MFCC module config
 [[module.entry]]
 name = "MFCC"
-uuid = "DB10A773-1AA4-4CEA-A21F-2D57A5C982EB"
+uuid = UUIDREG_STR_MFCC
 affinity_mask = "0x1"
 instance_count = "40"
 domain_types = "0"

src/audio/mixin_mixout/mixin_mixout.c

@@ -949,18 +949,13 @@ SOF_MODULE_INIT(mixout, sys_comp_module_mixout_interface_init);
 #include <module/module/llext.h>
 #include <rimage/sof/user/manifest.h>
 
-#define UUID_MIXIN 0xB2, 0x6E, 0x65, 0x39, 0x71, 0x3B, 0x49, 0x40, \
-		0x8D, 0x3F, 0xF9, 0x2C, 0xD5, 0xC4, 0x3C, 0x09
-#define UUID_MIXOUT 0x5A, 0x50, 0x56, 0x3C, 0xD7, 0x24, 0x8F, 0x41, \
-		0xBD, 0xDC, 0xC1, 0xF5, 0xA3, 0xAC, 0x2A, 0xE0
-
 SOF_LLEXT_MOD_ENTRY(mixin, &mixin_interface);
 SOF_LLEXT_MOD_ENTRY(mixout, &mixout_interface);
 
 static const struct sof_man_module_manifest mod_manifest[] __section(".module") __used =
 {
-	SOF_LLEXT_MODULE_MANIFEST("MIXIN", mixin_llext_entry, 1, UUID_MIXIN, 30),
-	SOF_LLEXT_MODULE_MANIFEST("MIXOUT", mixout_llext_entry, 1, UUID_MIXOUT, 30),
+	SOF_LLEXT_MODULE_MANIFEST("MIXIN", mixin_llext_entry, 1, SOF_REG_UUID(mixin), 30),
+	SOF_LLEXT_MODULE_MANIFEST("MIXOUT", mixout_llext_entry, 1, SOF_REG_UUID(mixout), 30),
 };
 
 SOF_LLEXT_BUILDINFO;

src/audio/mixin_mixout/mixin_mixout.toml

@@ -4,7 +4,7 @@
 
 	[[module.entry]]
 	name = "MIXIN"
-	uuid = "39656EB2-3B71-4049-8D3F-F92CD5C43C09"
+	uuid = UUIDREG_STR_MIXIN
 	affinity_mask = "0x1"
 	instance_count = "30"
 	domain_types = "0"
@@ -43,7 +43,7 @@
 
 	[[module.entry]]
 	name = "MIXOUT"
-	uuid = "3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0"
+	uuid = UUIDREG_STR_MIXOUT
 	affinity_mask = "0x1"
 	instance_count = "30"
 	domain_types = "0"

src/audio/module_adapter/module/cadence.toml

@@ -1,7 +1,7 @@
 	REM # Cadence module config
 	[[module.entry]]
 	name = "CADENCE"
-	uuid = "D8218443-5FF3-4A4C-B388-6CFE07B956AA"
+	uuid = UUIDREG_STR_CADENCE_CODEC
 	affinity_mask = "0x3"
 	instance_count = "1"
 	domain_types = "0"