Compile apps for RISC-V with make flag #88

bradjc · 2020-06-05T19:44:39Z

This adds rv32imac binaries to TABs from libtock-c. These are compiled for specific flash and RAM addresses.

The main change for doing this is automatically generating the linker script when building for each architecture. This copies the default linker script and sets the addresses if needed. Different compilation versions are set in the Configuration.mk makefile.

This also compiles libraries for rv32imac, and updates some apps that use assembly.

TODO

fix crt0 header for riscv, need to take the stack size into account
make got just a copy
fix lst build for cortex-m

README.md

ppannuto

I didn't test this yet as I was hoping to skip brew debugging.

From just reading it, it looks like this will force a recompile every time make is run? (Because the binary depends on the *.custum.ld and the rule that makes that file runs unconditionally). I wouldn't expect to recompile if nothing has changed though.

examples/tests/stack_size_test02/main.c

examples/lua-hello/Makefile

examples/ble_passive_scanning/Makefile

AppMakefile.mk

README.md

bradjc · 2020-06-08T16:10:31Z

Ok it seems like the main issue is how to install toolchains, and make sure they work on both mac and linux. There was no pushback on #44, so I'm assuming there is no reservations about supporting both, we just need reasonable install steps.

If anyone knows of a trick for installing on Linux, please let me know.

bradjc · 2020-06-08T17:04:32Z

I don't even know where to post an issue (or comment on one) asking the toolchain maintainers to make this easier. But, I'm kind of thinking we just host our own build for ubuntu.

alistair23

Why are you checking in some binary files as well?

.travis-install-gcc

.travis.yml

README.md

Configuration.mk

bradjc · 2020-06-08T17:59:17Z

We pre-compile binaries (nrf serialization for example) to make it easier for users.

alistair23 · 2020-06-08T18:05:24Z

How do you handle different RISC-V ISA strings in the pre-compiled binaries? For example supporting both OT and the HiFive1?

bradjc · 2020-06-08T18:06:58Z

It's no different than cortex-m3 vs m4 (at least it shouldn't be).

alistair23 · 2020-06-08T18:09:38Z

Good point.

Just watch out as there are a lot of different combinations that will have to be built and maintained as RISC-V support grows.

README.md

alistair23 · 2020-06-11T23:15:28Z

README.md

