[SKIP CI] docker: add AMD/Rembrandt gcc toolchain by fredoh9 · Pull Request #5897 · thesofproject/sof

fredoh9 · 2022-06-06T19:41:54Z

Add AMD/Rembrandt (rmb) gcc toolchain to thesofproject/sof docker image.

Signed-off-by: Fred Oh fred.oh@linux.intel.com

fredoh9 · 2022-06-06T19:49:29Z

Docker image thesofproject/sof:20220606 (=thesofproject/sof:latest from a few minutes ago) has this fix.

I picked up #5833 and rebased top of today's main. But I have build error for rmb with latest docker image. Because of this error "./scripts/xtensa-build-all.sh -a" cannot finish the job.

./scripts/docker-run.sh ./scripts/xtensa-build-all.sh rmb
...
[ 15%] Building ASM object src/arch/xtensa/CMakeFiles/reset.dir/xtos/reset-vector.S.o
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S: Assembler messages:
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S:850: Error: unknown opcode or format name 'rsr.memctl'
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S:863: Error: unknown opcode or format name 'rsr.memctl'
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S:863: Error: unknown opcode or format name 'wsr.memctl'
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S:880: Error: unknown opcode or format name 'rsr.memctl'
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S:893: Error: unknown opcode or format name 'rsr.memctl'
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S:893: Error: unknown opcode or format name 'wsr.memctl'
/home/sof/work/sof.git/src/arch/xtensa/hal/cache_asm.S:893: Error: unknown opcode or format name 'diwbui.p'
...
[ 43%] No install step for 'smex_ep'
[ 44%] Completed 'smex_ep'
[100%] Linking C executable rimage
[ 44%] Built target smex_ep
[100%] Built target rimage
[ 44%] No install step for 'rimage_ep'
[ 45%] Completed 'rimage_ep'
[ 45%] Built target rimage_ep
make[1]: *** [CMakeFiles/Makefile2:2154: src/arch/xtensa/CMakeFiles/bin.dir/rule] Error 2
make: *** [Makefile:814: bin] Error 2

lgirdwood · 2022-06-07T20:43:46Z

Docker image thesofproject/sof:20220606 (=thesofproject/sof:latest from a few minutes ago) has this fix.

I picked up #5833 and rebased top of today's main. But I have build error for rmb with latest docker image. Because of this error "./scripts/xtensa-build-all.sh -a" cannot finish the job.
./scripts/docker-run.sh ./scripts/xtensa-build-all.sh rmb
...
[ 43%] No install step for 'smex_ep'
[ 44%] Completed 'smex_ep'
[100%] Linking C executable rimage
[ 44%] Built target smex_ep
[100%] Built target rimage
[ 44%] No install step for 'rimage_ep'
[ 45%] Completed 'rimage_ep'
[ 45%] Built target rimage_ep
make[1]: *** [CMakeFiles/Makefile2:2154: src/arch/xtensa/CMakeFiles/bin.dir/rule] Error 2
make: *** [Makefile:814: bin] Error 2

@fredoh9 are you saying we have some dependencies before merging ?

lgirdwood · 2022-06-08T12:25:48Z

@fredoh9 are you saying we have some dependencies before merging ?

Ping - do we need to merge any other PRs before this one ?

marc-hb · 2022-06-08T13:40:23Z

Ping - do we need to merge any other PRs before this one ?

@balakishorepati can you please test this?

fredoh9 · 2022-06-09T18:42:15Z

@fredoh9 are you saying we have some dependencies before merging ?

Ping - do we need to merge any other PRs before this one ?

This doesn't have any dependency but I suspect rmb toolchain may need some fix(es)

lgirdwood · 2022-07-07T10:54:46Z

@fredoh9 ping

marc-hb · 2022-07-07T15:34:32Z

I could be wrong but I believe @fredoh9 is waiting on @balakishorepati to reproduce the error reported above.

balakishorepati · 2022-07-07T17:07:36Z

I could be wrong but I believe @fredoh9 is waiting on @balakishorepati to reproduce the error reported above.

@marc-hb : There is no issue in rmb tool chain. But issue is due to gcc compiler was not picking the core-isa.h file which we up streamed.
We are able to compile the rmb code with the up streamed toolchain if gcc compiler is picking the proper core-isa.h file during compilation.
Any inputs are welcome to debug why compiler is taking wrong core-isa.h header file

balakishorepati · 2022-07-07T17:11:06Z

Docker image thesofproject/sof:20220606 (=thesofproject/sof:latest from a few minutes ago) has this fix.
I picked up #5833 and rebased top of today's main. But I have build error for rmb with latest docker image. Because of this error "./scripts/xtensa-build-all.sh -a" cannot finish the job.
./scripts/docker-run.sh ./scripts/xtensa-build-all.sh rmb
...
[ 43%] No install step for 'smex_ep'
[ 44%] Completed 'smex_ep'
[100%] Linking C executable rimage
[ 44%] Built target smex_ep
[100%] Built target rimage
[ 44%] No install step for 'rimage_ep'
[ 45%] Completed 'rimage_ep'
[ 45%] Built target rimage_ep
make[1]: *** [CMakeFiles/Makefile2:2154: src/arch/xtensa/CMakeFiles/bin.dir/rule] Error 2
make: *** [Makefile:814: bin] Error 2
@fredoh9 are you saying we have some dependencies before merging ?

@fredoh9 : Need to take below commit into sof git for rimage compilation.
thesofproject/rimage@1b233f6

marc-hb · 2022-07-07T17:35:54Z

@marc-hb : There is no issue in rmb tool chain.

You're confusing me with @fredoh9 :-)

But issue is due to gcc compiler was not picking the core-isa.h file which we up streamed.

