riscv32imac-unknown-xous-elf: add target #97577

xobs · 2022-05-31T08:39:54Z

This PR starts the process of upstreaming support for our operating system, thanks to a suggestion from @yaahc on Twitter. We have maintained a fork of Rust and have made changes to improve support for our platform since Rust 1.51. Now we would like to upstream these changes.

Xous is a microkernel operating system designed to run on small systems. The kernel contains a wide range of userspace processes that provide common services such as console output, networking, and time access.

The kernel and its services are completely written in Rust using a custom build of libstd. This adds support for this target to upstream Rust so that we can drop support for our out-of-tree target.json file.

This first patch adds a Tier 3 target for Xous running on RISC-V. Future patches will add libstd support, but those patches require changes to dlmalloc and compiler_builtins.

Tier 3 policy:

A tier 3 target must have a designated developer or developers (the "target maintainers") on record to be CCed when issues arise regarding the target. (The mechanism to track and CC such developers may evolve over time.)

I will be the target maintainer for this target on matters that pertain to the xous part of the triple. For matters pertaining to the riscv32imac part of the triple, there should be no difference from all other riscv targets. If there are issues, I will address issues regarding the target.

Targets must use naming consistent with any existing targets; for instance, a target for the same CPU or OS as an existing Rust target should use the same name for that CPU or OS. Targets should normally use the same names and naming conventions as used elsewhere in the broader ecosystem beyond Rust (such as in other toolchains), unless they have a very good reason to diverge. Changing the name of a target can be highly disruptive, especially once the target reaches a higher tier, so getting the name right is important even for a tier 3 target.

This is a new OS, so I have taken the riscv32imac-unknown-none-elf target and changed the os section of the triple. This follows convention on targets such as riscv32gc-unknown-linux-gnu and mipsel-unknown-linux-uclibc. An argument could be made for omitting the -elf section of the triple, such as riscv32imc-esp-espidf, however I'm not certain what benefit that has.

Target names should not introduce undue confusion or ambiguity unless absolutely necessary to maintain ecosystem compatibility. For example, if the name of the target makes people extremely likely to form incorrect beliefs about what it targets, the name should be changed or augmented to disambiguate it.

I feel that the target name does not introduce any ambiguity.

Tier 3 targets may have unusual requirements to build or use, but must not create legal issues or impose onerous legal terms for the Rust project or for Rust developers or users.

The only unusual requirement for building the compiler-builtins crate is a standard RISC-V C compiler supported by cc-rs, and using this target does not require any additional software beyond what is shipped by rustup.

The target must not introduce license incompatibilities.

All of the additional code will use Apache-2.0.

Anything added to the Rust repository must be under the standard Rust license (MIT OR Apache-2.0).

Agreed, and there is no problem here.

The target must not cause the Rust tools or libraries built for any other host (even when supporting cross-compilation to the target) to depend on any new dependency less permissive than the Rust licensing policy. This applies whether the dependency is a Rust crate that would require adding new license exceptions (as specified by the tidy tool in the rust-lang/rust repository), or whether the dependency is a native library or binary. In other words, the introduction of the target must not cause a user installing or running a version of Rust or the Rust tools to be subject to any new license requirements.

The only new dependency will be the xous crate, which is licensed MIT OR Apache-2.0

Compiling, linking, and emitting functional binaries, libraries, or other code for the target (whether hosted on the target itself or cross-compiling from another target) must not depend on proprietary (non-FOSS) libraries. Host tools built for the target itself may depend on the ordinary runtime libraries supplied by the platform and commonly used by other applications built for the target, but those libraries must not be required for code generation for the target; cross-compilation to the target must not require such libraries at all. For instance, rustc built for the target may depend on a common proprietary C runtime library or console output library, but must not depend on a proprietary code generation library or code optimization library. Rust's license permits such combinations, but the Rust project has no interest in maintaining such combinations within the scope of Rust itself, even at tier 3.

Linking is performed by rust-lld

"onerous" here is an intentionally subjective term. At a minimum, "onerous" legal/licensing terms include but are not limited to: non-disclosure requirements, non-compete requirements, contributor license agreements (CLAs) or equivalent, "non-commercial"/"research-only"/etc terms, requirements conditional on the employer or employment of any particular Rust developers, revocable terms, any requirements that create liability for the Rust project or its developers or users, or any requirements that adversely affect the livelihood or prospects of the Rust project or its developers or users.

There are no terms. Xous is completely open. It runs on open hardware. We even provide the source to the CPU.

Neither this policy nor any decisions made regarding targets shall create any binding agreement or estoppel by any party. If any member of an approving Rust team serves as one of the maintainers of a target, or has any legal or employment requirement (explicit or implicit) that might affect their decisions regarding a target, they must recuse themselves from any approval decisions regarding the target's tier status, though they may otherwise participate in discussions.

This paragraph makes sense, but I don't think it's directed at me.

