Update the `compiler-builtins` subtree #142036

tgross35 · 2025-06-04T19:02:51Z

Update the Josh subtree to rust-lang/compiler-builtins@5c3d8f2753b8.

These were deleted during refactoring in 0a2dc5d9 ("Combine the source files for more generic implementations") but got added back by accident in 54bac411 ("refactor: Move the libm crate to a subdirectory"). Remove them again here.

As seen at [1], LLVM uses `long long` on LLP64 (to get a 64-bit integer matching pointer size) and `long` on everything else, with exceptions for AArch64 and AVR. Our current logic always uses an `i32`. This happens to work because LLVM uses 32-bit instructions to check the output on x86-64, but the GCC checks the full 64-bit register so garbage in the upper half leads to incorrect results. Update our return type to be `isize`, with exceptions for AArch64 and AVR. Fixes: rust-lang/compiler-builtins#919 [1]: https://github.com/llvm/llvm-project/blob/0cf3c437c18ed27d9663d87804a9a15ff6874af2/compiler-rt/lib/builtins/fp_compare_impl.inc#L11-L27

Link to Apache License changed from htps:// to https://

Since the two crates are now in the same repo, it is easier to share code. Begin some deduplication with the integer traits.

These are now provided by `compiler-builtins`, so there is no need to also build the C versions. This was detected by checking for duplicate symbols and not excluding weak symbols (like CI currently does).

This should be less error-prone and adaptable than the `nm` version, and have better cross-platform support without needing LLVM `nm` installed.

Since a working `nm` is no longer needed as part of CI, the rustup component can be removed.

Do the same for `builtins-test-intrinsics`. Mostly this means updating `extern` to `unsafe extern`, and fixing a few new Clippy lints.

As part of this, the u256 benchmarks are reorganized to a group.

Currently we only build this, but it is possible to run the binary. Change the CI script to do so here.

When multiple merges to `master` happen before a CI run completes, the in-progress job is getting canceled. Fix this by using the commit sha for the group key if a pull request number is not available, rather than `github.ref` (which is always `refs/head/master` after merge). This should prevent jobs running on previous commits from getting cancelled, while still ensuring there is only ever one active run per pull request.

We may soon want to use some new nightly features in `compiler-builtins` and `libm`, specifically `cfg_target_has_reliable_f16_f128` which was added in the past few weeks. This will mean we need a newer toolchain for benchmarks to continue building. Bump to the current latest nightly so we are not blocked on this down the line.

Currently we run logspace tests for extensive tests, but there isn't any reason we couldn't also run more kinds of tests more extensively (e.g. more edge cases, combine edge cases with logspace for multi-input functions, etc). As a first step toward making this possible, make `extensive` a new field in `CheckCtx`, and rename `QuickSpaced` to `Spaced`.

We don't actually need this for now, but eventually it would be nice to run icount benchmarks on multiple targets. Start tagging artifact names with the architecture, and allow passing `--tag` to `ci-util.py` in order to retrieve the correct one.

In particular, this includes a fix to `iai-callgrind` that will allow us to simplify our benchmark runner.

iai-callgrind now correctly exits with error if regressions were found [1], so we no longer need to check for regressions manually. Remove this check and instead exit based on the exit status of the benchmark run. [1] gungraun/gungraun#337

`binop_common` emits a `SKIP` that is intended to apply only to `copysign`, but is instead applying to all binary operators. Correct the general case but leave the currently-failing `maximum_num` tests as a FIXME, to be resolved separately in [1]. Also simplify skip logic and NaN checking, and add a few more `copysign` checks. [1]: rust-lang/compiler-builtins#939

The submodule was causing issues in rust-lang/rust, so eliminiate it here. `build-musl` is also removed from `libm-test`'s default features so the crate doesn't need to be built by default.

This will be used by `josh` tooling.

Create a crate that handles pulling from and pushing to rust-lang/rust. This can be invoked with the following: $ cargo run -p josh-sync -- rustc-pull $ RUSTC_GIT=/path/to/rust/checkout cargo run -p josh-sync -- rustc-push <username>

To prepare for merging from rust-lang/rust, set the version file to: df8102f Auto merge of rust-lang#142002 - onur-ozkan:follow-ups2, r=jieyouxu

…ub.com/rust-lang/rust Pull recent changes from rust-lang/rust via Josh. Upstream ref: df8102f Filtered ref: 3c30d8cb1ec24e0b8a88a5cedcf6b9bece0117d7

tgross35 · 2025-06-04T21:25:23Z

@bors r-

There will be one more change to sync in rust-lang/compiler-builtins#945

This was introduced before `#[panic_handler]` was stable, but should no longer be needed. Additionally, we only need it for `builtins-test-intrinsics`, not as a dependency of `compiler-builtins`.

tgross35 · 2025-06-04T21:44:15Z

@bors r+

bors · 2025-06-04T21:44:18Z

📌 Commit ab453db has been approved by tgross35

It is now in the queue for this repository.

tgross35 · 2025-06-05T10:53:12Z

@bors p=1 fixes dist breakage

tgross35 · 2025-06-05T10:55:24Z

@matthiaskrgr fyi this should still be rolluppable (don't always like that p=1 puts things in front of everything else) , it's just p=1 for fixing some recent tooling & downsitream breakage

Update the `compiler-builtins` subtree Update the Josh subtree to rust-lang/compiler-builtins@5c3d8f2753b8. r? `@ghost`

Rollup of 7 pull requests Successful merges: - #141709 (jsondocck: Refactor directive handling) - #141974 (`tests/ui`: A New Order [4/N]) - #141989 (rustdoc-json-type: Depend on `serde` and `serde_derive` seperately) - #142015 (Report the actual item that evaluation failed for) - #142026 (bootstrap: Fix file permissions when dereferencing symlinks) - #142032 (Fix parsing of frontmatters with inner hyphens) - #142036 (Update the `compiler-builtins` subtree) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #142036 - tgross35:update-builtins, r=tgross35 Update the `compiler-builtins` subtree Update the Josh subtree to rust-lang/compiler-builtins@5c3d8f2753b8. r? ``@ghost``

bors · 2025-06-05T19:48:21Z

⌛ Testing commit ab453db with merge 076ec59...

Rollup of 7 pull requests Successful merges: - rust-lang/rust#141709 (jsondocck: Refactor directive handling) - rust-lang/rust#141974 (`tests/ui`: A New Order [4/N]) - rust-lang/rust#141989 (rustdoc-json-type: Depend on `serde` and `serde_derive` seperately) - rust-lang/rust#142015 (Report the actual item that evaluation failed for) - rust-lang/rust#142026 (bootstrap: Fix file permissions when dereferencing symlinks) - rust-lang/rust#142032 (Fix parsing of frontmatters with inner hyphens) - rust-lang/rust#142036 (Update the `compiler-builtins` subtree) r? `@ghost` `@rustbot` modify labels: rollup

Update the `compiler-builtins` subtree Update the Josh subtree to rust-lang/compiler-builtins@5c3d8f2753b8. r? ``@ghost``

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#141709 (jsondocck: Refactor directive handling) - rust-lang#141974 (`tests/ui`: A New Order [4/N]) - rust-lang#141989 (rustdoc-json-type: Depend on `serde` and `serde_derive` seperately) - rust-lang#142015 (Report the actual item that evaluation failed for) - rust-lang#142026 (bootstrap: Fix file permissions when dereferencing symlinks) - rust-lang#142032 (Fix parsing of frontmatters with inner hyphens) - rust-lang#142036 (Update the `compiler-builtins` subtree) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2025-06-28T10:14:11Z

🤔
@bors retry r-

beetrees and others added 30 commits May 21, 2025 19:24

Enable __powitf2 on MSVC

11c1522

fixed typo in readme

7966f1b

libm: Clean up unused files

db21837

These were deleted during refactoring in 0a2dc5d9 ("Combine the source files for more generic implementations") but got added back by accident in 54bac411 ("refactor: Move the libm crate to a subdirectory"). Remove them again here.

Typo in README.md

c04f133

Link to Apache License changed from htps:// to https://

aarch64: Add a note saying why we use frintx rather than frintn

5978b8b

cleanup: Reuse MinInt and Int from libm in compiler-builtins

851aa05

Since the two crates are now in the same repo, it is easier to share code. Begin some deduplication with the integer traits.

Reuse libm's Caat and CastFrom in compiler-builtins

877feef

Remove unneeded C symbols

97c0beb

These are now provided by `compiler-builtins`, so there is no need to also build the C versions. This was detected by checking for duplicate symbols and not excluding weak symbols (like CI currently does).

Replace the nm symbol check with a Rust implementation

a63f482

This should be less error-prone and adaptable than the `nm` version, and have better cross-platform support without needing LLVM `nm` installed.

Remove the now-unneeded llvm-tools-preview

8db9bd6

Since a working `nm` is no longer needed as part of CI, the rustup component can be removed.

Change compiler-builtins to edition 2024

151b1cb

Do the same for `builtins-test-intrinsics`. Mostly this means updating `extern` to `unsafe extern`, and fixing a few new Clippy lints.

symcheck: Print the command to make reproducing errors easier

af16553

Add benchmarks for float parsing and printing

7db8cf1

As part of this, the u256 benchmarks are reorganized to a group.

Run builtins-test-intrinsics when possible

c136fb7

Currently we only build this, but it is possible to run the binary. Change the CI script to do so here.

chore: release

3c35505

Fix new dead_code warnings from recent nightlies

c6df6a7

Upgrade all dependencies to the latest available version

0a7e592

In particular, this includes a fix to `iai-callgrind` that will allow us to simplify our benchmark runner.

cleanup: Use x.biteq(y) rather than x.to_bits() == y.to_bits()

e83ca86

ci: Refactor benchmark regression checks

ba7cdb6

iai-callgrind now correctly exits with error if regressions were found [1], so we no longer need to check for regressions manually. Remove this check and instead exit based on the exit status of the benchmark run. [1] gungraun/gungraun#337

Replace the musl submodule with a download script

e1e3cc2

The submodule was causing issues in rust-lang/rust, so eliminiate it here. `build-musl` is also removed from `libm-test`'s default features so the crate doesn't need to be built by default.

Add an empty rust-version file

f67ca0f

This will be used by `josh` tooling.

Add tooling for josh syncs

3353a89

Create a crate that handles pulling from and pushing to rust-lang/rust. This can be invoked with the following: $ cargo run -p josh-sync -- rustc-pull $ RUSTC_GIT=/path/to/rust/checkout cargo run -p josh-sync -- rustc-push <username>

Update the upstream Rust version

eb45e57

To prepare for merging from rust-lang/rust, set the version file to: df8102f Auto merge of rust-lang#142002 - onur-ozkan:follow-ups2, r=jieyouxu

Merge ref 'df8102fe5f24:/library/compiler-builtins' from https://gith…

1599091

…ub.com/rust-lang/rust Pull recent changes from rust-lang/rust via Josh. Upstream ref: df8102f Filtered ref: 3c30d8cb1ec24e0b8a88a5cedcf6b9bece0117d7

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 4, 2025

panic-handler: Remove the no_core feature

ab453db

This was introduced before `#[panic_handler]` was stable, but should no longer be needed. Additionally, we only need it for `builtins-test-intrinsics`, not as a dependency of `compiler-builtins`.

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, 2025

tgross35 mentioned this pull request Jun 4, 2025

Use the in-tree compiler-builtins for the sysroot #141993

Merged

tshepang mentioned this pull request Jun 5, 2025

Failed to pull from upstream master ferrocene/ferrocene#1503

Closed

This was referenced Jun 5, 2025

Rollup of 8 pull requests #142080

Closed

Rollup of 7 pull requests #142081

Merged

tbu- mentioned this pull request Jun 5, 2025

fatal: No url found for submodule path 'library/compiler-builtins/crates/musl-math-sys/musl' in .gitmodules #142083

Closed

bors merged commit 9a9e160 into rust-lang:master Jun 5, 2025
10 checks passed

rustbot added this to the 1.89.0 milestone Jun 5, 2025

rust-timer added a commit that referenced this pull request Jun 5, 2025

Unrolled build for #142036

70ce7ed

Rollup merge of #142036 - tgross35:update-builtins, r=tgross35 Update the `compiler-builtins` subtree Update the Josh subtree to rust-lang/compiler-builtins@5c3d8f2753b8. r? ``@ghost``

tgross35 deleted the update-builtins branch June 5, 2025 19:49

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 28, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Update the `compiler-builtins` subtree #142036

Update the `compiler-builtins` subtree #142036

Uh oh!

tgross35 commented Jun 4, 2025

Uh oh!

tgross35 commented Jun 4, 2025

Uh oh!

tgross35 commented Jun 4, 2025

Uh oh!

bors commented Jun 4, 2025

Uh oh!

tgross35 commented Jun 5, 2025

Uh oh!

tgross35 commented Jun 5, 2025 •

edited

Loading

Uh oh!

Uh oh!

bors commented Jun 5, 2025

Uh oh!

matthiaskrgr commented Jun 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Update the compiler-builtins subtree #142036

Update the compiler-builtins subtree #142036

Uh oh!

Conversation

tgross35 commented Jun 4, 2025

Uh oh!

tgross35 commented Jun 4, 2025

Uh oh!

tgross35 commented Jun 4, 2025

Uh oh!

bors commented Jun 4, 2025

Uh oh!

tgross35 commented Jun 5, 2025

Uh oh!

tgross35 commented Jun 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

bors commented Jun 5, 2025

Uh oh!

matthiaskrgr commented Jun 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Update the `compiler-builtins` subtree #142036

Update the `compiler-builtins` subtree #142036

tgross35 commented Jun 5, 2025 •

edited

Loading