+   $ sudo apt install gcc-riscv64-unknown-elf
+   ```
+
+   Unfortunately, Ubuntu does not currently (June 2020) provide a package for


It's probably best to specify the version as earlier then 20.10

What happens if this isn't fixed in 20.10?

Then we will have to update it, but a date has the same problem. What if 20.10 works? It's then not clear to people that it should work for them.

Either way though we will need to update the steps.

libtock/crt0.c

userland_generic.ld

README.md

ppannuto · 2020-06-14T20:12:49Z

I don't this TOCK_TARGETS is working as expected? Since I don't currently have a working riscv toolchain, I tried building the hail app to see if other stuff still worked, but that resulted in:

[-bash] Sun 14 Jun 16:10 [[riscv-for-all] ~/code/helena-project/libtock-c/examples/tests/hail]
$ make
  CC        ../../../libtock/internal/alarm_internal.c
/bin/sh: riscv64-unknown-elf-gcc: command not found
make: *** [../../../libtock/build/rv32imac/alarm_internal.o] Error 127

If riscv isn't in the targets list, then its toolchain shouldn't be being invoked at all.

Verbose output

[-bash] Sun 14 Jun 16:10 [[riscv-for-all] ~/code/helena-project/libtock-c/examples/tests/hail] $ make V=1 ************************************************** TOCK USERLAND BUILD SYSTEM -- VERBOSE BUILD ************************************************** Config: CC=-gcc LAYOUT=../../../userland_generic.ld MAKEFLAGS= -r -R PACKAGE_NAME=hail TOCK_ARCHS=cortex-m0 cortex-m3 cortex-m4 rv32imac rv32imc TOCK_TARGETS=cortex-m4 TOCK_USERLAND_BASE_DIR=../../.. TOOLCHAIN= **************************************************

riscv64-unknown-elf-gcc -std=gnu11 -Wbad-function-cast -Wjump-misses-init -Wmissing-prototypes -Wnested-externs -Wold-style-definition -D__TOCK__ -DSVCALL_AS_NORMAL_FUNCTION -DSOFTDEVICE_s130 -I../../../libnrfserialization/headers -frecord-gcc-switches -gdwarf-2 -Os -fdata-sections -ffunction-sections -fstack-usage -Wstack-usage=2048 -Wall -Wextra -Wl,--warn-common -Wl,--gc-sections -Wl,--emit-relocs -fPIC -include ../../../support/warning_header.h -Wdate-time -Wfloat-equal -Wformat-nonliteral -Wformat-security -Wformat-y2k -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-noreturn -Wmultichar -Wpointer-arith -Wredundant-decls -Wshadow -Wtrampolines -Wunused-macros -Wunused-parameter -Wwrite-strings -I../../../libtock/ -I../../../libtock//include -I../../../libtock//../include -I../../../libtock/internal/ -I../../../libtock/internal//include -I../../../libtock/internal//../include -march=rv32imac -mabi=ilp32 -mcmodel=medlow -Wl,--no-relax -MF"../../../libtock/build/rv32imac/alarm_internal.d" -MG -MM -MP -MT"../../../libtock/build/rv32imac/alarm_internal.d@" -MT"../../../libtock/build/rv32imac/alarm_internal.o" "../../../libtock/internal/alarm_internal.c"
/bin/sh: riscv64-unknown-elf-gcc: command not found
make: *** [../../../libtock/build/rv32imac/alarm_internal.o] Error 127

README.md

bradjc · 2020-06-14T21:24:40Z

I don't this TOCK_TARGETS is working as expected? Since I don't currently have a working riscv toolchain, I tried building the hail app to see if other stuff still worked, but that resulted in:

TARGETS works together with the TOCK_ARCHS, you have to remove it there as well.

ppannuto · 2020-06-14T21:47:17Z

TARGETS works together with the TOCK_ARCHS, you have to remove it there as well.

I guess I don't understand why these should be different things?

ppannuto · 2020-06-15T12:55:29Z

Filed riscvarchive/riscv-gcc#190 for ICE

We don't have PIC support currently, so we need to hardcode the address for the app. Also don't bother building the cortex binaries.

This reverts commit e430ca4.

ppannuto · 2020-06-16T14:44:43Z

Got it. I pushed a commit so that TOCK_ARCHS populates automatically from TOCK_TARGETS, that way if there's no riscv target (e.g. lua), only the arm toolchains are used.

bradjc · 2020-06-16T16:07:00Z

So I think the only issue left is installing a toolchain?

Ubuntu: It would be great if someone could test the ubuntu steps.
Mac: The steps work generally, but since the brew formula isn't pegged to a version asynchronous updates to the riscv/riscv-gnu-toolchain repo can lead to a buggy compiler. It also takes forever to compile. I asked about maybe fixing that second one: Include the 32 bit tools? riscv-software-src/homebrew-riscv#22. One option is we could create a homebrew-tock repo and provide our own bottles with multilib support that are pegged to a version (or commit). We could also then provide formulas for all of our tools, and the entire getting started install becomes brew tap tock/tock && brew install tock-tools.

bradjc · 2020-06-16T18:49:57Z

I think I'm concluding that the thing to do at the moment is retain the riscv branch, but have it only be a single commit to modify TOCK_TARGETS. I would also update the readme to clarify that RISC-V compilation is optional, and that if you want to compile for riscv you need to install the toolchain and checkout the riscv branch.

I think it would be better to get these changes merged, while giving us more time to work on the toolchain problems.

ppannuto · 2020-06-16T18:55:48Z

I agree that these changes are good and shouldn't sit needlessly out-of-tree while we wait on toolchain stuff.

We could even be a bit smarter and just have TOCK_TARGETS conditionally include riscv targets based on the presence of the toolchain (roughly

ifeq ($(shell command -v riscv64-unknown-elf-gcc),)
TOCK_TARGETS ?= ...arm-only
else
TOCK_TARGETS ?= ...all
endif

should work).

hudson-ayers · 2020-06-16T18:59:25Z

I agree that these changes are good and shouldn't sit needlessly out-of-tree while we wait on toolchain stuff.

We could even be a bit smarter and just have TOCK_TARGETS conditionally include riscv targets based on the presence of the toolchain (roughly
ifeq ($(shell command -v riscv64-unknown-elf-gcc),)
TOCK_TARGETS ?= ...arm-only
else
TOCK_TARGETS ?= ...all
endif
should work).

I agree that making risc-v compilation optional in the master branch is better than having it in a second branch that will have to be kept up to date with master somehow. But having the toolchain installed is not sufficient for it to actually work, and I don't think we should force users to uninstall their risc-v toolchain just to be able to build arm apps, all because their toolchain does not include newlib.

bradjc · 2020-06-16T19:03:11Z

I think it's important the out-of-master change is very small (and never grows). After this PR it would just be changing one make variable (which people will need to do anyway to support new risc-v boards with different flash and ram addresses).

But I think that is preferable to having a dynamic system where supporting users is first establishing what toolchains they have just to understand what our build system should be doing.

hudson-ayers · 2020-06-16T19:06:08Z

Why not just require users to pass --riscv to any call to make to explicitly build apps for riscv. That seems a lot easier than checking out another branch. Or set an environment variable, so that it persists once you do it once.

ppannuto · 2020-06-16T19:06:41Z

Oy. Didn't realize there was a newlib wildcard. Yeah, the single TARGETS patch feels good.

Or a guard on an environment variable, like if defined TOCK_LIBTOCKC_ENABLE_RISCV so that people doing development work don't have to keep this lingering one-line change around while they're working.

alistair23 · 2020-06-16T22:32:15Z

A single line Make change works for me, same with a command line argument of environment variable.

It kind of looks like Ubuntu is the only recent distro that doesn't support RV32 embedded libc, so this is really useful and simple for lots of people. Hopefully Ubuntu 20.10 fixes this and then we at least has a working version (although non-LTS versions don't make it to Travis).

Use `make RISCV=1` to build them.

bradjc · 2020-06-17T01:09:57Z

I added make RISCV=1, which I think is better than the branch idea. It would be nice to include the build on travis, however, but I'm not sure how to best do that.

hudson-ayers · 2020-06-17T03:40:34Z

I added make RISCV=1, which I think is better than the branch idea. It would be nice to include the build on travis, however, but I'm not sure how to best do that.

For CI, the options I see:

transition travis to macos so we get the easy toolchain install via brew
build newlib from source for ubuntu (this takes like 30 minutes, so don't love it as an option, but maybe we can figure out how to cache it?)
add a github actions runner just to run macos tests that build a couple apps for risc-v

bradjc · 2020-06-17T03:53:44Z

The riscv toolchain isn't the problem, the problem is the build all script doesn't include RISCV=1.

ppannuto · 2020-06-17T13:24:52Z

Make picks up variables from the environment, i.e. $ RISCV=1 ./build_all.sh does the right thing.

For CI, probably a separate thing, but should we kick this repo over to github actions as well? That makes mac way less painful as a target.

ppannuto

bors r+

🎉

bors · 2020-06-17T17:17:17Z

Build succeeded:

continuous-integration/travis-ci/push

88: Compile apps for RISC-V with make flag r=ppannuto a=bradjc This adds `rv32imac` binaries to TABs from libtock-c. These are compiled for specific flash and RAM addresses. The main change for doing this is automatically generating the linker script when building for each architecture. This copies the default linker script and sets the addresses if needed. Different compilation versions are set in the Configuration.mk makefile. This also compiles libraries for rv32imac, and updates some apps that use assembly. TODO ------ - [x] fix crt0 header for riscv, need to take the stack size into account - [x] make got just a copy - [x] fix lst build for cortex-m Co-authored-by: Brad Campbell <bradjc5@gmail.com> Co-authored-by: Adam H. Leventhal <ahl@oxide.computer>

hudson-ayers reviewed Jun 5, 2020

View reviewed changes

README.md Outdated Show resolved Hide resolved

ppannuto requested changes Jun 5, 2020

View reviewed changes

alistair23 suggested changes Jun 8, 2020

View reviewed changes

alistair23 reviewed Jun 9, 2020

View reviewed changes

README.md Outdated Show resolved Hide resolved

alistair23 reviewed Jun 9, 2020

View reviewed changes

README.md Outdated Show resolved Hide resolved

alistair23 reviewed Jun 11, 2020

View reviewed changes

README.md Show resolved Hide resolved

alistair23 reviewed Jun 11, 2020

View reviewed changes

bradjc added the blocked Blocked on promised changes or other PRs label Jun 12, 2020

bradjc mentioned this pull request Jun 12, 2020

Various improvements to Make in anticipation of RISC-V support #87

Closed

alistair23 approved these changes Jun 12, 2020

View reviewed changes

ppannuto requested changes Jun 14, 2020

View reviewed changes

libtock/crt0.c Outdated Show resolved Hide resolved

userland_generic.ld Outdated Show resolved Hide resolved

README.md Show resolved Hide resolved

ppannuto requested changes Jun 14, 2020

View reviewed changes

README.md Outdated Show resolved Hide resolved

ppannuto mentioned this pull request Jun 15, 2020

Remove unused volatile in crt0 #90

Closed

bradjc and others added 7 commits June 15, 2020 17:06

riscv: hack for building riscv apps

9c3f14a

We don't have PIC support currently, so we need to hardcode the address for the app. Also don't bother building the cortex binaries.

add RISC-V help document

5c5d5ec

travis: add support for risc-v gcc

3dd6dfa

fix debug flags for riscv

84641f3

riscv: fix tbf header length

7241889

ld: match fixed header length

ec2e27b

blink: add note about arty-e21

d4ccfc2

bradjc and others added 5 commits June 15, 2020 23:45

make: reset to TOCK_ARCHS

32ef6ac

make: add -lm to rv32imc

b7736c7

Revert "lua: add rv32imac compiled version"

4d41ff5

This reverts commit e430ca4.

make: use c++ libraries on riscv

545b202

make: infer TOCK_ARCHS from TOCK_TARGETS

d18a91f

make RISC-V targets optionall

75aaa12

Use `make RISCV=1` to build them.

travis: build all apps with RISC-V

11ba1dc

bradjc requested a review from ppannuto June 17, 2020 14:50

hudson-ayers approved these changes Jun 17, 2020

View reviewed changes

alistair23 approved these changes Jun 17, 2020

View reviewed changes

hudson-ayers changed the title ~~Compile apps for RISC-V by default~~ Compile apps for RISC-V with make flag Jun 17, 2020

ppannuto approved these changes Jun 17, 2020

View reviewed changes

bors bot merged commit 5d91991 into master Jun 17, 2020

bors bot deleted the riscv-for-all branch June 17, 2020 17:17

ppannuto mentioned this pull request Jun 30, 2020

How to support RISC-V apps? #44

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Compile apps for RISC-V with make flag #88

Compile apps for RISC-V with make flag #88

bradjc commented Jun 5, 2020 •

edited

Loading

ppannuto left a comment

bradjc commented Jun 8, 2020

bradjc commented Jun 8, 2020

alistair23 left a comment

bradjc commented Jun 8, 2020

alistair23 commented Jun 8, 2020

bradjc commented Jun 8, 2020

alistair23 commented Jun 8, 2020

alistair23 Jun 11, 2020

bradjc Jun 12, 2020

alistair23 Jun 12, 2020

ppannuto commented Jun 14, 2020 •

edited

Loading

bradjc commented Jun 14, 2020

ppannuto commented Jun 14, 2020

ppannuto commented Jun 15, 2020

ppannuto commented Jun 16, 2020

bradjc commented Jun 16, 2020

bradjc commented Jun 16, 2020

ppannuto commented Jun 16, 2020 •

edited

Loading

hudson-ayers commented Jun 16, 2020

bradjc commented Jun 16, 2020

hudson-ayers commented Jun 16, 2020

ppannuto commented Jun 16, 2020

alistair23 commented Jun 16, 2020

bradjc commented Jun 17, 2020

hudson-ayers commented Jun 17, 2020

bradjc commented Jun 17, 2020

ppannuto commented Jun 17, 2020

ppannuto left a comment

bors bot commented Jun 17, 2020

Compile apps for RISC-V with make flag #88

Compile apps for RISC-V with make flag #88

Conversation

bradjc commented Jun 5, 2020 • edited Loading

TODO

ppannuto left a comment

Choose a reason for hiding this comment

bradjc commented Jun 8, 2020

bradjc commented Jun 8, 2020

alistair23 left a comment

Choose a reason for hiding this comment

bradjc commented Jun 8, 2020

alistair23 commented Jun 8, 2020

bradjc commented Jun 8, 2020

alistair23 commented Jun 8, 2020

alistair23 Jun 11, 2020

Choose a reason for hiding this comment

bradjc Jun 12, 2020

Choose a reason for hiding this comment

alistair23 Jun 12, 2020

Choose a reason for hiding this comment

ppannuto commented Jun 14, 2020 • edited Loading

bradjc commented Jun 14, 2020

ppannuto commented Jun 14, 2020

ppannuto commented Jun 15, 2020

ppannuto commented Jun 16, 2020

bradjc commented Jun 16, 2020

bradjc commented Jun 16, 2020

ppannuto commented Jun 16, 2020 • edited Loading

hudson-ayers commented Jun 16, 2020

bradjc commented Jun 16, 2020

hudson-ayers commented Jun 16, 2020

ppannuto commented Jun 16, 2020

alistair23 commented Jun 16, 2020

bradjc commented Jun 17, 2020

hudson-ayers commented Jun 17, 2020

bradjc commented Jun 17, 2020

ppannuto commented Jun 17, 2020

ppannuto left a comment

Choose a reason for hiding this comment

bors bot commented Jun 17, 2020

bradjc commented Jun 5, 2020 •

edited

Loading

ppannuto commented Jun 14, 2020 •

edited

Loading

ppannuto commented Jun 16, 2020 •

edited

Loading