Skip to content

Commit 4fccb54

Browse files
RanderWangRanderWang
committed
topology2: merge multi-core test into nocodec topology
The multi-core topology was created since multi-core feature had a few bugs at that time so it was for validation test. Now this feature works fine so merge it into nocodec topology then it will be tested by github CI. And we don't need to maintain a dedicated multi-core topology. Signed-off-by: Rander Wang <rander.wang@intel.com>
1 parent 9e0f7ee commit 4fccb54

2 files changed

Lines changed: 53 additions & 23 deletions

File tree

‎tools/topology/topology2/cavs-nocodec.conf‎

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ Define {
8888
SSP0_CAPTURE_PCM_ID 12
8989
SSP0_PCM_ID 0
9090
SSP1_PCM_NAME "Port1"
91+
SSP1_PCM_CORE_ID 1
9192
SSP2_PCM_NAME "Port2"
93+
SSP2_PCM_CORE_ID 2
9294
DMIC0_PCM_0_NAME "DMIC SFX1"
9395
DMIC0_PCM_1_NAME "DMIC SFX2"
9496
}
@@ -199,6 +201,7 @@ IncludeByKey.PASSTHROUGH {
199201
Object.Pipeline.host-copier-gain-src-mixin-playback [
200202
{
201203
index 5
204+
core_id $SSP2_PCM_CORE_ID
202205

203206
Object.Widget.host-copier.1 {
204207
stream_name 'SSP2 Playback'
@@ -210,6 +213,9 @@ IncludeByKey.PASSTHROUGH {
210213
name 'Pre Mixer $SSP2_PCM_NAME Playback Volume'
211214
}
212215
}
216+
Object.Widget.pipeline.1 {
217+
core $SSP2_PCM_CORE_ID
218+
}
213219
}
214220
]
215221

@@ -252,6 +258,7 @@ IncludeByKey.PASSTHROUGH {
252258
Object.Pipeline.mixout-gain-dai-copier-playback [
253259
{
254260
index 6
261+
core_id $SSP2_PCM_CORE_ID
255262

256263
Object.Widget.dai-copier.1 {
257264
dai_index 2
@@ -267,6 +274,10 @@ IncludeByKey.PASSTHROUGH {
267274
name 'Post Mixer $SSP2_PCM_NAME Playback Volume'
268275
}
269276
}
277+
278+
Object.Widget.pipeline."1" {
279+
core $SSP2_PCM_CORE_ID
280+
}
270281
}
271282
]
272283

@@ -578,6 +589,7 @@ IncludeByKey.PASSTHROUGH {
578589
}
579590
{
580591
index 5
592+
581593
Object.Widget.host-copier.1 {
582594
stream_name 'SSP2 Playback'
583595
pcm_id 2
@@ -626,11 +638,16 @@ IncludeByKey.PASSTHROUGH {
626638
}
627639
{
628640
index 11
641+
core_id $SSP2_PCM_CORE_ID
629642

630643
Object.Widget.host-copier.1 {
631644
stream_name 'SSP2 Capture'
632645
pcm_id 2
633646
}
647+
648+
Object.Widget.pipeline."1" {
649+
core $SSP2_PCM_CORE_ID
650+
}
634651
}
635652
]
636653

@@ -672,6 +689,7 @@ Object.Pipeline.io-gateway-capture [
672689
{
673690
index 12
674691
direction capture
692+
core_id $SSP2_PCM_CORE_ID
675693

676694
Object.Widget.dai-copier."1" {
677695
dai_index 2
@@ -696,6 +714,10 @@ Object.Pipeline.io-gateway-capture [
696714
}
697715
]
698716
}
717+
718+
Object.Widget.pipeline."1" {
719+
core $SSP2_PCM_CORE_ID
720+
}
699721
}
700722
]
701723

@@ -704,22 +726,28 @@ IncludeByKey.PASSTHROUGH {
704726
Object.Pipeline.host-gateway-capture [
705727
{
706728
index 11
729+
core_id $SSP2_PCM_CORE_ID
707730

708731
Object.Widget.host-copier.1 {
709732
stream_name 'SSP2 Capture'
710733
pcm_id 2
711734

712735
<include/components/src_format_s32_to_sxx_convert.conf>
713736
}
714-
}
715-
]
716737

717-
Object.Widget.src.1 {
718-
index 11
719-
rate_in 48000
738+
Object.Widget.pipeline."1" {
739+
core $SSP2_PCM_CORE_ID
740+
}
720741

721-
<include/components/src_format_s32_convert_from_48k.conf>
722-
}
742+
743+
Object.Widget.src.1 {
744+
index 11
745+
rate_in 48000
746+
747+
<include/components/src_format_s32_convert_from_48k.conf>
748+
}
749+
}
750+
]
723751

724752
IncludeByKey.NUM_DMICS {
725753
"[1-4]" {
@@ -1157,6 +1185,7 @@ IncludeByKey.SSP1_ENABLED {
11571185
{
11581186
index 10
11591187
direction capture
1188+
core_id $SSP1_PCM_CORE_ID
11601189

11611190
Object.Widget.dai-copier."1" {
11621191
dai_index 1
@@ -1181,17 +1210,26 @@ IncludeByKey.SSP1_ENABLED {
11811210
}
11821211
]
11831212
}
1213+
1214+
Object.Widget.pipeline."1" {
1215+
core $SSP1_PCM_CORE_ID
1216+
}
11841217
}
11851218
]
11861219

11871220
Object.Pipeline.host-gateway-capture [
11881221
{
11891222
index 9
1223+
core_id $SSP1_PCM_CORE_ID
11901224

11911225
Object.Widget.host-copier.1 {
11921226
stream_name 'SSP1 Capture'
11931227
pcm_id 1
11941228
}
1229+
1230+
Object.Widget.pipeline."1" {
1231+
core $SSP1_PCM_CORE_ID
1232+
}
11951233
}
11961234
]
11971235

@@ -1200,6 +1238,7 @@ IncludeByKey.SSP1_ENABLED {
12001238
Object.Pipeline.host-copier-gain-mixin-playback [
12011239
{
12021240
index 3
1241+
core_id $SSP1_PCM_CORE_ID
12031242

12041243
Object.Widget.host-copier.1 {
12051244
stream_name 'SSP1 Playback'
@@ -1211,12 +1250,16 @@ IncludeByKey.SSP1_ENABLED {
12111250
name 'Pre Mixer $SSP1_PCM_NAME Playback Volume'
12121251
}
12131252
}
1253+
Object.Widget.pipeline."1" {
1254+
core $SSP1_PCM_CORE_ID
1255+
}
12141256
}
12151257
]
12161258

12171259
Object.Pipeline.mixout-gain-dai-copier-playback [
12181260
{
12191261
index 4
1262+
core_id $SSP1_PCM_CORE_ID
12201263

12211264
Object.Widget.dai-copier.1 {
12221265
dai_index 1
@@ -1232,6 +1275,9 @@ IncludeByKey.SSP1_ENABLED {
12321275
name 'Post Mixer $SSP1_PCM_NAME Playback Volume'
12331276
}
12341277
}
1278+
Object.Widget.pipeline."1" {
1279+
core $SSP1_PCM_CORE_ID
1280+
}
12351281
}
12361282
]
12371283
}

‎tools/topology/topology2/development/tplg-targets.cmake‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ SSP0_MIXER_2LEVEL=1,PLATFORM=tgl"
2020
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\
2121
PLATFORM=adl"
2222

23-
"cavs-nocodec-multicore\;sof-tgl-nocodec-multicore-ssp0-ssp2\;PLATFORM=tgl,SSP1_ENABLED=false,\
24-
SSP2_CORE_ID=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec-multicore-ssp0-ssp2.bin"
25-
26-
"cavs-nocodec-multicore\;sof-adl-nocodec-multicore-ssp0-ssp2\;PLATFORM=adl,SSP1_ENABLED=false,\
27-
SSP2_CORE_ID=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec-multicore-ssp0-ssp2.bin"
28-
2923
# SDW topology for MTL
3024
"cavs-sdw\;mtl-sdw\;NUM_HDMIS=0"
3125

@@ -40,16 +34,6 @@ DEEPBUFFER_D0I3_COMPATIBLE=true"
4034
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec-ssp0-ssp2.bin,DEEPBUFFER_FW_DMA_MS=100,\
4135
DEEPBUFFER_D0I3_COMPATIBLE=true"
4236

43-
"cavs-nocodec-multicore\;sof-mtl-nocodec-multicore\;PLATFORM=mtl,SSP1_ENABLED=true,SSP0_CORE_ID=0,\
44-
SSP1_CORE_ID=1,SSP2_CORE_ID=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec-multicore.bin"
45-
46-
"cavs-nocodec-multicore\;sof-mtl-nocodec-multicore-ssp0-ssp2\;PLATFORM=mtl,SSP1_ENABLED=false,\
47-
SSP2_CORE_ID=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec-multicore-ssp0-ssp2.bin"
48-
49-
"cavs-nocodec-multicore\;sof-mtl-nocodec-multicore-4ch\;PLATFORM=mtl,SSP1_ENABLED=false,\
50-
SSP0_CORE_ID=0,DMIC_CORE_ID=1,SSP2_CORE_ID=2,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
51-
PASSTHROUGH=false,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin"
52-
5337
# SSP topology for LNL
5438
"cavs-nocodec\;sof-lnl-nocodec\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
5539
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\

0 commit comments

Comments
 (0)