Skip to content

adapt integer comparison tests for LLVM 20 IR changes#129350

Merged
bors merged 1 commit intorust-lang:masterfrom
krasimirgg:llvm20
Aug 23, 2024
Merged

adapt integer comparison tests for LLVM 20 IR changes#129350
bors merged 1 commit intorust-lang:masterfrom
krasimirgg:llvm20

Conversation

@krasimirgg
Copy link
Contributor

@krasimirgg krasimirgg commented Aug 21, 2024

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) labels Aug 21, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
nikic
nikic reviewed Aug 21, 2024
View reviewed changes
tests/codegen/comparison-operators-2-tuple.rs Outdated
//@ compile-flags: -C opt-level=1 -Z merge-functions=disabled
//@ only-x86_64
//@ revisions: llvm-pre-20 llvm-20
//@[llvm-20]min-llvm-version: 20
Copy link
Contributor

@nikic nikic Aug 21, 2024

Choose a reason for hiding this comment

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

Suggested change
//@[llvm-20]min-llvm-version: 20
//@ [llvm-20] min-llvm-version: 20

etc

nikic
nikic reviewed Aug 21, 2024
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@krasimirgg
Copy link
Contributor Author

krasimirgg commented Aug 21, 2024

@nikic also could you suggest how to best handle the tidy: line longer than 100 chars errors? Possibly disabling it for specific lines? I could look into adapting the CHECKs to spread them on multiple lines, but that seems like it will reduce readability. Also it seems there are already pre-existing CHECK lines over 100 chars, e.g.,: // CHECK-SAME: (i16 noundef %[[A0:.+]], i16 noundef %[[A1:.+]], i16 noundef %[[B0:.+]], i16 noundef %[[B1:.+]]).

@nikic
Copy link
Contributor

nikic commented Aug 21, 2024

@krasimirgg You can add //@ ignore-tidy-linelength, it's pretty common for codegen tests.

@krasimirgg
Copy link
Contributor Author

krasimirgg commented Aug 21, 2024

@nikic FYI, looks like this LLVM commit also changes the assembly output of tests/assembly/x86_64-cmp.rs#OPTIM: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/30520#01917461-b781-4d17-80e7-85cd0a8681d8

@nikic
Copy link
Contributor

nikic commented Aug 21, 2024

@nikic FYI, looks like this LLVM commit also changes the assembly output of tests/assembly/x86_64-cmp.rs#OPTIM: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/30520#01917461-b781-4d17-80e7-85cd0a8681d8

New asm looks good, so should update that test with revision as well.

@krasimirgg
Copy link
Contributor Author

krasimirgg commented Aug 21, 2024

@krasimirgg You can add //@ ignore-tidy-linelength, it's pretty common for codegen tests.

Thanks! Had to do it without the @, otherwise I saw an error: detected unknown compiletest test directive ignore-tidy-linelength in /tmp/rustllvmhead/build/rust/tests/codegen/comparison-operators-2-tuple.rs:1

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@krasimirgg krasimirgg marked this pull request as ready for review August 22, 2024 16:52
@nikic
Copy link
Contributor

nikic commented Aug 22, 2024

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 22, 2024

📌 Commit f1fac42 has been approved by nikic

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 Aug 22, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 23, 2024
@tgross35
Rollup merge of rust-lang#129350 - krasimirgg:llvm20, r=nikic
5cdb52a 
adapt integer comparison tests for LLVM 20 IR changes

The LLVM commit llvm/llvm-project@abf69a1 changed the IR in a few comparison tests:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/30500#01917017-26fe-4a4d-956b-725a2903e5a8

Adapted accordingly.

