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.

Sign up for GitHub

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

What if we always run ReorderBasicBlocks? #139162

Closed
wants to merge 1 commit into from
Closed

What if we always run ReorderBasicBlocks? #139162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions compiler/rustc_mir_transform/src/prettify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ use rustc_session::Session;
pub(super) struct ReorderBasicBlocks;

impl<'tcx> crate::MirPass<'tcx> for ReorderBasicBlocks {
fn is_enabled(&self, _session: &Session) -> bool {
false
fn is_enabled(&self, sess: &rustc_session::Session) -> bool {
sess.mir_opt_level() > 1
}

fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
let rpo: IndexVec<BasicBlock, BasicBlock> =
body.basic_blocks.reverse_postorder().iter().copied().collect();
if rpo.iter().is_sorted() {
let rpo = body.basic_blocks.reverse_postorder();
if rpo.is_sorted() {
return;
}

let mut updater = BasicBlockUpdater { map: rpo.invert_bijective_mapping(), tcx };
let mut updater =
BasicBlockUpdater { map: IndexSlice::from_raw(rpo).invert_bijective_mapping(), tcx };
debug_assert_eq!(updater.map[START_BLOCK], START_BLOCK);
updater.visit_body(body);

Expand Down
11 changes: 6 additions & 5 deletions tests/codegen/hint/cold_path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ pub fn test1(x: bool) {
}

// CHECK-LABEL: @test1(
// CHECK: br i1 %x, label %bb1, label %bb2, !prof ![[NUM:[0-9]+]]
// CHECK: bb2:
// CHECK: path_b
// CHECK: br i1 %x, label %bb3, label %bb1, !prof ![[NUM:[0-9]+]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb3:
// CHECK: path_a
}

Expand All @@ -44,10 +44,11 @@ pub fn test2(x: i32) {
}

// CHECK-LABEL: @test2(
// CHECK: br i1 %_2, label %bb2, label %bb1, !prof ![[NUM]]
// CHECK: %_2 = icmp sgt i32 %x, 0
// CHECK: br i1 %_2, label %bb3, label %bb1, !prof ![[NUM]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK: bb3:
// CHECK: path_a
}

Expand Down
27 changes: 15 additions & 12 deletions tests/codegen/hint/likely.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ pub fn test1(x: bool) {
}

// CHECK-LABEL: @test1(
// CHECK: br i1 %x, label %bb2, label %bb3, !prof ![[NUM:[0-9]+]]
// CHECK: bb3:
// CHECK: br i1 %x, label %bb3, label %bb1, !prof ![[NUM:[0-9]+]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK: bb3:
// CHECK: path_a
}

Expand All @@ -40,10 +40,10 @@ pub fn test2(x: i32) {
}

// CHECK-LABEL: @test2(
// CHECK: br i1 %_2, label %bb2, label %bb3, !prof ![[NUM]]
// CHECK: bb3:
// CHECK: br i1 %_2, label %bb3, label %bb1, !prof ![[NUM]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK: bb3:
// CHECK: path_a
}

Expand All @@ -55,10 +55,10 @@ pub fn test3(x: i8) {
}

// CHECK-LABEL: @test3(
// CHECK: br i1 %_2, label %bb2, label %bb3, !prof ![[NUM]]
// CHECK: bb3:
// CHECK: br i1 %_2, label %bb3, label %bb1, !prof ![[NUM]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK: bb3:
// CHECK: path_a
}

Expand All @@ -69,11 +69,14 @@ pub fn test4(x: u64) {
_ => path_b(),
}

// Note that LLVM seems to flip this one, for some reason

// CHECK-LABEL: @test4(
// CHECK: br i1 %0, label %bb3, label %bb2, !prof ![[NUM2:[0-9]+]]
// CHECK: bb3:
// CHECK: %0 = icmp eq i64 %x, 33
// CHECK: br i1 %0, label %bb1, label %bb3, !prof ![[NUM2:[0-9]+]]
// CHECK: bb1:
// CHECK: path_a
// CHECK: bb2:
// CHECK: bb3:
// CHECK: path_b
}

Expand Down
20 changes: 12 additions & 8 deletions tests/codegen/hint/unlikely.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ pub fn test1(x: bool) {
}

// CHECK-LABEL: @test1(
// CHECK: br i1 %x, label %bb2, label %bb4, !prof ![[NUM:[0-9]+]]
// CHECK: bb4:
// CHECK: br i1 %x, label %bb2, label %bb1, !prof ![[NUM:[0-9]+]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK: path_a
Expand All @@ -40,8 +40,8 @@ pub fn test2(x: i32) {
}

// CHECK-LABEL: @test2(
// CHECK: br i1 %_2, label %bb2, label %bb4, !prof ![[NUM]]
// CHECK: bb4:
// CHECK: br i1 %_2, label %bb2, label %bb1, !prof ![[NUM]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK: path_a
Expand All @@ -55,8 +55,8 @@ pub fn test3(x: i8) {
}

// CHECK-LABEL: @test3(
// CHECK: br i1 %_2, label %bb2, label %bb4, !prof ![[NUM]]
// CHECK: bb4:
// CHECK: br i1 %_2, label %bb2, label %bb1, !prof ![[NUM]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK: path_a
Expand All @@ -69,12 +69,16 @@ pub fn test4(x: u64) {
_ => path_b(),
}

// Note that LLVM seems to flip this one, for some reason

// CHECK-LABEL: @test4(
// CHECK: br i1 %0, label %bb4, label %bb2, !prof ![[NUM2:[0-9]+]]
// CHECK: bb4:
// CHECK: %0 = icmp eq i64 %x, 33
// CHECK: br i1 %0, label %bb1, label %bb2, !prof ![[NUM2:[0-9]+]]
// CHECK: bb1:
// CHECK: path_a
// CHECK: bb2:
// CHECK: path_b
}

// CHECK: ![[NUM]] = !{!"branch_weights", {{(!"expected", )?}}i32 1, i32 2000}
// CHECK: ![[NUM2]] = !{!"branch_weights", {{(!"expected", )?}}i32 2000, i32 1}
18 changes: 9 additions & 9 deletions tests/codegen/intrinsics/cold_path3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ pub fn test(x: Option<u32>) {
}

// CHECK-LABEL: @test(
// CHECK: switch i32 %1, label %bb1 [
// CHECK: i32 0, label %bb6
// CHECK: i32 1, label %bb5
// CHECK: i32 2, label %bb4
// CHECK: i32 3, label %bb3
// CHECK: switch i32 %1, label %bb8 [
// CHECK: i32 0, label %bb2
// CHECK: i32 1, label %bb3
// CHECK: i32 2, label %bb5
// CHECK: i32 3, label %bb6
// CHECK: ], !prof ![[NUM1:[0-9]+]]
}

Expand All @@ -76,10 +76,10 @@ pub fn test2(x: Option<u32>) {
}

// CHECK-LABEL: @test2(
// CHECK: switch i32 %1, label %bb1 [
// CHECK: i32 10, label %bb5
// CHECK: i32 11, label %bb4
// CHECK: i32 13, label %bb3
// CHECK: switch i32 %1, label %bb7 [
// CHECK: i32 10, label %bb2
// CHECK: i32 11, label %bb3
// CHECK: i32 13, label %bb5
// CHECK: ], !prof ![[NUM2:[0-9]+]]
}

Expand Down
6 changes: 3 additions & 3 deletions tests/codegen/intrinsics/likely.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ pub fn test_likely(x: bool) {
}

// CHECK-LABEL: @test_likely(
// CHECK: br i1 %x, label %bb2, label %bb3, !prof ![[NUM:[0-9]+]]
// CHECK: bb3:
// CHECK: br i1 %x, label %bb3, label %bb1, !prof ![[NUM:[0-9]+]]
// CHECK: bb1:
// CHECK-NOT: cold_path
// CHECK: path_b
// CHECK: bb2:
// CHECK: bb3:
// CHECK: path_a
// CHECK: ![[NUM]] = !{!"branch_weights", {{(!"expected", )?}}i32 2000, i32 1}
4 changes: 2 additions & 2 deletions tests/codegen/intrinsics/unlikely.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ pub fn test_unlikely(x: bool) {
}

// CHECK-LABEL: @test_unlikely(
// CHECK: br i1 %x, label %bb2, label %bb4, !prof ![[NUM:[0-9]+]]
// CHECK: bb4:
// CHECK: br i1 %x, label %bb2, label %bb1, !prof ![[NUM:[0-9]+]]
// CHECK: bb1:
// CHECK: path_b
// CHECK: bb2:
// CHECK-NOT: cold_path
Expand Down
44 changes: 22 additions & 22 deletions tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.32bit.panic-abort.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
StorageLive(_17);
StorageLive(_19);
_19 = const false;
- switchInt(move _19) -> [0: bb6, otherwise: bb5];
+ switchInt(const false) -> [0: bb6, otherwise: bb5];
- switchInt(move _19) -> [0: bb3, otherwise: bb2];
+ switchInt(const false) -> [0: bb3, otherwise: bb2];
}

bb1: {
Expand All @@ -95,15 +95,29 @@
}

bb2: {
unreachable;
- _20 = Layout::from_size_align_unchecked::precondition_check(copy _11, copy _12) -> [return: bb3, unwind unreachable];
+ _20 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb3, unwind unreachable];
}