Note there are files with all the same "core-isa.h" names everywhere: in SOF, in the toolchains, in qemu, in Zephyr HALs,.... What #include could possibly go wrong?

@fredoh9 : Need to take below commit into sof git for rimage compilation.

@balakishorepati please submit an rimage submodule update in SOF. See recent and good example in 4e1d3ba

balakishorepati · 2022-08-08T15:42:40Z

@marc-hb : There is no issue in rmb tool chain.

You're confusing me with @fredoh9 :-)

But issue is due to gcc compiler was not picking the core-isa.h file which we up streamed.

Note there are files with all the same "core-isa.h" names everywhere: in SOF, in the toolchains, in qemu, in Zephyr HALs,.... What #include could possibly go wrong?

@fredoh9 : Need to take below commit into sof git for rimage compilation.

@balakishorepati please submit an rimage submodule update in SOF. See recent and good example in 4e1d3ba

Please find the below pull request to resolve picking up of proper core-isa.h file.
thesofproject/xtensa-overlay#14

lgirdwood · 2022-08-08T15:49:03Z

Please find the below pull request to resolve picking up of proper core-isa.h file.
thesofproject/xtensa-overlay#14

Now merged. Not sure how CI picks up this update for overlays. @marc-hb @greg-intel what needs done here ?

lgirdwood · 2022-08-08T15:50:40Z

Please find the below pull request to resolve picking up of proper core-isa.h file.
thesofproject/xtensa-overlay#14

Now merged. Not sure how CI picks up this update for overlays. @marc-hb @greg-intel what needs done here ?

@balakishorepati thinking aloud, force pushing this PR again may cause the container to rebuild and pick up the new overlay. It's worth a try as @marc-hb is out atm.

lgirdwood · 2022-08-08T15:51:08Z

Please find the below pull request to resolve picking up of proper core-isa.h file.
thesofproject/xtensa-overlay#14

Now merged. Not sure how CI picks up this update for overlays. @marc-hb @greg-intel what needs done here ?

@balakishorepati thinking aloud, rebase and force pushing this PR again may cause the container to rebuild and pick up the new overlay. It's worth a try as @marc-hb is out atm.

marc-hb · 2022-08-08T20:20:36Z

The docker build is unfortunately manual for now, updates are infrequent so it wasn't worth investing in automating it. More in #5073

I'm on vacation but @fredoh9 knows much more than me about this.

fredoh9 · 2022-08-09T16:42:53Z

I will try with latest xtensa-overlay (including thesofproject/xtensa-overlay#14)

Add AMD/Rembrandt (rmb) gcc toolchain to thesofproject/sof docker image. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>

fredoh9 · 2022-08-09T21:59:42Z

rmb build fine with latest docker build.
20220809 is new tag. Need to do some sanity test with it. Will promote to the latest by the end of today or tomorrow.
Will rebase and update this PR shortly.

lgirdwood · 2022-08-10T06:57:43Z

@fredoh9 pls let me know when this can be merged. Thanks.

fredoh9 · 2022-08-10T19:31:23Z

This is tested fine, can be merged now.

#6119 also ready to merge also.

fredoh9 changed the title ~~docker: add AMD/Rembrandt gcc toolchain~~ [SKIP CI] docker: add AMD/Rembrandt gcc toolchain Jun 6, 2022

fredoh9 requested a review from marc-hb June 6, 2022 20:00

fredoh9 marked this pull request as ready for review June 6, 2022 22:43

fredoh9 requested review from dbaluta, lbetlej, lgirdwood, mmaka1 and plbossart as code owners June 6, 2022 22:43

marc-hb requested a review from balakishorepati June 6, 2022 22:48

lgirdwood approved these changes Jun 7, 2022

View reviewed changes

balakishorepati approved these changes Jun 8, 2022

View reviewed changes

marc-hb marked this pull request as draft June 8, 2022 13:40

docker: add AMD/Rembrandt gcc toolchain

f474f75

Add AMD/Rembrandt (rmb) gcc toolchain to thesofproject/sof docker image. Signed-off-by: Fred Oh <fred.oh@linux.intel.com>

fredoh9 marked this pull request as ready for review August 9, 2022 22:12

fredoh9 force-pushed the fix/amd_rmb_tool_docker branch from 7802d33 to f474f75 Compare August 9, 2022 22:12

lgirdwood merged commit 4e85dfc into thesofproject:main Aug 10, 2022

Conversation

fredoh9 commented Jun 6, 2022

Uh oh!

fredoh9 commented Jun 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lgirdwood commented Jun 7, 2022

Uh oh!

lgirdwood commented Jun 8, 2022

Uh oh!

marc-hb commented Jun 8, 2022

Uh oh!

fredoh9 commented Jun 9, 2022

Uh oh!

lgirdwood commented Jul 7, 2022

Uh oh!

marc-hb commented Jul 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

balakishorepati commented Jul 7, 2022

Uh oh!

balakishorepati commented Jul 7, 2022

Uh oh!

marc-hb commented Jul 7, 2022

Uh oh!

balakishorepati commented Aug 8, 2022

Uh oh!

lgirdwood commented Aug 8, 2022

Uh oh!

lgirdwood commented Aug 8, 2022

Uh oh!

lgirdwood commented Aug 8, 2022

Uh oh!

marc-hb commented Aug 8, 2022

Uh oh!

fredoh9 commented Aug 9, 2022

Uh oh!

fredoh9 commented Aug 9, 2022

Uh oh!

lgirdwood commented Aug 10, 2022

Uh oh!

fredoh9 commented Aug 10, 2022

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fredoh9 commented Jun 6, 2022 •

edited

Loading

marc-hb commented Jul 7, 2022 •

edited

Loading