Skip to content

Add test reference topology for TGL nocodec - #3212

Merged
keyonjie merged 5 commits into
thesofproject:masterfrom
xiulipan:pr/tglnocodecupdate
Sep 1, 2020
Merged

keyonjie merged 5 commits into
thesofproject:masterfrom
xiulipan:pr/tglnocodecupdate

Conversation

@xiulipan

@xiulipan xiulipan commented Jul 22, 2020 •

Copy link
Copy Markdown
Contributor

Add FW echo reference to nocodec TPLG on SSP0.
Add internal loopback on SSP0. We can compare echo reference anid
loopback capture stream.
Add HW echo reference with DSM comp on SSP2

Add Keyword Detection pipelines to DMIC

merge DSM HWEchoRefernce from #3224

Signed-off-by: Pan Xiuli xiuli.pan@linux.intel.com

@xiulipan
xiulipan requested a review from ranj063 as a code owner July 22, 2020 06:01
@xiulipan

Copy link
Copy Markdown
Contributor Author

@keyonjie @keqiaozhang Please help to test and review.

Comment thread tools/topology/sof-tgl-nocodec.m4 Resolved
Comment thread tools/topology/sof-tgl-nocodec.m4 Resolved
@xiulipan
xiulipan force-pushed the pr/tglnocodecupdate branch from b534237 to 123a951 Compare July 27, 2020 06:04
@xiulipan

Copy link
Copy Markdown
Contributor Author

@plbossart Update the PR with request. Also rename the tplg to sof-tgl-nocodec-ci

Comment thread tools/topology/CMakeLists.txt Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the name is really terrible. something like sof-tgl-nocodec-fw-eref.ri would be clearer, no?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart Actually this tplg will include both fw echo reference and hw echo reference

@xiulipan xiulipan changed the title topology: add echo reference to sof-tgl-nocodec ssp0 Add test reference topology for TGL nocodec Jul 29, 2020
@plbossart

Copy link
Copy Markdown
Member

I maintain that this is an out-of-control endeavor that should be in a test topology repo, not in the topologies distributed in releases. We can't go on like this adding topology files that are for development purposes, or they belong somewhere else.

@xiulipan
xiulipan force-pushed the pr/tglnocodecupdate branch from 3d6b273 to 3febf02 Compare August 3, 2020 08:09
@xiulipan

xiulipan commented Aug 3, 2020

Copy link
Copy Markdown
Contributor Author

@plbossart How about still name it as nocodec? Even if it contains a lot of advanced feature, it still keep the simple nocodec pipelines

@keyonjie

Copy link
Copy Markdown
Contributor

I maintain that this is an out-of-control endeavor that should be in a test topology repo, not in the topologies distributed in releases. We can't go on like this adding topology files that are for development purposes, or they belong somewhere else.

The intention of adding this is not for development purpose, but for CI regular testing which will run on every submitted PR, it will cover more regressions finding before PRs being merged, on a single limited CI platform. @plbossart it is important for the CI coverage, IMHO.

@xiulipan
xiulipan force-pushed the pr/tglnocodecupdate branch from 3febf02 to 946edf6 Compare August 12, 2020 06:37
@xiulipan xiulipan changed the title Add test reference topology for TGL nocodec [TEST]Add test reference topology for TGL nocodec Aug 12, 2020
@xiulipan

Copy link
Copy Markdown
Contributor Author

@plbossart As this TPLG is only used for platform validation, we can keep the topology not merge but only use the binary from this PR.

@plbossart

Copy link
Copy Markdown
Member

@xiulipan @keyonjie All test topologies should me merged and maintained, otherwise there's no way we can work on them as a team.

That said, my point remains that we have to separate out what it used for testing and what should be packaged and used by distros. It's not right if we don't draw a clear line.

We do the same for kconfigs, we have sof-defconfig and sof-dev-defconfig, and recommend distros don't use the latter. Same for topologies.

@xiulipan

Copy link
Copy Markdown
Contributor Author

@plbossart That is a good point. Can we merge this PR first as this is a blocking issue with our validation plan.

I will try to do a update to the CMakefiles to add a new build target make dev and more most our development topology into this build target.

@xiulipan xiulipan changed the title [TEST]Add test reference topology for TGL nocodec Add test reference topology for TGL nocodec Aug 13, 2020
@xiulipan
xiulipan requested a review from plbossart August 14, 2020 03:23
@xiulipan xiulipan changed the title Add test reference topology for TGL nocodec [RFC]Add test reference topology for TGL nocodec Aug 14, 2020
@xiulipan

Copy link
Copy Markdown
Contributor Author

@plbossart @lgirdwood @keyonjie @ranj063 @singalsu Please help to review this PR to split the topology list into release and development.
I may misplace some tplg file into wrong list, please also help to check.

This will help us to manage the topologies more easily.

Comment thread tools/topology/CMakeLists.txt Resolved
Comment thread tools/topology/sof-apl-demux-pcm512x.m4 Resolved
Comment thread tools/topology/CMakeLists.txt Resolved
Comment thread tools/topology/sof-tgl-nocodec-ci.m4 Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't we already say that this is a horrible name and this is not aligned with the kernel PR?
Really don't get what the directions are.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart I think the kernel PR was abandoned and closed, so the naming is kept intact.

Comment thread tools/topology/CMakeLists.txt Resolved
@xiulipan xiulipan changed the title [RFC]Add test reference topology for TGL nocodec Add test reference topology for TGL nocodec Aug 17, 2020
To make multiple DEMUX comp can work in same topology. Add pipeline
ID into the DEMUX control name.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
Add FW echo reference to nocodec TPLG on SSP0.
Add internal loopback on SSP0. We can compare echo reference and
loopback capture stream.
Add smart amplifier for nocodec on SSP2

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
Add default dai name for dmic dai, we can override them in
if dai name in machine driver is different.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
Add KPB pipeline into the sof-tgl-nocodec-ci topology.
This topology will be a reference test topology for all features used
on TGL.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
@xiulipan

Copy link
Copy Markdown
Contributor Author

@plbossart @lgirdwood As we have discussed about the topology management about production and development. I will try to update this PR with a simple start up to add a development folder.

@plbossart I have changed the topology to remove the dependency on Kernel PR. Do we still need some patch to nocodec machine driver to update the dai names?

As this PR only provide a validation topology for our release, I did not want to involve much dependency in this PR. Can we merge this simple files first. And make alignment about what is missed and we can fix them later to do not block any release.

Add development folder for topologies that not for production.
First add sof-tgl-nocodec-ci as a validation topology.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
@xiulipan
xiulipan force-pushed the pr/tglnocodecupdate branch from 4c04592 to f323d89 Compare August 17, 2020 04:07
@aiChaoSONG

Copy link
Copy Markdown
Collaborator

SOFCI TEST

@keyonjie keyonjie left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @xiulipan looks good to me. @plbossart how about let's proceed and ask for more development topology files clean up (being moved to the development) next.

@lgirdwood lgirdwood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @xiulipan for the dev folder. @plbossart ok for you now ?

@xiulipan

Copy link
Copy Markdown
Contributor Author

ping @plbossart

@xiulipan

xiulipan commented Sep 1, 2020

Copy link
Copy Markdown
Contributor Author

@lgirdwood I think we can merge this and I will send following clean up PR for the development topologies

@keyonjie

keyonjie commented Sep 1, 2020

Copy link
Copy Markdown
Contributor

Since no objection for more than 2 weeks, let's proceed and merge it.

@keyonjie
keyonjie merged commit a0fc1de into thesofproject:master Sep 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants