migrate thumb-none-qemu to rmake by folkertdev · Pull Request #128639 · rust-lang/rust (original) (raw)
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation51 Commits2 Checks6 Files changed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
[ Show hidden characters]({{ revealButtonHref }})
tracking issue: #121876
I think this one is actually simpler than #128636, we invoke cargo run with the right target and see if the expected result appears.
r? @jieyouxu
try-job: armhf-gnu
try-job: dist-various-1
try-job: test-various
Area: port run-make Makefiles to rmake.rs
Area: The testsuite used to check the correctness of rustc
Status: Awaiting review from the assignee but also interested parties.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
labels
This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.
cc @jieyouxu
| //! $ ./x.py clean |
|---|
| //! $ ./x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi tests/run-make |
| //! |
| //! For supported targets, see `example/.cargo/config` |
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that file notes that some targets are not quite accurate because qemu is too old. Maybe that has changed? we can try that separately though.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, I have no clue what the up-to-date cargo config in this case is for thumb targets and I don't have the environment to set it, I'm fine with keeping the config as-is for now. If anyone knowledgeable about thumb can update that config, I would be happy to accept.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've now updated the thumbv6m-none-eabi target to use the -cpu cortex-m0. We'll see if that causes issues, it shouldn't if the qemu version is remotely recent. Otherwise I think that config file looks fine.
Ah hah, I see this is going to require some archaeology 😄 I'll take a look at this tmrw
yeah I've also added this to the agenda of the embedded-wg rust-embedded/wg#783, they might have thoughts on how big a deal this actually is.
I did some of the detective work: that file is 5 years old, so it is quite plausible that more things now work. With my qemu, cortex-m0 is now available. cortexm-23 is not. I was not able to build a version of qemu, so I'm not 100% sure that it's not supported.
> qemu-system-arm --version
QEMU emulator version 8.1.1
Copyright (c) 2003-2023 Fabrice Bellard and the QEMU Project developers
> qemu-system-arm -cpu help | grep "cortex"
cortex-a15
cortex-a7
cortex-a8
cortex-a9
cortex-m0
cortex-m3
cortex-m33
cortex-m4
cortex-m55
cortex-m7
cortex-r5
cortex-r52
cortex-r5f
anyway, we can update that separately from switching to rmake, and given that it's apparently not caused issues over the last 5 years it's probably not a high priority.
Member
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, this looks very reasonable. I'll run a couple of try jobs to check after not using the extra directory indirection.
| @@ -1,20 +0,0 @@ |
|---|
| #!/bin/sh |
| set -exuo pipefail |
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| //! $ ./x.py clean |
|---|
| //! $ ./x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi tests/run-make |
| //! |
| //! For supported targets, see `example/.cargo/config` |
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, I have no clue what the up-to-date cargo config in this case is for thumb targets and I don't have the environment to set it, I'm fine with keeping the config as-is for now. If anyone knowledgeable about thumb can update that config, I would be happy to accept.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remark: I wonder if this needs LD_LIBRARY_PATH set.
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
bors added a commit to rust-lang-ci/rust that referenced this pull request
…
migrate thumb-none-qemu to rmake
tracking issue: rust-lang#121876
I think this one is actually simpler than rust-lang#128636, we invoke cargo run with the right target and see if the expected result appears.
r? @jieyouxu
try-job: armhf-gnu try-job: dist-various-1 try-job: test-various
This comment was marked as resolved.
Status: Awaiting review from the assignee but also interested parties.
and removed S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Status: Blocked on something else such as an RFC or other implementation work.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
☀️ Try build successful - checks-actions
Build commit: 7084c9b (7084c9bc957727b458119a236606b59164ea79ad)
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| //! $ ./x.py clean |
|---|
| //! $ ./x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi tests/run-make |
| //! |
| //! For supported targets, see `example/.cargo/config` |
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've now updated the thumbv6m-none-eabi target to use the -cpu cortex-m0. We'll see if that causes issues, it shouldn't if the qemu version is remotely recent. Otherwise I think that config file looks fine.
📌 Commit 3e5885f has been approved by jieyouxu
It is now in the queue for this repository.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
bors added a commit to rust-lang-ci/rust that referenced this pull request
…jieyouxu
migrate thumb-none-qemu to rmake
tracking issue: rust-lang#121876
I think this one is actually simpler than rust-lang#128636, we invoke cargo run with the right target and see if the expected result appears.
r? @jieyouxu
try-job: armhf-gnu try-job: dist-various-1 try-job: test-various
A job failed! Check out the build log: (web) (plain)
Click to see the possible cause of the failure (guessed by this bot)
Status: Awaiting review from the assignee but also interested parties.
and removed S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
looks like bors still has some issues?
#1 28.11 error: failed to list workers: Unavailable: connection error: desc = "transport: Error while dialing: dial unix /run/buildkit/buildkitd.sock: connect: no such file or directory"
#1 creating container buildx_buildkit_fervent_leavitt0 27.9s done
#1 ERROR: exit code 1
This comment was marked as resolved.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
This comment was marked as resolved.
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
This comment was marked as resolved.
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
📌 Commit 3e5885f has been approved by jieyouxu
It is now in the queue for this repository.
Finished benchmarking commit (2048386): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
Results (primary 0.1%, secondary 0.5%)
This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
| mean | range | count | |
|---|---|---|---|
| Regressions ❌ (primary) | 3.3% | [3.3%, 3.3%] | 1 |
| Regressions ❌ (secondary) | 3.8% | [3.8%, 3.8%] | 1 |
| Improvements ✅ (primary) | -3.1% | [-3.1%, -3.1%] | 1 |
| Improvements ✅ (secondary) | -2.7% | [-2.7%, -2.7%] | 1 |
| All ❌✅ (primary) | 0.1% | [-3.1%, 3.3%] | 2 |
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 760.03s -> 761.822s (0.24%)
Artifact size: 337.08 MiB -> 337.08 MiB (0.00%)
Labels
Area: port run-make Makefiles to rmake.rs
Area: The testsuite used to check the correctness of rustc
This PR was explicitly merged by bors.
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)