This requirement does not prevent part or all of this policy from being cited in an explicit contract or work agreement (e.g. to implement or maintain support for a target). This requirement exists to ensure that a developer or team responsible for reviewing and approving a target does not face any legal threats or obligations that would prevent them from freely exercising their judgment in such approval, even if such judgment involves subjective matters or goes beyond the letter of these requirements.

This paragraph also does not appear to be directed at me.

Tier 3 targets should attempt to implement as much of the standard libraries as possible and appropriate (core for most targets, alloc for targets that can support dynamic memory allocation, std for targets with an operating system or equivalent layer of system-provided functionality), but may leave some code unimplemented (either unavailable or stubbed out as appropriate), whether because the target makes it impossible to implement or challenging to implement. The authors of pull requests are not obligated to avoid calling any portions of the standard library on the basis of a tier 3 target not implementing those portions.

So far we have:

Thread
Mutexex
Condvar
TcpStream
TcpListener
UdpSocket
DateTime
alloc

These will be merged as part of libstd in a future patch once I submit support for Xous in dlmalloc and compiler-builtins.

The target must provide documentation for the Rust community explaining how to build for the target, using cross-compilation if possible. If the target supports running binaries, or running tests (even if they do not pass), the documentation must explain how to run such binaries or tests for the target, using emulation if possible or dedicated hardware if necessary.

Testing is currently done on real hardware or in a Renode emulator. I can add documentation on how to do this in a future patch, and I would need instructions on where to add said documentation.

Tier 3 targets must not impose burden on the authors of pull requests, or other developers in the community, to maintain the target. In particular, do not post comments (automated or manual) on a PR that derail or suggest a block on the PR based on a tier 3 target. Do not send automated messages or notifications (via any medium, including via @) to a PR author or others involved with a PR regarding a tier 3 target, unless they have opted into such messages.

Alright.

Backlinks such as those generated by the issue/PR tracker when linking to an issue or PR are not considered a violation of this policy, within reason. However, such messages (even on a separate repository) must not generate notifications to anyone involved with a PR who has not requested such notifications.

Sounds good.

Patches adding or updating tier 3 targets must not break any existing tier 2 or tier 1 target, and must not knowingly break another tier 3 target without approval of either the compiler team or the maintainers of the other tier 3 target.

This shouldn't affect any other targets, so this is understood.

In particular, this may come up when working on closely related targets, such as variations of the same architecture with different features. Avoid introducing unconditional uses of features that another variation of the target may not have; use conditional compilation or runtime detection, as appropriate, to let each target run code supported by that target.

This shouldn't come up right away. xous is a new operating system, and most features are keyed off of target(os = "xous") rather than a given architecture.

rust-highfive · 2022-05-31T08:39:57Z

r? @nagisa

(rust-highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2022-05-31T08:39:58Z

⚠️ Warning ⚠️

These commits modify compiler targets. (See the Target Tier Policy.)

Urgau · 2022-05-31T08:58:02Z

To speed up the review process of this PR, you could directly add to your initial message the answers to the Tier 3 "Target tier policy". Example here #94872 (comment). As well as adding an entry in src/doc/rustc/src/platform-support, example here https://github.com/rust-lang/rust/pull/94872/files#diff-d320f0b01f351d17f71e524691dca8850180c49d04913eef532d6cfc6469a09e

Btw, to fix the CI issue use ./x.py test --stage 1 src/test/ui/check-cfg --bless

yaahc · 2022-05-31T19:13:49Z

Testing is currently done on real hardware or in a Renode emulator. I can add documentation on how to do this in a future patch, and I would need instructions on where to add said documentation.

I expect the best place would be within your platform-support markdown page

yaahc

LGTM but going to leave the r+ to someone more familiar with our tier policy and target support.

xobs · 2022-06-01T08:59:04Z

Sounds good. I've made those changes, and it also now passes CI.

nagisa

Overall LGTM, see the nits inline, r=me after.

@rustbot author

nagisa · 2022-06-03T23:40:39Z

src/doc/rustc/src/platform-support/riscv32imac-unknown-xous-elf.md

+
+## Cross-compilation
+
+This target can be cross-compiled from any hosts.


Suggested change

This target can be cross-compiled from any hosts.

This target can be cross-compiled from any host.

nagisa · 2022-06-03T23:41:27Z

compiler/rustc_target/src/spec/mod.rs

@@ -1032,6 +1032,8 @@ supported_targets! {
    ("x86_64-unknown-none", x86_64_unknown_none),

    ("mips64-openwrt-linux-musl", mips64_openwrt_linux_musl),
+
+    ("riscv32imac-unknown-xous-elf", riscv32imac_unknown_xous_elf),


Could you group this alongside all the other riscv targets in this list?

nagisa · 2022-06-03T23:43:39Z

compiler/rustc_target/src/spec/riscv32imac_unknown_xous_elf.rs

+            // emit_debug_gdb_scripts: false,
+            // eh_frame_header: false,


Is there a reason why it'd be worthwhile to keep these commented out? If not, consider just removing the lines.

rustbot · 2022-06-03T23:46:39Z

Error: The "Author" shortcut only works on pull requests.

Please let @rust-lang/release know if you're having trouble with this bot.

rustbot · 2022-06-03T23:46:39Z

Error: The "Author" shortcut only works on pull requests.

Please let @rust-lang/release know if you're having trouble with this bot.

Xous is a microkernel operating system designed to run on small systems. The kernel contains a wide range of userspace processes that provide common services such as console output, networking, and time access. The kernel and its services are completely written in Rust using a custom build of libstd. This adds support for this target to upstream Rust so that we can drop support for our out-of-tree `target.json` file. Add a Tier 3 target for Xous running on RISC-V. Signed-off-by: Sean Cross <[email protected]>

Signed-off-by: Sean Cross <[email protected]>

nagisa · 2022-06-04T10:55:59Z

@bors r+ Thanks!

bors · 2022-06-04T10:56:01Z

📌 Commit dc78970 has been approved by nagisa

bors · 2022-06-05T07:03:58Z

⌛ Testing commit dc78970 with merge a2da4af...

bors · 2022-06-05T09:30:47Z

☀️ Test successful - checks-actions
Approved by: nagisa
Pushing a2da4af to master...

rust-timer · 2022-06-05T10:48:41Z

Finished benchmarking commit (a2da4af): comparison url.

Instruction count

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions 😿 (primary)	0.7%	0.7%	1
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	0.7%	0.7%	1

Max RSS (memory usage)

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	4.0%	4.5%	2
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-2.3%	-2.3%	1
All 😿🎉 (primary)	N/A	N/A	0

Cycles

Results

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	-4.1%	-4.1%	1
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	-4.1%	-4.1%	1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

rust-highfive assigned nagisa May 31, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 31, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2022

This comment has been minimized.

Sign in to view

xobs force-pushed the add-xous-target branch 2 times, most recently from da3d1ec to 14c3d07 Compare May 31, 2022 10:55

yaahc approved these changes May 31, 2022

View reviewed changes

nagisa reviewed Jun 3, 2022

View reviewed changes

nagisa added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2022

Mark-Simulacrum mentioned this pull request Jun 4, 2022

Treat PR reviews as pull requests rust-lang/triagebot#1619

Merged

xobs added 3 commits June 4, 2022 18:47

platform-support: add riscv32imac-unknown-xous-elf

796d7d2

Signed-off-by: Sean Cross <[email protected]>

test: add xous to well-known-values.stderr

dc78970

Signed-off-by: Sean Cross <[email protected]>

xobs force-pushed the add-xous-target branch from 14c3d07 to dc78970 Compare June 4, 2022 10:47

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 4, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2022

bors merged commit a2da4af into rust-lang:master Jun 5, 2022

rustbot added this to the 1.63.0 milestone Jun 5, 2022

bors mentioned this pull request Jun 5, 2022

Add Apple WatchOS compile targets #95243

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

riscv32imac-unknown-xous-elf: add target #97577

riscv32imac-unknown-xous-elf: add target #97577

xobs commented May 31, 2022 •

edited

Loading

rust-highfive commented May 31, 2022

rust-highfive commented May 31, 2022

This comment has been minimized.

Urgau commented May 31, 2022

yaahc commented May 31, 2022

yaahc left a comment

xobs commented Jun 1, 2022

nagisa left a comment

nagisa Jun 3, 2022

nagisa Jun 3, 2022

nagisa Jun 3, 2022

rustbot commented Jun 3, 2022

rustbot commented Jun 3, 2022

nagisa commented Jun 4, 2022

bors commented Jun 4, 2022

bors commented Jun 5, 2022

bors commented Jun 5, 2022

rust-timer commented Jun 5, 2022


		## Cross-compilation

		This target can be cross-compiled from any hosts.

riscv32imac-unknown-xous-elf: add target #97577

riscv32imac-unknown-xous-elf: add target #97577

Conversation

xobs commented May 31, 2022 • edited Loading

rust-highfive commented May 31, 2022

rust-highfive commented May 31, 2022

This comment has been minimized.

Urgau commented May 31, 2022

yaahc commented May 31, 2022

yaahc left a comment

Choose a reason for hiding this comment

xobs commented Jun 1, 2022

nagisa left a comment

Choose a reason for hiding this comment

nagisa Jun 3, 2022

Choose a reason for hiding this comment

nagisa Jun 3, 2022

Choose a reason for hiding this comment

nagisa Jun 3, 2022

Choose a reason for hiding this comment

rustbot commented Jun 3, 2022

rustbot commented Jun 3, 2022

nagisa commented Jun 4, 2022

bors commented Jun 4, 2022

bors commented Jun 5, 2022

bors commented Jun 5, 2022

rust-timer commented Jun 5, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

xobs commented May 31, 2022 •

edited

Loading