`@rustbot` label: +llvm-main
r? `@nikic`
@tgross35 tgross35 mentioned this pull request Aug 23, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2024
@bors
Auto merge of rust-lang#129435 - tgross35:rollup-rjmzof2, r=tgross35
9f36aa2 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#128192 (rustc_target: Add various aarch64 features)
 - rust-lang#128507 (Migrate `libtest-thread-limit` `run-make` test to rmake)
 - rust-lang#129190 (Add f16 and f128 to tests/ui/consts/const-float-bits-conv.rs)
 - rust-lang#129276 (Stabilize feature `char_indices_offset`)
 - rust-lang#129350 (adapt integer comparison tests for LLVM 20 IR changes)
 - rust-lang#129414 (Fix extern crates not being hidden with `doc(hidden)`)
 - rust-lang#129426 (rustdoc-search: use tighter json for names and parents)

r? `@ghost`
`@rustbot` modify labels: rollup
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 23, 2024
@tgross35
Rollup merge of rust-lang#129350 - krasimirgg:llvm20, r=nikic
c61a77a 
adapt integer comparison tests for LLVM 20 IR changes

The LLVM commit llvm/llvm-project@abf69a1 changed the IR in a few comparison tests:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/30500#01917017-26fe-4a4d-956b-725a2903e5a8

Adapted accordingly.

``@rustbot`` label: +llvm-main
r? ``@nikic``
@tgross35 tgross35 mentioned this pull request Aug 23, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2024
@bors
Auto merge of rust-lang#129442 - tgross35:rollup-gmqng7g, r=tgross35
9b46704 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#126985 (Implement `-Z embed-source` (DWARFv5 source code embedding extension))
 - rust-lang#128349 (Enable `f16` tests on x86 and x86-64)
 - rust-lang#128511 (Document WebAssembly target feature expectations)
 - rust-lang#129263 (Add a missing compatibility note in the 1.80.0 release notes)
 - rust-lang#129276 (Stabilize feature `char_indices_offset`)
 - rust-lang#129350 (adapt integer comparison tests for LLVM 20 IR changes)
 - rust-lang#129408 (Fix handling of macro arguments within the `dropping_copy_types` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 23, 2024
@GuillaumeGomez
Rollup merge of rust-lang#129350 - krasimirgg:llvm20, r=nikic
541ad79 
adapt integer comparison tests for LLVM 20 IR changes

The LLVM commit llvm/llvm-project@abf69a1 changed the IR in a few comparison tests:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/30500#01917017-26fe-4a4d-956b-725a2903e5a8

Adapted accordingly.

```@rustbot``` label: +llvm-main
r? ```@nikic```
This was referenced Aug 23, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2024
@bors
Auto merge of rust-lang#129464 - GuillaumeGomez:rollup-ckfqd7h, r=Gui…
a60a9e5 
…llaumeGomez

Rollup of 9 pull requests

Successful merges:

 - rust-lang#128511 (Document WebAssembly target feature expectations)
 - rust-lang#129243 (do not build `cargo-miri` by default on stable channel)
 - rust-lang#129263 (Add a missing compatibility note in the 1.80.0 release notes)
 - rust-lang#129276 (Stabilize feature `char_indices_offset`)
 - rust-lang#129350 (adapt integer comparison tests for LLVM 20 IR changes)
 - rust-lang#129408 (Fix handling of macro arguments within the `dropping_copy_types` lint)
 - rust-lang#129426 (rustdoc-search: use tighter json for names and parents)
 - rust-lang#129437 (Fix typo in a help diagnostic)
 - rust-lang#129457 (kobzol vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1bbb8d5 into rust-lang:master Aug 23, 2024
@rustbot rustbot added this to the 1.82.0 milestone Aug 23, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2024
@rust-timer
Unrolled build for rust-lang#129350
5c0c5e6 
Rollup merge of rust-lang#129350 - krasimirgg:llvm20, r=nikic

adapt integer comparison tests for LLVM 20 IR changes

The LLVM commit llvm/llvm-project@abf69a1 changed the IR in a few comparison tests:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/30500#01917017-26fe-4a4d-956b-725a2903e5a8

Adapted accordingly.

````@rustbot```` label: +llvm-main
r? ````@nikic````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikic nikic nikic left review comments

Assignees

@nikic nikic

Labels

llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

5 participants

@krasimirgg @rust-log-analyzer @nikic @bors @rustbot