Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up some FIXME notes on bootstrap #134650

Merged
merged 3 commits into from
Dec 29, 2024
Merged

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Dec 22, 2024

Fixing and removing some FIXME notes.

@rustbot
Copy link
Collaborator

rustbot commented Dec 22, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 22, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 22, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Comment on lines -641 to +643
// Generate memcpy, etc. FIXME: Remove this once compiler-builtins
// automatically detects this target.

// If zkvm target, generate memcpy, etc.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was asked on the PR for clarity, but no response has been provided.

Copy link
Member

@jieyouxu jieyouxu Dec 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc riscv32im-risc0-zkvm-elf target maintainers @flaub, @jbruestle and @SchmErik: could you elaborate why this is needed or if this is still needed?

Note that riscv32im-risc0-zkvm-elf is a Tier 3 compiler target, and while we would like to avoid unnecessarily breaking stuff we don't have to, we don't offer any guarantees that it will build. We'd like to trim down complexity in the bootstrap codebase where possible, because it's already very very complex.

@bors
Copy link
Contributor

bors commented Dec 27, 2024

☔ The latest upstream changes (presumably #134830) made this pull request unmergeable. Please resolve the merge conflicts.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

Rebased.

@rustbot ready

@Kobzol
Copy link
Contributor

Kobzol commented Dec 29, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Dec 29, 2024

📌 Commit eedafbc has been approved by Kobzol

It is now in the queue for this repository.

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2024
@bors
Copy link
Contributor

bors commented Dec 29, 2024

⌛ Testing commit eedafbc with merge e7738af...

@bors
Copy link
Contributor

bors commented Dec 29, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing e7738af to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2024
@bors bors merged commit e7738af into rust-lang:master Dec 29, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 29, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (e7738af): 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 2.2%, secondary 0.8%)

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)
2.2% [2.2%, 2.2%] 1
Regressions ❌
(secondary)
2.1% [1.9%, 2.3%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.7% [-1.7%, -1.7%] 1
All ❌✅ (primary) 2.2% [2.2%, 2.2%] 1

Cycles

Results (primary 2.4%)

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)
2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.4% [2.4%, 2.4%] 1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 760.691s -> 760.612s (-0.01%)
Artifact size: 325.47 MiB -> 325.43 MiB (-0.01%)

@onur-ozkan onur-ozkan deleted the clean-up-fixmes branch December 29, 2024 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants