Skip to content

Zephyr manifest update and fix for repro build issue - #9071

Merged
kv2019i merged 2 commits into
thesofproject:mainfrom
LaurentiuM1234:cmake_zephyr_hash_bump
Apr 23, 2024
Merged

Zephyr manifest update and fix for repro build issue#9071
kv2019i merged 2 commits into
thesofproject:mainfrom
LaurentiuM1234:cmake_zephyr_hash_bump

Conversation

@LaurentiuM1234

@LaurentiuM1234LaurentiuM1234 commented Apr 22, 2024

Copy link
Copy Markdown
Contributor

Pulls in the following patches relevant to SOF:

94d156c9c84c nxp: imx8ulp: enable serial interface
bc63835ba240 dts: xtensa: intel_adsp_cavs25_tgph: correct SSP definition
aecf19c3c1be dts: xtensa: intel_adsp_ace15: correct SSP definition
45205f865e18 dts: xtensa: intel_adsp_ace20: correct SSP definition
17081222e2e7 drivers: dai: intel: ssp: fix LOG_ERR level / false positive
fb7e9379e137 cmake: add control over inline source code disassembly

and fixes#9034

Pulls in the following patches relevant to SOF:
94d156c9c84c nxp: imx8ulp: enable serial interface
bc63835ba240 dts: xtensa: intel_adsp_cavs25_tgph: correct SSP definition
aecf19c3c1be dts: xtensa: intel_adsp_ace15: correct SSP definition
45205f865e18 dts: xtensa: intel_adsp_ace20: correct SSP definition
17081222e2e7 drivers: dai: intel: ssp: fix LOG_ERR level / false positive
fb7e9379e137 cmake: add control over inline source code disassembly
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
@LaurentiuM1234LaurentiuM1234 changed the title west.yaml: update Zephyr to fb7e9379e137west.yml: update Zephyr to fb7e9379e137Apr 22, 2024
@LaurentiuM1234LaurentiuM1234 changed the title west.yml: update Zephyr to fb7e9379e137Manifest update and fix for repro build issueApr 22, 2024
@LaurentiuM1234LaurentiuM1234 changed the title Manifest update and fix for repro build issueZephyr manifest update and fix for repro build issueApr 22, 2024
By default, the disassembly file (.lst) generated
during the build process when enabling `CONFIG_OUTPUT_DISASSEMBLY`
will also contain inline source code. This is not ideal
for reproducible builds that compare the .lst files
obtained on different platforms (i.e: Windows and Linux)
because of the differences in the inline source code that
may appear.
One of the identified causes for such differences were
the ".." include paths, which resulted in the Windows
.lst omitting some bits of the inline source code that
were present in the Linux .lst file.
Because these issues are hard to debug and unintuitive,
the solution is to disable the inline source code. This way,
the CI can keep testing for reproductibility using just the
assembly and machine code from the .lst file, which are
more important than the inline source code.
This fixes/issues/9034.
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
@marc-hb

This comment was marked as resolved.

@LaurentiuM1234

Copy link
Copy Markdown
ContributorAuthor

compare-linux-win https://github.com/thesofproject/sof/actions/runs/8787360472/job/24112815169?pr=9071 is green but... I can still see source code in the .lst files?!?

Mind having another look pls? Previous version of this PR was setting CONFIG_OUTPUT_DISASSEMBLY_WITH_SOURCE to y so perhaps the artifacts were outdated? Briefly checked 8ulp's .lst and no source code.

@marc-hb

marc-hb commented Apr 22, 2024

Copy link
Copy Markdown
Collaborator

I was of course looking at the wrong .zip file... sincere apologies and thank you so much for doing all this, much appreciated.

MTL https://sof-ci.01.org/sofpr/PR9071/build4240/devicetest/index.html is 100% green

cavs https://sof-ci.01.org/sofpr/PR9071/build4241/devicetest/index.html is empty, probably no device available at the time. Re-running it.

@marc-hb

marc-hb commented Apr 22, 2024

Copy link
Copy Markdown
Collaborator

SOFCI TEST

EDIT: only one suspend/resume failure in MTL https://sof-ci.01.org/sofpr/PR9071/build4249/devicetest/index.html

CAVS https://sof-ci.01.org/sofpr/PR9071/build4250/devicetest/index.html is 100% green!

Good to merge.

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

@kv2019i
kv2019i merged commit ebe33ca into thesofproject:mainApr 23, 2024
@LaurentiuM1234
LaurentiuM1234 deleted the cmake_zephyr_hash_bump branch April 23, 2024 08:51
Sign up for freeto 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.

Windows/Linux disassembly differences when using #include ../something.h?

5 participants

@LaurentiuM1234@marc-hb@dbaluta@cujomalainey@kv2019i