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

Portable SIMD subtree update #122905

Merged
merged 21 commits into from
Mar 24, 2024

Conversation

dpaoliello
Copy link
Contributor

Syncs nightly to the latest changes from rust-lang/portable-simd

r? @calebzulawski

@rustbot
Copy link
Collaborator

rustbot commented Mar 22, 2024

Failed to set assignee to calebzulawski: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 22, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 22, 2024

Portable SIMD is developed in its own repository. If possible, consider making this change to rust-lang/portable-simd instead.

cc @calebzulawski, @programmerjake

@rust-log-analyzer

This comment has been minimized.

@calebzulawski
Copy link
Member

Can you combine your two additional commits?

@dpaoliello dpaoliello force-pushed the sync-portable-simd-2024-03-22 branch from 1b413d5 to 08bd6e0 Compare March 22, 2024 21:11
@dpaoliello
Copy link
Contributor Author

Can you combine your two additional commits?

Done

Copy link
Member

@workingjubilee workingjubilee left a comment

Choose a reason for hiding this comment

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

I apologize, I believe the rust-lang/rust to rust-lang/portable-simd direction should happen first? I believe that is the only reason this is breaking tests.

library/portable-simd/crates/core_simd/src/vector.rs Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

@dpaoliello dpaoliello force-pushed the sync-portable-simd-2024-03-22 branch from 08bd6e0 to b4c3ad1 Compare March 22, 2024 21:35
@dpaoliello
Copy link
Contributor Author

I apologize, I believe the rust-lang/rust to rust-lang/portable-simd direction should happen first? I believe that is the only reason this is breaking tests.

There were no changes in the rust-lang/rust portable-simd. The doc failures were added 2 weeks ago (rust-lang/portable-simd@4f0ba1a), and the Try* traits were previously imported, but then removed in a cleanup last month (rust-lang/portable-simd@bb4bba5)

@dpaoliello
Copy link
Contributor Author

Any further changes requested? Otherwise, can someone please put this in the queue?

@workingjubilee
Copy link
Member

Ah, is there any chance you could make it so this was based on portable-simd tip-of-tree instead of having 6736d7b be an empty commit when synced back? ^^;

@workingjubilee
Copy link
Member

This should go in alone when it does go.

@bors rollup=never p=1

@dpaoliello dpaoliello force-pushed the sync-portable-simd-2024-03-22 branch from 6736d7b to 9e0ec25 Compare March 23, 2024 00:08
@dpaoliello
Copy link
Contributor Author

Ah, is there any chance you could make it so this was based on portable-simd tip-of-tree instead of having 6736d7b be an empty commit when synced back? ^^;

Done

@workingjubilee
Copy link
Member

Thanks! Sorry about that, I know this gets to be a huge pain in the ass. ^^;
In we go!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 23, 2024

📌 Commit 9e0ec25 has been approved by workingjubilee

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 Mar 23, 2024
@workingjubilee workingjubilee self-assigned this Mar 23, 2024
@workingjubilee workingjubilee added the subtree-sync PR updates a subtree (miri, clippy, etc). Ignored by no-merges check label Mar 23, 2024
bors added a commit to rust-lang/miri that referenced this pull request Mar 23, 2024
add support for missing SIMD float intrinsics

These are being exposed by `core::simd`  with rust-lang/rust#122905.
RalfJung pushed a commit to RalfJung/rust that referenced this pull request Mar 23, 2024
add support for missing SIMD float intrinsics

These are being exposed by `core::simd`  with rust-lang#122905.
@RalfJung RalfJung mentioned this pull request Mar 23, 2024
@bors
Copy link
Contributor

bors commented Mar 24, 2024

⌛ Testing commit 9e0ec25 with merge 9b8d12c...

@bors
Copy link
Contributor

bors commented Mar 24, 2024

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 9b8d12c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 24, 2024
@bors bors merged commit 9b8d12c into rust-lang:master Mar 24, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 24, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9b8d12c): 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)

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

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: 669.644s -> 669.289s (-0.05%)
Artifact size: 314.97 MiB -> 315.03 MiB (0.02%)

RenjiSann pushed a commit to RenjiSann/rust that referenced this pull request Mar 25, 2024
add support for missing SIMD float intrinsics

These are being exposed by `core::simd`  with rust-lang#122905.
RenjiSann pushed a commit to RenjiSann/rust that referenced this pull request Mar 25, 2024
…3-22, r=workingjubilee

Portable SIMD subtree update

Syncs nightly to the latest changes from rust-lang/portable-simd

r? `@calebzulawski`
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 25, 2024
Import the 2021 prelude in the core crate

The `core` crate currently imports the v1 prelude
https://github.com/rust-lang/rust/blob/b3df0d7e5ef5f7dbeeca3fb289c65680ad013f87/library/core/src/lib.rs#L285-L287

This recently caused an issue when updating the `portable-simd` subtree since it was using a trait that was added to the 2021 prelude: rust-lang#122905 (comment)

To make it easier to have a consistent build environment for subtrees and submodules that get included in `core`, we will now import the 2021 prelude into `core`.

Fixes rust-lang#122912

r? `@Nilstrieb`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2024
Rollup merge of rust-lang#123042 - dpaoliello:prelude, r=Nilstrieb

Import the 2021 prelude in the core crate

The `core` crate currently imports the v1 prelude
https://github.com/rust-lang/rust/blob/b3df0d7e5ef5f7dbeeca3fb289c65680ad013f87/library/core/src/lib.rs#L285-L287

This recently caused an issue when updating the `portable-simd` subtree since it was using a trait that was added to the 2021 prelude: rust-lang#122905 (comment)

To make it easier to have a consistent build environment for subtrees and submodules that get included in `core`, we will now import the 2021 prelude into `core`.

Fixes rust-lang#122912

r? `@Nilstrieb`
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Mar 26, 2024
Import the 2021 prelude in the core crate

The `core` crate currently imports the v1 prelude
https://github.com/rust-lang/rust/blob/b3df0d7e5ef5f7dbeeca3fb289c65680ad013f87/library/core/src/lib.rs#L285-L287

This recently caused an issue when updating the `portable-simd` subtree since it was using a trait that was added to the 2021 prelude: rust-lang/rust#122905 (comment)

To make it easier to have a consistent build environment for subtrees and submodules that get included in `core`, we will now import the 2021 prelude into `core`.

Fixes #122912

r? `@Nilstrieb`
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. subtree-sync PR updates a subtree (miri, clippy, etc). Ignored by no-merges check
Projects
None yet
Development

Successfully merging this pull request may close these issues.