Update Linux build scripts by Arielfoever · Pull Request #889 · riscv/sail-riscv

Arielfoever · 2025-04-26T07:18:29Z

Remove old pre-built Linux images and add a Makefile to build one from scratch, including downloading all the tools.

This Makefile also includes a target for profiling using gperftools.

Fixes #580

github-actions · 2025-04-26T07:41:20Z

Test Results

400 tests ±0 400 ✅ ±0 1m 29s ⏱️ ±0s
1 suites ±0 0 💤 ±0
1 files ±0 0 ❌ ±0

Results for commit 0c905d8. ± Comparison against base commit bd8e9ab.

♻️ This comment has been updated with latest results.

Timmmm · 2025-04-26T07:54:08Z

I don't think we want to add another 23 MB ELF to the repo. Ideally we would add a script/Makefile that allows people to build it. We could also host a pre built version somewhere outside the repo and link to it.

jordancarlin

Will be great to get these images updated! Here are some initial comments. Likely more to follow.

os-boot/README.md

jordancarlin · 2025-04-26T07:36:16Z

os-boot/sail.dts

      status = "okay";
      compatible = "riscv";
-      riscv,isa = "rv64imac";
+      riscv,isa = "rv64imafd";


If we're updating the device tree, we might as well use the full list of supported extensions in the default config. That will exercise the widest variety of instructions, and therefore be a better test for the model.

I'd still like to see this fixed. Not sure why this was marked as resolved. Maybe something like this instead:

riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "v", "sstc", "svinval", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm"; riscv,cboz-block-size = <64>; riscv,cbom-block-size = <64>;

Please keep riscv,isa though, FreeBSD does not currently recognise the newer form

@Arielfoever This needs to be switched to use the longer list of extensions in the older riscv,isa format.

os-boot/README.md

Arielfoever · 2025-04-26T08:04:11Z

I don't think we want to add another 23 MB ELF to the repo. Ideally we would add a script/Makefile that allows people to build it. We could also host a pre built version somewhere outside the repo and link to it.

I will make a makefile and a CI to build it. How's this idea?

Timmmm · 2025-04-26T08:33:08Z

Sounds good to me. I think we probably don't need to add it to PR CIs but I might be nice to have a manually triggered workflow.

Arielfoever · 2025-04-26T17:45:38Z

Makefile will be in https://github.com/Arielfoever/sail-riscv master branch because I need to check CI.

I will rebase my work if everything's fine.

Arielfoever · 2025-04-27T02:59:14Z

Sounds good to me. I think we probably don't need to add it to PR CIs but I might be nice to have a manually triggered workflow.

Finished it with a Makefile and a manually triggered CI.

Timmmm

This is great. Makefile needs a bit of work (blame me!). How did you resolve the ET_DYN thing? Or does it just not happen for some reason...

os-boot/Makefile

Timmmm · 2025-04-28T13:58:35Z

os-boot/Makefile

+sail: sail.dtb
+	../build/c_emulator/riscv_sim_rv64d --no-trace -p -l $(LIMIT_INSTRUCTIONS) --device-tree-blob sail.dtb -t /tmp/console.log build/opensbi-$(OPENSBI_VERSION)/build/platform/generic/firmware/fw_payload.elf
+
+# QEMU attempt. Not sure I ever got this working.


Delete this attempt! (Or this comment if it actually works.)

this qemu is work.

As you wish.

this qemu is work

Do you mean that command does work? If so that's great - let's leave it in! (And remove the comment about it not working.)

os-boot/Makefile

os-boot/README.md

Timmmm · 2025-04-28T14:05:13Z

os-boot/Makefile

+# Number of instructions to run.
+LIMIT_INSTRUCTIONS ?= 250000
+
+linux:


Would be nice if we made the dependency tree work. E.g. this should depend build/linux-$(LINUX_VERSION)/Makefile and the download_linux rule should be

build/linux-$(LINUX_VERSION)/Makefile: mkdir -p build ...

I can do it if you like when the other comments are resolved.

I will do it after no one objects in other comments after I finish my roommate's birthday lunch.

jordancarlin