bb3: {
- _18 = handle_alloc_error(move _14) -> unwind unreachable;
+ _18 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
StorageDead(_19);
StorageLive(_21);
- _21 = copy _12 as std::ptr::Alignment (Transmute);
- _14 = Layout { size: copy _11, align: move _21 };
+ _21 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _14 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_21);
StorageLive(_15);
- _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _14, const false) -> [return: bb4, unwind unreachable];
+ _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb4, unwind unreachable];
}

bb4: {
_16 = discriminant(_15);
switchInt(move _16) -> [0: bb5, 1: bb6, otherwise: bb7];
}

bb5: {
_17 = copy ((_15 as Ok).0: std::ptr::NonNull<[u8]>);
StorageLive(_22);
_22 = copy _17 as *mut [u8] (Transmute);
Expand Down Expand Up @@ -150,27 +164,13 @@
drop(_3) -> [return: bb1, unwind unreachable];
}

bb5: {
- _20 = Layout::from_size_align_unchecked::precondition_check(copy _11, copy _12) -> [return: bb6, unwind unreachable];
+ _20 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb6, unwind unreachable];
}

bb6: {
StorageDead(_19);
StorageLive(_21);
- _21 = copy _12 as std::ptr::Alignment (Transmute);
- _14 = Layout { size: copy _11, align: move _21 };
+ _21 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _14 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_21);
StorageLive(_15);
- _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _14, const false) -> [return: bb7, unwind unreachable];
+ _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb7, unwind unreachable];
- _18 = handle_alloc_error(move _14) -> unwind unreachable;
+ _18 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
}

bb7: {
_16 = discriminant(_15);
switchInt(move _16) -> [0: bb4, 1: bb3, otherwise: bb2];
unreachable;
}
+ }
+
Expand Down
44 changes: 22 additions & 22 deletions tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.64bit.panic-abort.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
StorageLive(_17);
StorageLive(_19);
_19 = const false;
- switchInt(move _19) -> [0: bb6, otherwise: bb5];
+ switchInt(const false) -> [0: bb6, otherwise: bb5];
- switchInt(move _19) -> [0: bb3, otherwise: bb2];
+ switchInt(const false) -> [0: bb3, otherwise: bb2];
}

bb1: {
Expand All @@ -95,15 +95,29 @@
}

bb2: {
unreachable;
- _20 = Layout::from_size_align_unchecked::precondition_check(copy _11, copy _12) -> [return: bb3, unwind unreachable];
+ _20 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb3, unwind unreachable];
}

bb3: {
- _18 = handle_alloc_error(move _14) -> unwind unreachable;
+ _18 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
StorageDead(_19);
StorageLive(_21);
- _21 = copy _12 as std::ptr::Alignment (Transmute);
- _14 = Layout { size: copy _11, align: move _21 };
+ _21 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _14 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_21);
StorageLive(_15);
- _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _14, const false) -> [return: bb4, unwind unreachable];
+ _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb4, unwind unreachable];
}

bb4: {
_16 = discriminant(_15);
switchInt(move _16) -> [0: bb5, 1: bb6, otherwise: bb7];
}

bb5: {
_17 = copy ((_15 as Ok).0: std::ptr::NonNull<[u8]>);
StorageLive(_22);
_22 = copy _17 as *mut [u8] (Transmute);
Expand Down Expand Up @@ -150,27 +164,13 @@
drop(_3) -> [return: bb1, unwind unreachable];
}

bb5: {
- _20 = Layout::from_size_align_unchecked::precondition_check(copy _11, copy _12) -> [return: bb6, unwind unreachable];
+ _20 = Layout::from_size_align_unchecked::precondition_check(const 0_usize, const 1_usize) -> [return: bb6, unwind unreachable];
}

bb6: {
StorageDead(_19);
StorageLive(_21);
- _21 = copy _12 as std::ptr::Alignment (Transmute);
- _14 = Layout { size: copy _11, align: move _21 };
+ _21 = const std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0);
+ _14 = const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }};
StorageDead(_21);
StorageLive(_15);
- _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], copy _14, const false) -> [return: bb7, unwind unreachable];
+ _15 = std::alloc::Global::alloc_impl(const alloc::alloc::exchange_malloc::promoted[0], const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}, const false) -> [return: bb7, unwind unreachable];
- _18 = handle_alloc_error(move _14) -> unwind unreachable;
+ _18 = handle_alloc_error(const Layout {{ size: 0_usize, align: std::ptr::Alignment(std::ptr::alignment::AlignmentEnum::_Align1Shl0) }}) -> unwind unreachable;
}

bb7: {
_16 = discriminant(_15);
switchInt(move _16) -> [0: bb4, 1: bb3, otherwise: bb2];
unreachable;
}
+ }
+
Expand Down
Loading
Loading