unstably constify float mul_add methods #146735

Qelxiros · 2025-09-18T19:05:57Z

Tracking issue: #146724
r? @tgross35

rustbot · 2025-09-18T19:06:00Z

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr

compiler/rustc_const_eval/src/interpret/intrinsics.rs

library/coretests/tests/floats/mod.rs

compiler/rustc_const_eval/src/interpret/machine.rs

src/tools/miri/src/machine.rs

bors · 2025-09-19T23:01:49Z

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

RalfJung · 2025-09-20T11:02:44Z

compiler/rustc_const_eval/src/interpret/intrinsics.rs

You dropped the part of the patch were you are removing these intrinsics from Miri?

I'm assuming this was in response to #146735 (comment) but of course it should be fixed. Any idea why that failed? The implementation looks the same.

I think it's just a rebase gone wrong.

RalfJung · 2025-09-20T11:07:01Z

library/coretests/tests/floats/mod.rs

    const RAW_1337: Self;
    const RAW_MINUS_14_DOT_25: Self;
+    const MUL_ADD_RESULT: Self;
+    const NEG_MUL_ADD_RESULT: Self;


These names are completely meaningless.

I don't know what is a good way to make these tests generic (@tgross35, any ideas?), but if they end up as constants here then the trait has to document what the value of these constants should be.

No ideas :( this kind of thing is always a bit of a pain point when the four types need different constants. I think a doc comment on the trait is sufficient, not that pretty but still easier than splitting out four different functions just for two test cases.

tgross35

The library changes lgtm. The miri/ctfe bits also look reasonable with the exception of one comment, but I'll let Ralf confirm.

r? @RalfJung

View changes since this review

compiler/rustc_const_eval/src/interpret/machine.rs

bors · 2025-09-22T19:13:13Z

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

library/coretests/tests/floats/f64.rs

library/coretests/tests/floats/mod.rs

Co-authored-by: Ralf Jung <[email protected]>

unstably constify float mul_add methods try-job: x86_64-mingw-2

Qelxiros · 2025-09-24T20:16:32Z

Looks like installing ninja failed because the hostname didn't resolve, but the link from the script (https://ci-mirrors.rust-lang.org/2024-03-28-v1.11.1-ninja-win.zip) also looks broken?

RalfJung · 2025-09-24T20:26:01Z

Probably some sort of network/intermittent issue. Let's just try again in a few hours.

tgross35 · 2025-09-24T20:56:37Z

@bors2 try jobs=x86_64-mingw-2

unstably constify float mul_add methods try-job: x86_64-mingw-2

rust-bors · 2025-09-24T23:15:58Z

☀️ Try build successful (CI)
Build commit: d4fd3b1 (d4fd3b1986d2a895654b4454516e15f41f05f3b8, parent: 15283f6fe95e5b604273d13a428bab5fc0788f5a)

tgross35 · 2025-09-24T23:19:10Z

@bors r=tgross35,RalfJung

bors · 2025-09-24T23:19:12Z

📌 Commit a00f241 has been approved by tgross35,RalfJung

It is now in the queue for this repository.

tgross35 · 2025-09-24T23:20:38Z

That was just a missed gate, can probably get rolled up again
@bors rollup=maybe

…,RalfJung unstably constify float mul_add methods Tracking issue: rust-lang#146724 r? ``@tgross35``

Rollup of 14 pull requests Successful merges: - #145067 (RawVecInner: add missing `unsafe` to unsafe fns) - #145277 (Do not materialise X in [X; 0] when X is unsizing a const) - #145973 (Add `std` support for `armv7a-vex-v5`) - #146667 (Add an attribute to check the number of lanes in a SIMD vector after monomorphization) - #146735 (unstably constify float mul_add methods) - #146737 (f16_f128: enable some more tests in Miri) - #146766 (Add attributes for #[global_allocator] functions) - #146905 (llvm: update remarks support on LLVM 22) - #146982 (Remove erroneous normalization step in `tests/run-make/linker-warning`) - #147005 (Small string formatting cleanup) - #147007 (Explicitly note `&[SocketAddr]` impl of `ToSocketAddrs`) - #147008 (bootstrap.py: Respect build.jobs while building bootstrap tool) - #147013 (rustdoc: Fix documentation for `--doctest-build-arg`) - #147015 (Use `LLVMDisposeTargetMachine`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146735 - Qelxiros:const_mul_add, r=tgross35,RalfJung unstably constify float mul_add methods Tracking issue: #146724 r? `@tgross35`

Rollup of 14 pull requests Successful merges: - rust-lang/rust#145067 (RawVecInner: add missing `unsafe` to unsafe fns) - rust-lang/rust#145277 (Do not materialise X in [X; 0] when X is unsizing a const) - rust-lang/rust#145973 (Add `std` support for `armv7a-vex-v5`) - rust-lang/rust#146667 (Add an attribute to check the number of lanes in a SIMD vector after monomorphization) - rust-lang/rust#146735 (unstably constify float mul_add methods) - rust-lang/rust#146737 (f16_f128: enable some more tests in Miri) - rust-lang/rust#146766 (Add attributes for #[global_allocator] functions) - rust-lang/rust#146905 (llvm: update remarks support on LLVM 22) - rust-lang/rust#146982 (Remove erroneous normalization step in `tests/run-make/linker-warning`) - rust-lang/rust#147005 (Small string formatting cleanup) - rust-lang/rust#147007 (Explicitly note `&[SocketAddr]` impl of `ToSocketAddrs`) - rust-lang/rust#147008 (bootstrap.py: Respect build.jobs while building bootstrap tool) - rust-lang/rust#147013 (rustdoc: Fix documentation for `--doctest-build-arg`) - rust-lang/rust#147015 (Use `LLVMDisposeTargetMachine`) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned tgross35 Sep 18, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Sep 18, 2025

This comment has been minimized.

Sign in to view

RalfJung reviewed Sep 18, 2025

View reviewed changes

compiler/rustc_const_eval/src/interpret/intrinsics.rs Outdated Show resolved Hide resolved

RalfJung reviewed Sep 18, 2025

View reviewed changes

library/coretests/tests/floats/mod.rs Outdated Show resolved Hide resolved

Qelxiros force-pushed the const_mul_add branch from 4bc91b4 to e45ce83 Compare September 18, 2025 21:03

RalfJung reviewed Sep 18, 2025

View reviewed changes

compiler/rustc_const_eval/src/interpret/machine.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Qelxiros force-pushed the const_mul_add branch from e45ce83 to 835c4c7 Compare September 18, 2025 23:57

This comment has been minimized.

Sign in to view

tgross35 mentioned this pull request Sep 19, 2025

Tracking Issue for const_mul_add #146724

Open

3 tasks

RalfJung reviewed Sep 19, 2025

View reviewed changes

src/tools/miri/src/machine.rs Outdated Show resolved Hide resolved

Qelxiros force-pushed the const_mul_add branch from 835c4c7 to a7bd40a Compare September 19, 2025 15:12

This comment has been minimized.

Sign in to view

Qelxiros force-pushed the const_mul_add branch from a7bd40a to 6ce3c3d Compare September 20, 2025 00:12

This comment has been minimized.

Sign in to view

RalfJung reviewed Sep 20, 2025

View reviewed changes

Qelxiros force-pushed the const_mul_add branch 2 times, most recently from 8d9dded to aa886e4 Compare September 22, 2025 12:07

This comment has been minimized.

Sign in to view

Qelxiros force-pushed the const_mul_add branch from aa886e4 to c1f9cfd Compare September 22, 2025 12:24

tgross35 approved these changes Sep 22, 2025

View reviewed changes

compiler/rustc_const_eval/src/interpret/machine.rs Outdated Show resolved Hide resolved

rustbot assigned RalfJung and unassigned tgross35 Sep 22, 2025

tgross35 reviewed Sep 24, 2025

View reviewed changes

library/coretests/tests/floats/f64.rs Show resolved Hide resolved

Qelxiros force-pushed the const_mul_add branch from d338aca to 819e4b9 Compare September 24, 2025 19:07

tgross35 reviewed Sep 24, 2025

View reviewed changes

library/coretests/tests/floats/mod.rs Outdated Show resolved Hide resolved

unstably constify float mul_add methods

a00f241

Co-authored-by: Ralf Jung <[email protected]>

Qelxiros force-pushed the const_mul_add branch from 819e4b9 to a00f241 Compare September 24, 2025 19:21

This comment was marked as outdated.

Sign in to view

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Sep 24, 2025

Auto merge of #146735 - Qelxiros:const_mul_add, r=<try>

74cee54

unstably constify float mul_add methods try-job: x86_64-mingw-2

This comment was marked as outdated.

Sign in to view

rust-bors bot added a commit that referenced this pull request Sep 24, 2025

Auto merge of #146735 - Qelxiros:const_mul_add, r=<try>

d4fd3b1

unstably constify float mul_add methods try-job: x86_64-mingw-2

This comment has been minimized.

Sign in to view

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

Zalathar mentioned this pull request Sep 25, 2025

Rollup of 14 pull requests #147019

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 25, 2025

Rollup merge of rust-lang#146735 - Qelxiros:const_mul_add, r=tgross35…

eef61dd

…,RalfJung unstably constify float mul_add methods Tracking issue: rust-lang#146724 r? ``@tgross35``

matthiaskrgr mentioned this pull request Sep 25, 2025

Rollup of 8 pull requests #147020

Closed

bors merged commit 8e62f95 into rust-lang:master Sep 25, 2025
11 checks passed

rustbot added this to the 1.92.0 milestone Sep 25, 2025

rust-timer added a commit that referenced this pull request Sep 25, 2025

Unrolled build for #146735

a1c55eb

Rollup merge of #146735 - Qelxiros:const_mul_add, r=tgross35,RalfJung unstably constify float mul_add methods Tracking issue: #146724 r? `@tgross35`

sayantn mentioned this pull request Sep 25, 2025

Implement most SIMD intrinsics in const-eval #146568

Open

unstably constify float mul_add methods #146735

unstably constify float mul_add methods #146735

Uh oh!

Conversation

Qelxiros commented Sep 18, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 18, 2025

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

This comment has been minimized.

bors commented Sep 19, 2025

Uh oh!

This comment has been minimized.

RalfJung Sep 20, 2025

Choose a reason for hiding this comment

Uh oh!

tgross35 Sep 20, 2025

Choose a reason for hiding this comment

Uh oh!

RalfJung Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

RalfJung Sep 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tgross35 Sep 20, 2025

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

tgross35 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bors commented Sep 22, 2025

Uh oh!

Uh oh!

Uh oh!

This comment was marked as outdated.

This comment has been minimized.

This comment was marked as outdated.

This comment was marked as outdated.

Qelxiros commented Sep 24, 2025

Uh oh!

RalfJung commented Sep 24, 2025

Uh oh!

tgross35 commented Sep 24, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Sep 24, 2025

Uh oh!

tgross35 commented Sep 24, 2025

Uh oh!

bors commented Sep 24, 2025

Uh oh!

tgross35 commented Sep 24, 2025

Uh oh!

Uh oh!

Uh oh!

Qelxiros commented Sep 18, 2025 •

edited by rustbot

Loading

RalfJung Sep 20, 2025 •

edited

Loading

tgross35 left a comment •

edited by rustbot

Loading