Seems like it is not (easily) possible to download the generated artifact from the command line (actions/upload-artifact#89), so we probably need to figure out a different place for the final upload.

Also, should we rename all of this to just linux instead of os-boot since this is removing all of the other OSs? At least the workflow file.

Arielfoever · 2025-04-29T03:17:31Z

Seems like it is not (easily) possible to download the generated artifact from the command line (actions/upload-artifact#89), so we probably need to figure out a different place for the final upload.

Also, should we rename all of this to just linux instead of os-boot since this is removing all of the other OSs? At least the workflow file.

renamed CI as you wish.

Arielfoever · 2025-04-29T15:14:34Z

Everything's up-to-date. See https://github.com/Arielfoever/sail-riscv/actions/runs/14734807045

os-boot/README.md

jordancarlin · 2025-04-29T15:22:35Z

os-boot/sail.dts

      status = "okay";
      compatible = "riscv";
-      riscv,isa = "rv64imac";
+      riscv,isa = "rv64imafd";


I'd still like to see this fixed. Not sure why this was marked as resolved. Maybe something like this instead:

riscv,isa-base = "rv64i"; riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "v", "sstc", "svinval", "zba", "zbb", "zbc", "zbs", "zca", "zcb", "zcd", "zfa", "zfh", "zkn", "zkt", "zicbom", "zicboz", "zicntr", "zicond", "zicsr", "zifencei", "zihpm"; riscv,cboz-block-size = <64>; riscv,cbom-block-size = <64>;

jordancarlin

Might be worth actually booting Linux on Sail in this CI job to make sure everything worked correctly before uploading it.

.github/workflows/linux.yml

Arielfoever · 2025-04-29T16:37:48Z

Might be worth actually booting Linux on Sail in this CI job to make sure everything worked correctly before uploading it.

Test at last step of CI.

arichardson · 2025-04-29T17:45:40Z

Looks like we need to install dtc in the CI? /bin/sh: 1: dtc: not found

jordancarlin · 2025-06-26T04:17:51Z

Ok from my point of view everything except the CI flow is ready (and I haven't actually read through it in detail yet). Since we weren't testing this in CI before, I think we should remove it from this PR, merge this, and then make another PR to actually run this in CI. What do people think?

Agreed that it makes sense to merge the Linux boot without adding it to CI as a first step. I do wonder if it’s worth converting to CMake though to be consistent with the rest of our build system.

Arielfoever · 2025-06-27T07:33:41Z

#966 is ready to be merged and be a test ci. @Timmmm

I need a few more days to check the config config for linux kernel.

Timmmm · 2025-06-27T09:38:33Z

I removed the CI flow from this PR. I think lets just merge this first and then we can rebase your other PR (should be easy).

Timmmm · 2025-06-27T09:40:33Z

I do wonder if it’s worth converting to CMake though to be consistent with the rest of our build system.

Yeah you're probably right... I think we should just get this in though and do that later if anyone can be bothered.

os-boot/linux/Makefile

arichardson · 2025-06-27T18:18:07Z

A few minor comments, but I agree it would be great to land this makefile infrastructure to make it easier to test.

Timmmm · 2025-06-27T20:34:41Z

Updated & rebased. I squashed the commits too since they were getting a bit numerous...

pmundkur · 2025-06-27T21:23:17Z

Is it getting to Linux now? Last I checked, it booted OpenSBI and then appeared to get stuck.

Timmmm · 2025-06-28T20:30:10Z

Ah yeah it was booting but the console output wasn't showing because the DTS was missing the chosen { } section. I added that back and it works now. Slowly.

os-boot/linux/opensbi.url

Arielfoever · 2025-06-30T12:07:23Z

I think everything's work.

Add missing "chosen" section to device tree Signed-off-by: Ariel Xiong <ArielHeleneto@outlook.com> Co-authored-by: Tim Hutt <tdhutt@gmail.com>

jordancarlin

One minor comment, but otherwise LGTM and will be great to finally get this in.

os-boot/linux/Makefile

Co-authored-by: Jordan Carlin <jordanmcarlin@gmail.com> Signed-off-by: Tim Hutt <tdhutt@gmail.com>

Arielfoever force-pushed the os-boot branch from 7adbefa to 560fc8b Compare April 26, 2025 07:28

jordancarlin requested changes Apr 26, 2025

View reviewed changes

Arielfoever force-pushed the os-boot branch from 560fc8b to 3f12183 Compare April 26, 2025 08:05

Arielfoever force-pushed the os-boot branch from 9a7f7e2 to 9ae338f Compare April 27, 2025 02:56

Arielfoever requested a review from jordancarlin April 27, 2025 02:58

Arielfoever force-pushed the os-boot branch from 9ae338f to 5e26b6e Compare April 27, 2025 06:32

Timmmm requested changes Apr 28, 2025

View reviewed changes

jordancarlin reviewed Apr 28, 2025

View reviewed changes

Arielfoever force-pushed the os-boot branch from 5e26b6e to d65c251 Compare April 29, 2025 03:13

Arielfoever requested review from Timmmm and jordancarlin April 29, 2025 03:17

Arielfoever force-pushed the os-boot branch 2 times, most recently from 72eb8ee to d66a750 Compare April 29, 2025 15:13

jordancarlin requested changes Apr 29, 2025

View reviewed changes

Arielfoever force-pushed the os-boot branch from d66a750 to 59a98ba Compare April 29, 2025 15:45

Arielfoever requested a review from jordancarlin April 29, 2025 15:49

jordancarlin reviewed Apr 29, 2025

View reviewed changes

.github/workflows/linux.yml Outdated Show resolved Hide resolved

Arielfoever force-pushed the os-boot branch 2 times, most recently from b74016d to 21747c2 Compare April 29, 2025 16:37

Arielfoever force-pushed the os-boot branch from 21747c2 to 3dbf9f9 Compare April 29, 2025 16:39

Timmmm force-pushed the os-boot branch from f0ff120 to 0f22a62 Compare June 27, 2025 09:37

Timmmm changed the title ~~Move to new os-boot.~~ Update Linux build scripts Jun 27, 2025

arichardson reviewed Jun 27, 2025

View reviewed changes

os-boot/linux/Makefile Outdated Show resolved Hide resolved

arichardson reviewed Jun 27, 2025

View reviewed changes

os-boot/linux/Makefile Outdated Show resolved Hide resolved

arichardson reviewed Jun 27, 2025

View reviewed changes

os-boot/linux/Makefile Outdated Show resolved Hide resolved

Timmmm force-pushed the os-boot branch from 8ee25d0 to 6c44fbf Compare June 27, 2025 20:33

arichardson approved these changes Jun 27, 2025

View reviewed changes

jordancarlin reviewed Jun 30, 2025

View reviewed changes

os-boot/linux/opensbi.url Outdated Show resolved Hide resolved

os-boot: Update Linux 6.15.4 image with openSBI 1.7.

d1a4010

Add missing "chosen" section to device tree Signed-off-by: Ariel Xiong <ArielHeleneto@outlook.com> Co-authored-by: Tim Hutt <tdhutt@gmail.com>

Arielfoever force-pushed the os-boot branch from e64dae8 to d1a4010 Compare June 30, 2025 12:15

Timmmm approved these changes Jun 30, 2025

View reviewed changes

pmundkur approved these changes Jun 30, 2025

View reviewed changes

jordancarlin reviewed Jul 1, 2025

View reviewed changes

os-boot/linux/Makefile Outdated Show resolved Hide resolved

Update os-boot/linux/Makefile

0c905d8

Co-authored-by: Jordan Carlin <jordanmcarlin@gmail.com> Signed-off-by: Tim Hutt <tdhutt@gmail.com>

Timmmm added the will be merged Scheduled to be merged soon if nobody objects label Jul 1, 2025

jordancarlin approved these changes Jul 1, 2025

View reviewed changes

Timmmm added this pull request to the merge queue Jul 2, 2025

Merged via the queue into riscv:master with commit 3fc7621 Jul 2, 2025
7 checks passed

Arielfoever deleted the os-boot branch July 15, 2025 03:46

Arielfoever mentioned this pull request Jul 20, 2025

openSBI with sail-riscv #886

Closed

Comments

Conversation

Arielfoever commented Apr 26, 2025 • edited by Timmmm Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Apr 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

Timmmm commented Apr 26, 2025

Uh oh!

jordancarlin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Arielfoever commented Apr 26, 2025

Uh oh!

Timmmm commented Apr 26, 2025

Uh oh!

Arielfoever commented Apr 26, 2025

Uh oh!

Arielfoever commented Apr 27, 2025

Uh oh!

Timmmm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jordancarlin left a comment

Choose a reason for hiding this comment

Uh oh!

Arielfoever commented Apr 29, 2025

Uh oh!

Arielfoever commented Apr 29, 2025

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jordancarlin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Arielfoever commented Apr 29, 2025

Uh oh!

arichardson commented Apr 29, 2025

Uh oh!

jordancarlin commented Jun 26, 2025

Uh oh!

Arielfoever commented Jun 27, 2025

Uh oh!

Timmmm commented Jun 27, 2025

Uh oh!

Timmmm commented Jun 27, 2025

Uh oh!

Uh oh!

Arielfoever commented Apr 26, 2025 •

edited by Timmmm

Loading

github-actions bot commented Apr 26, 2025 •

edited

Loading