Skip to content

Commit 0665793

Browse files
Rename tests/codegen into tests/codegen-llvm
1 parent 1b52c1e commit 0665793

File tree

675 files changed

+40
-35
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

675 files changed

+40
-35
lines changed

compiler/rustc_codegen_ssa/src/mir/rvalue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
869869
let ltext = bx.zext(is_lt, bx.type_i8());
870870
bx.unchecked_ssub(gtext, ltext)
871871
} else {
872-
// These operations are those expected by `tests/codegen/integer-cmp.rs`,
872+
// These operations are those expected by `tests/codegen-llvm/integer-cmp.rs`,
873873
// from <https://github.com/rust-lang/rust/pull/63767>.
874874
let is_lt = bx.icmp(pred(mir::BinOp::Lt), lhs, rhs);
875875
let is_ne = bx.icmp(pred(mir::BinOp::Ne), lhs, rhs);

compiler/rustc_mir_transform/src/unreachable_prop.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fn remove_successors_from_switch<'tcx>(
7575
let is_unreachable = |bb| unreachable_blocks.contains(&bb);
7676

7777
// If there are multiple targets, we want to keep information about reachability for codegen.
78-
// For example (see tests/codegen/match-optimizes-away.rs)
78+
// For example (see tests/codegen-llvm/match-optimizes-away.rs)
7979
//
8080
// pub enum Two { A, B }
8181
// pub fn identity(x: Two) -> Two {

library/alloc/src/collections/vec_deque/drain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl<T, A: Allocator> Drop for Drain<'_, T, A> {
192192
// this branch is never taken.
193193
// We use `#[cold]` instead of `#[inline(never)]`, because inlining this
194194
// function into the general case (`.drain(n..m)`) is fine.
195-
// See `tests/codegen/vecdeque-drain.rs` for a test.
195+
// See `tests/codegen-llvm/vecdeque-drain.rs` for a test.
196196
#[cold]
197197
fn join_head_and_tail_wrapping<T, A: Allocator>(
198198
source_deque: &mut VecDeque<T, A>,

library/alloc/src/raw_vec/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ impl<A: Allocator> RawVecInner<A> {
761761
}
762762

763763
// not marked inline(never) since we want optimizers to be able to observe the specifics of this
764-
// function, see tests/codegen/vec-reserve-extend.rs.
764+
// function, see tests/codegen-llvm/vec-reserve-extend.rs.
765765
#[cold]
766766
fn finish_grow<A>(
767767
new_layout: Layout,

rustfmt.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ignore = [
1414
"/vendor/",
1515

1616
# Some tests are not formatted, for various reasons.
17-
"/tests/codegen/simd-intrinsic/", # Many types like `u8x64` are better hand-formatted.
17+
"/tests/codegen-llvm/simd-intrinsic/", # Many types like `u8x64` are better hand-formatted.
1818
"/tests/crashes/", # Many of these tests contain syntax errors.
1919
"/tests/debuginfo/", # These tests are somewhat sensitive to source code layout.
2020
"/tests/incremental/", # These tests are somewhat sensitive to source code layout.
@@ -58,5 +58,5 @@ ignore = [
5858

5959
# Rustfmt doesn't support use closures yet
6060
"tests/mir-opt/ergonomic-clones/closure.rs",
61-
"tests/codegen/ergonomic-clones/closure.rs",
61+
"tests/codegen-llvm/ergonomic-clones/closure.rs",
6262
]

src/bootstrap/src/core/build_steps/test.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,7 +1346,12 @@ test!(Ui { path: "tests/ui", mode: "ui", suite: "ui", default: true });
13461346

13471347
test!(Crashes { path: "tests/crashes", mode: "crashes", suite: "crashes", default: true });
13481348

1349-
test!(Codegen { path: "tests/codegen", mode: "codegen", suite: "codegen", default: true });
1349+
test!(Codegen {
1350+
path: "tests/codegen-llvm",
1351+
mode: "codegen",
1352+
suite: "codegen-llvm",
1353+
default: true
1354+
});
13501355

13511356
test!(CodegenUnits {
13521357
path: "tests/codegen-units",
@@ -1624,7 +1629,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
16241629
let suite_path = self.path;
16251630

16261631
// Skip codegen tests if they aren't enabled in configuration.
1627-
if !builder.config.codegen_tests && suite == "codegen" {
1632+
if !builder.config.codegen_tests && mode == "codegen" {
16281633
return;
16291634
}
16301635

@@ -1821,7 +1826,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
18211826
let mut flags = if is_rustdoc { Vec::new() } else { vec!["-Crpath".to_string()] };
18221827
flags.push(format!(
18231828
"-Cdebuginfo={}",
1824-
if suite == "codegen" {
1829+
if mode == "codegen" {
18251830
// codegen tests typically check LLVM IR and are sensitive to additional debuginfo.
18261831
// So do not apply `rust.debuginfo-level-tests` for codegen tests.
18271832
if builder.config.rust_debuginfo_level_tests

src/bootstrap/src/core/builder/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ const PATH_REMAP: &[(&str, &[&str])] = &[
412412
&[
413413
// tidy-alphabetical-start
414414
"tests/assembly-llvm",
415-
"tests/codegen",
415+
"tests/codegen-llvm",
416416
"tests/codegen-units",
417417
"tests/coverage",
418418
"tests/coverage-run-rustdoc",

src/ci/docker/host-x86_64/test-various/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_T
6565
tests/ui \
6666
tests/mir-opt \
6767
tests/codegen-units \
68-
tests/codegen \
68+
tests/codegen-llvm \
6969
tests/assembly-llvm \
7070
library/core
7171

src/doc/rustc-dev-guide/src/asm.md

Lines changed: 1 addition & 1 deletion

src/doc/rustc-dev-guide/src/autodiff/installation.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)