xtensa-build-zephyr.py: drop intermediate build-$platf/sof-$platf.ri #7522
Conversation
|
Zephyr main branch failures in https://github.com/thesofproject/sof/actions/runs/4814369445/jobs/8571944751 will be fixed by #7520. Manifest Zephyr version is green. https://sof-ci.01.org/sofpr/PR7522/build6524/devicetest and https://sof-ci.01.org/sofpr/PR7522/build6525/devicetest have only a few unrelated suspend/resume timeouts and one minor systemctl issue. Everything else is OK. |
marc-hb
requested review from
abonislawski,
aiChaoSONG,
dbaluta,
greg-intel,
keqiaozhang,
kv2019i and
paulstelian97
paulstelian97
left a comment
paulstelian97
left a comment
There was a problem hiding this comment.
Commit message is oddly specific about mtl, yet it affects all platforms. Please make the message clearer in this sense.
I approve of the change itself.
kv2019i
left a comment
kv2019i
left a comment
There was a problem hiding this comment.
This will break tons of my old DIY scripts, but my bad not to have upgraded them.
Otherwise good, but agree that the commit should be clearer this applies to all targets.
Remove one intermediate and unnecessary .ri file. Simplify the code and
the build directory. Example below with `sof-mtl.ri` for better
readability but this applies the same to `sof-imx8.ri` and every other
`sof-$platf.ri` file.
There were 3 .ri copies before this commit:
```
build-mtl/zephyr/zephyr.ri
copied to -> build-mtl/zephyr/sof-mtl.ri
copied to -> build-sof-staging/___/sof-mtl.ri
```
Only 2 left after dropping the second and pointless copy:
```
build-mtl/zephyr/zephyr.ri
copied to -> build-sof-staging/___/sof-mtl.ri
```
Fewer copies means less wondering about what is what, two identical
files in the same directory is at best pointless and at worst misleading.
The `build-mtl/` directory belongs to the zephyr build system
exclusively, this wrapper script has no business interfering with
`build-mtl`. `build-mtl/zephyr/sof-mtl.ri can even be dangerous because
it does not get cleaned. Demonstration:
```
# Compile successfully
$ ./scripts/xtensa-build-zephyr.py mtl
# Write some code and make a mistake.
# Fail to compile.
$ echo BROKEN >> ../zephyr/kernel/sched.c
$ ./scripts/xtensa-build-zephyr.py mtl
# Obsolete .ri files are still there
$ find ../build-mtl/ -name *.ri
../build-mtl/zephyr/zephyr.ri
../build-mtl/zephyr/sof-mtl.ri
$ ninja -C ../build-mtl clean
# Obsolete sof-mtl.ri is still there!
$ find ../build-mtl/ -name *.ri
../build-mtl/zephyr/sof-mtl.ri
```
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
force-pushed
the
drop-sof-ri-copy
branch
from
5a921ce to
e27f6e7
Compare
marc-hb
changed the title
|
Commit message adjusted, thanks for the reviews!
Sorry about that but May I also suggest taking the opportunity to reduce the "tons" of scripts to a much smaller number? |
|
One model was missing in https://sof-ci.01.org/sofpr/PR7522/build6712/devicetest/index.html, others ran fine. One suspend/resume in https://sof-ci.01.org/sofpr/PR7522/build6713/devicetest/index.html, unrelated too. |
kv2019i
left a comment
kv2019i
left a comment
There was a problem hiding this comment.
Thanks for the commit update!
|
@paulstelian97 @aborisovich ... ok? |
aborisovich
left a comment
aborisovich
left a comment
There was a problem hiding this comment.
Yeah makes sense. No need for so many copies.
|
@marc-hb please double check CI test results. I hope tests are not failing because could not be started, because looking for sof-mtl.ri in build-mtl directory... |
As far as I know we build a single |
|
SOFCI TEST |
|
Both https://sof-ci.01.org/sofpr/PR7522/build7014/devicetest and https://sof-ci.01.org/sofpr/PR7522/build7013/devicetest are fine with tests running on all MTL models. Just some usual suspend/resume failures. |
5 participants
Remove one intermediate and unnecessary .ri file. Simplify the code and the build directory. Example below with
sof-mtl.rifor betterreadability but this applies the same to
sof-imx8.riand every othersof-$platf.rifile.There were 3 .ri copies before this commit:
Only 2 left after dropping the second and pointless copy:
Fewer copies means less wondering about what is what, two identical files in the same directory is at best pointless and at worst misleading.
The
build-mtl/directory belongs to the zephyr build system exclusively, this wrapper script has no business interfering withbuild-mtl. `build-mtl/zephyr/sof-mtl.ri can even be dangerous because it does not get cleaned. Demonstration: