Skip to content

Prepare for building Topology2.0 topologies - #4363

Merged
lgirdwood merged 1 commit into
thesofproject:mainfrom
ranj063:fix/tplg1_build
Jun 17, 2021
Merged

lgirdwood merged 1 commit into
thesofproject:mainfrom
ranj063:fix/tplg1_build

Conversation

@ranj063

@ranj063 ranj063 commented Jun 16, 2021

Copy link
Copy Markdown
Collaborator

In preparation for Topology2.0, move the current topology files
to the topology1 folder and once the 1.0 topologies are
built copy them to the /sof/tools/build-tools/topology folder.

When Topology2.0 topologies come along, they will be built into
the topology2 folder and the 2.0 binaries will be copied over
the 1.0 binaries.

@ranj063
ranj063 force-pushed the fix/tplg1_build branch 3 times, most recently from 55037b7 to 09c0bdc Compare June 16, 2021 19:54

@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.

I guess the build scripts wont need updated as changes will be incorporated in the makefiles ?

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.

We probably need a Readme.md in the topology1 directory stating that the M4 topology is being deprecated. This can be an incremental PR.

@ranj063
ranj063 force-pushed the fix/tplg1_build branch 5 times, most recently from ce2929b to 0c07a25 Compare June 16, 2021 21:22
@lgirdwood

Copy link
Copy Markdown
Member

@ranj063 I've finished merging for tonight - good time to fix the conflicts now :)

@ranj063

ranj063 commented Jun 17, 2021

Copy link
Copy Markdown
Collaborator Author

@ranj063 I've finished merging for tonight - good time to fix the conflicts now :)

@lgirdwood, i've fixed the conflicts now but there are a bunch of topology PR's pending. Should we merge those before merging this?

@marc-hb marc-hb left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Main issue is the "fake?" final_output.tplg file, other comments below.

Comment thread tools/topology/topology1/CMakeLists.txt Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Suggested change
add_dependencies(topology1 topology1_${output})
add_dependencies(topologies_v1 topology1_${output})

Please keep the plural here because it helps most people not familiar with CMake (and not trying to be)

Comment thread tools/topology/topology1/CMakeLists.txt Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Unless there's going to be a different, abi_v2 target you probably want to keep this at the tools/topology level. I doubt you can define the same target twice.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I cant do that. The outout ofthe get_abi.sh script is different for topology1 and topology2

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Should this be renamed to abi_v1 then? Just wondering. Sorry I forgot again what is the purpose of this, I mean which ABI it is. Add a comment?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

ther's only one ABI and its for the firmware. What should I say in the comment? that this is the firmware ABI?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Two different formats for the same ABI, got it thanks for your patience.

Comment thread tools/topology/topology1/CMakeLists.txt Resolved
Comment thread tools/topology/topology1/CMakeLists.txt Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This looks like lying to CMake because the COMMAND does not create any final_${output}.tplg file.

@ranj063
ranj063 requested a review from marc-hb June 17, 2021 14:58

@marc-hb marc-hb left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Logic looks good. Sorry for nit-picking on the code style and symbol names but it's not like we have many full-time CMake experts in the project (none?) so reducing cognitive strain makes a significant difference.

Comment thread tools/topology/topology1/CMakeLists.txt Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Should this be renamed to abi_v1 then? Just wondering. Sorry I forgot again what is the purpose of this, I mean which ABI it is. Add a comment?

Comment thread tools/topology/topology1/CMakeLists.txt Resolved
Comment thread tools/topology/topology1/CMakeLists.txt Resolved
@ranj063
ranj063 requested a review from marc-hb June 17, 2021 17:49
@ranj063

ranj063 commented Jun 17, 2021

Copy link
Copy Markdown
Collaborator Author

Logic looks good. Sorry for nit-picking on the code style and symbol names but it's not like we have many full-time CMake experts in the project (none?) so reducing cognitive strain makes a significant difference.

fixed now. Thanks for your help!

Comment thread tools/topology/topology1/CMakeLists.txt Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Two different formats for the same ABI, got it thanks for your patience.

In preparation for Topology2.0, move the current topology files
to the topology1 folder and once the 1.0 topologies are
built copy them to the /sof/tools/build-tools/topology folder.

When Topology2.0 topologies come along, they will be built into
the topology2 folder and the 2.0 binaries will be copied over
the 1.0 binaries.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@lgirdwood

Copy link
Copy Markdown
Member

CI showing unrelated failure.

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.

3 participants