compiletest: add `max-llvm-major-version` directive #132310

jieyouxu · 2024-10-29T06:16:39Z

To complement existing min-llvm-version so contributors don't have to use ignore-llvm-version: 20 - 99 to emulate max-llvm-major-version: 19.

Closes #132305.
cc @workingjubilee who suggested this.

Implementation steps

1. Implement the directive (this PR)
2. Open an accompanying dev-guide PR to describe the directive (Document max-llvm-major-version directive rustc-dev-guide#2129)

r? bootstrap

Zalathar · 2024-10-29T06:26:20Z

Not mandatory, but consider also editing the ~5 tests that currently use the N-99 pattern, so that the new directive is actually used.

Zalathar · 2024-10-29T06:28:53Z

src/tools/compiletest/src/header.rs

-            // Ignore if actual version is smaller the minimum required
-            // version
+        if let Some(value) = config.parse_name_value_directive(line, "min-llvm-version") {
+            let value = value.trim();


Remark: Separate from this PR, we should just make the parse functions trim automatically. I can't imagine a legitimate use-case for directives actually wanting to see untrimmed whitespace.

I didn't want to touch that in the current directive handling, tbh. I prefer we just redo this entirely.

jieyouxu · 2024-10-29T06:32:49Z

Not mandatory, but consider also editing the ~5 tests that currently use the N-99 pattern, so that the new directive is actually used.

Good point, I'll update existing tests.

jieyouxu · 2024-10-30T05:36:25Z

Changes since last force push:

Rebased on top of compiletest: improve robustness of LLVM version handling #132315, this PR needs to wait for that to land first (first commit e419b3d is from compiletest: improve robustness of LLVM version handling #132315).
Renamed directive from max-llvm-version to max-llvm-major-version to more accurately reflect intent (i.e. //@ max-llvm-major-version: 19 will still run the test if llvm version is 19.99.99).
Updated tests that use ignore-llvm-version: $N - $M to use max-llvm-major-version: $(N-1).
Added a FIXME linking to compiletest: allow only running a test if we have a *specific* llvm major version #132348 for tests/codegen/try_question_mark_nop.rs because that wants something more like //@ only-llvm-major-version: 19 instead.

Zalathar · 2024-10-30T05:39:53Z

Not sure if this is a good idea or not, but another possibility would be to reframe the directive as something like llvm-version-less-than.

In practice, I think a lot of the real-world uses of this directive are going to be along the lines of “this doesn't work on LLVM 21”, in which case llvm-version-less-than: 21 might make more sense? Hard to say.

jieyouxu · 2024-10-30T05:47:41Z

Not sure if this is a good idea or not, but another possibility would be to reframe the directive as something like llvm-version-less-than.

In practice, I think a lot of the real-world uses of this directive are going to be along the lines of “this doesn't work on LLVM 21”, in which case llvm-version-less-than: 21 might make more sense? Hard to say.

We could also just use a semver version range: //@ only-llvm-version-range: >=20.0.0. Since we're using semver in the prerequisite PR anyway this can even do stuff like //@ only-llvm-version-range: >=19 <21. Or 19.2 - 20.3.0.

(But that is also quite obscure, just musing)

…nur-ozkan compiletest: improve robustness of LLVM version handling Previously, `extract_llvm_versions` did some gymnastics for llvm versions by combining `(major, minor, patch)` into a combined version integer, but that is not very robust and made it difficult to add `max-llvm-major-version`. This PR tries to: - Improve llvm version handling robustness by parsing and representing the version as a semver. We intentionally deviate from strict semver standards by allowing omission of minor and patch versions. They default to `0` when absent. This is for convenience to allow the user to write e.g. `//@ min-llvm-version: 18` instead of having to spell out the full `major.minor.patch` semver string `//@ min-llvm-verison: 18.0.0`. - Adjust some panic messages to include a bit more context about *why* the version string was rejected. Prerequisite for rust-lang#132310. r? bootstrap (or compiler)

Rollup merge of rust-lang#132315 - jieyouxu:extract-llvm-version, r=onur-ozkan compiletest: improve robustness of LLVM version handling Previously, `extract_llvm_versions` did some gymnastics for llvm versions by combining `(major, minor, patch)` into a combined version integer, but that is not very robust and made it difficult to add `max-llvm-major-version`. This PR tries to: - Improve llvm version handling robustness by parsing and representing the version as a semver. We intentionally deviate from strict semver standards by allowing omission of minor and patch versions. They default to `0` when absent. This is for convenience to allow the user to write e.g. `//@ min-llvm-version: 18` instead of having to spell out the full `major.minor.patch` semver string `//@ min-llvm-verison: 18.0.0`. - Adjust some panic messages to include a bit more context about *why* the version string was rejected. Prerequisite for rust-lang#132310. r? bootstrap (or compiler)

jieyouxu · 2024-11-08T09:10:44Z

Hm, I feel like I forgot to set this as ready, lol.

@rustbot ready

jieyouxu · 2024-11-13T08:24:01Z

r? bootstrap

src/tools/compiletest/src/directive-list.rs

onur-ozkan · 2024-11-13T21:13:22Z

@bors r+

bors · 2024-11-13T21:13:25Z

📌 Commit f41e1cf has been approved by onur-ozkan

It is now in the queue for this repository.

bors · 2024-11-14T05:00:03Z

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

There's already `min-llvm-version`, and contributors were using `ignore-llvm-version: 20 - 99` to emulate `max-llvm-major-version: 19`.

…range like `N - 99` For tests that use `ignore-llvm-version: N - M`, replace that with `max-llvm-major-version: N-1`.

jieyouxu · 2024-11-14T09:47:06Z

Just whitespace conflicts.

@bors r=onur-ozkan

bors · 2024-11-14T09:47:08Z

📌 Commit 91fa16b has been approved by onur-ozkan

It is now in the queue for this repository.

…llaumeGomez Rollup of 5 pull requests Successful merges: - rust-lang#132010 (ci: Enable full `debuginfo-level=2` in `DEPLOY_ALT`) - rust-lang#132310 (compiletest: add `max-llvm-major-version` directive) - rust-lang#132773 (PassWrapper: disable UseOdrIndicator for Asan Win32) - rust-lang#133013 (compiletest: known-bug / crashes: allow for an "auxiliary" directory to contain files that do not have a "known-bug" directive) - rust-lang#133027 (Fix a copy-paste issue in the NuttX raw type definition) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#132310 - jieyouxu:max-llvm-version, r=onur-ozkan compiletest: add `max-llvm-major-version` directive To complement existing `min-llvm-version` so contributors don't have to use `ignore-llvm-version: 20 - 99` to emulate `max-llvm-major-version: 19`. Closes rust-lang#132305. cc `@workingjubilee` who suggested this. ### Implementation steps - [x] 1. Implement the directive (this PR) - [x] 2. Open an accompanying dev-guide PR to describe the directive (rust-lang/rustc-dev-guide#2129) r? bootstrap

rustbot assigned albertlarsan68 Oct 29, 2024

This comment was marked as resolved.

Sign in to view

Zalathar reviewed Oct 29, 2024

View reviewed changes

This comment was marked as resolved.

Sign in to view

jieyouxu 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2024

This comment was marked as resolved.

Sign in to view

jieyouxu marked this pull request as draft October 29, 2024 06:41

workingjubilee added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Oct 29, 2024

jieyouxu mentioned this pull request Oct 29, 2024

compiletest: improve robustness of LLVM version handling #132315

Merged

This comment was marked as resolved.

Sign in to view

jieyouxu force-pushed the max-llvm-version branch from aae8f1d to b6a7cca Compare October 30, 2024 05:25

jieyouxu changed the title ~~compiletest: add max-llvm-version directive~~ compiletest: add max-llvm-major-version directive Oct 30, 2024

jieyouxu force-pushed the max-llvm-version branch from b6a7cca to f41e1cf Compare November 4, 2024 08:38

jieyouxu marked this pull request as ready for review November 8, 2024 09:10

rustbot removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Nov 8, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 8, 2024

This was referenced Nov 8, 2024

Document max-llvm-major-version directive rust-lang/rustc-dev-guide#2129

Merged

tests/ui/abi/sparcv8plus.rs#sparc_cpu_v9 broken in LLVM 20 #132957

Open

This comment was marked as resolved.

Sign in to view

rustbot assigned Mark-Simulacrum and unassigned albertlarsan68 Nov 13, 2024

rustbot assigned onur-ozkan and unassigned Mark-Simulacrum Nov 13, 2024

onur-ozkan reviewed Nov 13, 2024

View reviewed changes

src/tools/compiletest/src/directive-list.rs Show resolved Hide resolved

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 Nov 13, 2024

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 Nov 14, 2024

jieyouxu added 2 commits November 14, 2024 17:44

compiletest: add max-llvm-major-version directive

7eee9fa

There's already `min-llvm-version`, and contributors were using `ignore-llvm-version: 20 - 99` to emulate `max-llvm-major-version: 19`.

tests: use max-llvm-major-version instead of ignore-llvm-version …

91fa16b

…range like `N - 99` For tests that use `ignore-llvm-version: N - M`, replace that with `max-llvm-major-version: N-1`.

jieyouxu force-pushed the max-llvm-version branch from f41e1cf to 91fa16b Compare November 14, 2024 09:46

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 Nov 14, 2024

GuillaumeGomez mentioned this pull request Nov 14, 2024

Rollup of 5 pull requests #133032

Merged

bors merged commit 475203f into rust-lang:master Nov 14, 2024
6 checks passed

rustbot added this to the 1.84.0 milestone Nov 14, 2024

jieyouxu deleted the max-llvm-version branch November 14, 2024 14:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

compiletest: add `max-llvm-major-version` directive #132310

compiletest: add `max-llvm-major-version` directive #132310

jieyouxu commented Oct 29, 2024 •

edited

Loading

This comment was marked as resolved.

Zalathar commented Oct 29, 2024

Zalathar Oct 29, 2024

jieyouxu Oct 29, 2024

This comment was marked as resolved.

jieyouxu commented Oct 29, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

jieyouxu commented Oct 30, 2024 •

edited

Loading

Zalathar commented Oct 30, 2024

jieyouxu commented Oct 30, 2024 •

edited

Loading

jieyouxu commented Nov 8, 2024

This comment was marked as resolved.

jieyouxu commented Nov 13, 2024

onur-ozkan commented Nov 13, 2024

bors commented Nov 13, 2024

bors commented Nov 14, 2024

jieyouxu commented Nov 14, 2024

bors commented Nov 14, 2024

compiletest: add max-llvm-major-version directive #132310

compiletest: add max-llvm-major-version directive #132310

Conversation

jieyouxu commented Oct 29, 2024 • edited Loading

Implementation steps

This comment was marked as resolved.

Zalathar commented Oct 29, 2024

Zalathar Oct 29, 2024

Choose a reason for hiding this comment

jieyouxu Oct 29, 2024

Choose a reason for hiding this comment

This comment was marked as resolved.

jieyouxu commented Oct 29, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

jieyouxu commented Oct 30, 2024 • edited Loading

Zalathar commented Oct 30, 2024

jieyouxu commented Oct 30, 2024 • edited Loading

jieyouxu commented Nov 8, 2024

This comment was marked as resolved.

jieyouxu commented Nov 13, 2024

onur-ozkan commented Nov 13, 2024

bors commented Nov 13, 2024

bors commented Nov 14, 2024

jieyouxu commented Nov 14, 2024

bors commented Nov 14, 2024

compiletest: add `max-llvm-major-version` directive #132310

compiletest: add `max-llvm-major-version` directive #132310

jieyouxu commented Oct 29, 2024 •

edited

Loading

jieyouxu commented Oct 30, 2024 •

edited

Loading

jieyouxu commented Oct 30, 2024 •

edited

Loading