diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2024-12-05 23:47:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-05 23:47:12 +0100 |
| commit | e82ee9626e4a02283c5fb7bc20d1dd26f31e5ae1 (patch) | |
| tree | 059ca835de59a01d155166d3cf6bd9aca10da353 | |
| parent | 9765a4ee75d17eecd3808fde371ace4b291ce8ff (diff) | |
| parent | 9aa4be0499ee76d19114f3489fd10dd7de3b772b (diff) | |
Rollup merge of #133910 - TimNN:llvm-target-cpus, r=jieyouxu
Normalize target-cpus.rs stdout test for LLVM changes LLVM has recently added support for the `lime1` CPU in https://github.com/llvm/llvm-project/commit/35cce408eef1a253df12c0023c993d78b180b1f3, so the `target-cpus.rs` test currently produces different output depending on the LLVM version. This CL adds a normalization directive, to remove the new CPU from the output list. Alternatives fixes I can think of: * Add two revisions of the test (one per LLVM version) * Ignore the test on one of the LLVM versions * I dislike this, because it's possible that the test won't get updated for the next LLVM version. I don't think the exact list of target CPUs is relevant for this test, so it shouldn't be too bad if the normalization sticks around longer than necessary. `@rustbot` label: +llvm-main
| -rw-r--r-- | tests/ui/codegen/target-cpus.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/ui/codegen/target-cpus.rs b/tests/ui/codegen/target-cpus.rs index 2d46e00f803..363915c6419 100644 --- a/tests/ui/codegen/target-cpus.rs +++ b/tests/ui/codegen/target-cpus.rs @@ -1,3 +1,9 @@ //@ needs-llvm-components: webassembly //@ compile-flags: --print=target-cpus --target=wasm32-unknown-unknown //@ check-pass + +// LLVM at HEAD has added support for the `lime1` CPU. Remove it from the +// output so that the stdout with LLVM-at-HEAD matches the output of the LLVM +// versions currently used by default. +// FIXME(#133919): Once Rust upgrades to LLVM 20, remove this. +//@ normalize-stdout-test: "(?m)^ *lime1\n" -> "" |