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

Merge the intrinsic and user tests for select_unpredictable #135112

Merged
merged 2 commits into from
Jan 6, 2025

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Jan 5, 2025

1 mentions that having a single test with -Zmerge-functions=disabled is preferable to having two separate tests. Apply that to the new select_unpredictable test here.

r? @the8472

[1] mentions that having a single test with `-Zmerge-functions=disabled`
is preferable to having two separate tests.  Apply that to the new
`select_unpredicatble` test here.

[1]: rust-lang#133964 (comment)
@rustbot 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. labels Jan 5, 2025
Copy link
Member

@the8472 the8472 left a comment

Choose a reason for hiding this comment

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

The change itself is fine, but one of the existing tests looks strange

Comment on lines 65 to 66
// CHECK-LABEL: define{{.*}} @test_zst2
p.select_unpredictable(a, b)
Copy link
Member

Choose a reason for hiding this comment

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

this doesn't seem to test anything, just that the function exists, not what it does.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I assume this was just intended to verify that no select is emitted, so I added a commit to assert the function body is empty.

For ZSTs there is no selection that needs to take place, so assert that
no `select` statement is emitted.
@tgross35 tgross35 force-pushed the combine-select-unpredictable-test branch from c36a09c to 74d2d4b Compare January 5, 2025 08:51
@the8472
Copy link
Member

the8472 commented Jan 5, 2025

@bors r+

@bors
Copy link
Contributor

bors commented Jan 5, 2025

📌 Commit 74d2d4b has been approved by the8472

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 Jan 5, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2025
…e-test, r=the8472

Merge the intrinsic and user tests for `select_unpredictable`

[1] mentions that having a single test with `-Zmerge-functions=disabled` is preferable to having two separate tests.  Apply that to the new `select_unpredictable` test here.

[1]: rust-lang#133964 (comment)
@bors
Copy link
Contributor

bors commented Jan 6, 2025

⌛ Testing commit 74d2d4b with merge b3d730f...

@bors
Copy link
Contributor

bors commented Jan 6, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review 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 Jan 6, 2025
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
 62  694M   62  432M    0     0  77.2M      0  0:00:08  0:00:05  0:00:03 77.2M
 76  694M   76  530M    0     0  80.3M      0  0:00:08  0:00:06  0:00:02 86.8M
 93  694M   93  651M    0     0  85.7M      0  0:00:08  0:00:07  0:00:01 91.6M
100  694M  100  694M    0     0  88.1M      0  0:00:07  0:00:07 --:--:-- 97.8M
clang+llvm-15.0.7-x86_64-apple-darwin21.0/bin/mlir-reduce: Lzma library error: Corrupted input data
tar: Error exit delayed from previous errors.
##[error]Process completed with exit code 1.
[command]/usr/local/bin/git version
git version 2.47.1
Copying '/Users/runner/.gitconfig' to '/Users/runner/work/_temp/472d8406-5ebb-4a39-8b67-a0c22dd395a0/.gitconfig'
Temporarily overriding HOME='/Users/runner/work/_temp/472d8406-5ebb-4a39-8b67-a0c22dd395a0' before making global git config changes

@tgross35
Copy link
Contributor Author

tgross35 commented Jan 6, 2025

Attempting with retry: curl -f https://ci-mirrors.rust-lang.org/rustc/clang%2Bllvm-15.0.7-x86_64-apple-darwin21.0.tar.xz -o clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
...
100  694M  100  694M    0     0  88.1M      0  0:00:07  0:00:07 --:--:-- 97.8M
clang+llvm-15.0.7-x86_64-apple-darwin21.0/bin/mlir-reduce: Lzma library error: Corrupted input data

@bors retry

@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 Jan 6, 2025
@bors
Copy link
Contributor

bors commented Jan 6, 2025

⌛ Testing commit 74d2d4b with merge 243d2ca...

@bors
Copy link
Contributor

bors commented Jan 6, 2025

☀️ Test successful - checks-actions
Approved by: the8472
Pushing 243d2ca to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 6, 2025
@bors bors merged commit 243d2ca into rust-lang:master Jan 6, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 6, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (243d2ca): 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.9%, secondary -2.2%)

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.6% [3.6%, 3.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.9% [-2.6%, -0.6%] 5
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) -0.9% [-2.6%, 3.6%] 6

Cycles

Results (primary -4.1%)

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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-4.1% [-5.3%, -3.5%] 6
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -4.1% [-5.3%, -3.5%] 6

Binary size

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

Bootstrap: 764.087s -> 763.649s (-0.06%)
Artifact size: 325.66 MiB -> 325.68 MiB (0.00%)

@tgross35 tgross35 deleted the combine-select-unpredictable-test branch January 6, 2025 19:37
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants