From 58f8739d558c08d4acdb26c29257600d7e491cc7 Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Tue, 12 May 2026 16:58:17 +1000
Subject: [PATCH] Migrate mir-opt tests from `PreCodegen` to
 `runtime-optimized`

MIR dumped before/after the dummy `PreCodegen` pass should be identical to MIR
dumped after the phase transition to `runtime-optimized`.
---
 ....mir => string.foo.runtime-optimized.after.mir} |  2 +-
 .../building/match/deref-patterns/string.rs        |  2 +-
 tests/mir-opt/building/while_storage.rs            |  2 +-
 ...e_loop.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._loop.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ....hello.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...hello.runtime-optimized.after.panic-unwind.mir} |  2 +-
 .../const_prop/control_flow_simplification.rs      |  2 +-
 ...ce.add.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...e.add.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/const_prop/return_place.rs           |  2 +-
 ...caller.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...aller.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/inline/rustc_no_mir_inline.rs        |  2 +-
 tests/mir-opt/inline/unchecked_shifts.rs           |  4 ++--
 ...maller.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...aller.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...bigger.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...igger.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/inline/unwrap_unchecked.rs           |  2 +-
 ...hecked.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...ecked.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ....runtime-optimized.after.32bit.panic-abort.mir} |  2 +-
 ...runtime-optimized.after.32bit.panic-unwind.mir} |  2 +-
 ....runtime-optimized.after.64bit.panic-abort.mir} |  2 +-
 ...runtime-optimized.after.64bit.panic-unwind.mir} |  2 +-
 tests/mir-opt/issues/issue_59352.rs                |  2 +-
 ...pattern_types.main.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pattern_types.rs                     |  2 +-
 ...q_ipv4.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._ipv4.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...q_ipv6.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._ipv6.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...length.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...ength.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/array_eq.rs              |  6 +++---
 ..._comparison.bitand.runtime-optimized.after.mir} |  2 +-
 ...d_comparison.naive.runtime-optimized.after.mir} |  2 +-
 ...mparison.returning.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/chained_comparison.rs    |  6 +++---
 ...ed_shl.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...d_shl.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/checked_ops.rs           |  8 ++++----
 ...t_home.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._home.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...orward.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...rward.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...ed_sub.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...d_sub.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...copy.clone_as_copy.runtime-optimized.after.mir} |  2 +-
 ...enum_clone_as_copy.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/clone_as_copy.rs         |  4 ++--
 ...ordering_eq.direct.runtime-optimized.after.mir} |  2 +-
 .../const_promotion_option_ordering_eq.rs          |  4 ++--
 ...dering_eq.with_let.runtime-optimized.after.mir} |  2 +-
 ...lace.invalid_place.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/dead_on_invalid_place.rs |  2 +-
 tests/mir-opt/pre-codegen/deref_nested_borrows.rs  |  2 +-
 ...ws.src.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...s.src.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...erived_ord.demo_le.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/derived_ord.rs           |  4 ++--
 ...mpl#0}-partial_cmp.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/derived_ord_debug.rs     |  4 ++--
 ...al_cmp.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...l_cmp.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...1}-cmp.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...}-cmp.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ..._bytes.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...bytes.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...eneric.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...neric.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/drop_box_of_sized.rs     |  4 ++--
 ....runtime-optimized.after.32bit.panic-abort.mir} |  2 +-
 ...runtime-optimized.after.32bit.panic-unwind.mir} |  2 +-
 ....runtime-optimized.after.64bit.panic-abort.mir} |  2 +-
 ...runtime-optimized.after.64bit.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/drop_boxed_slice.rs      |  2 +-
 .../pre-codegen/duplicate_switch_targets.rs        |  2 +-
 ...ch_targets.ub_if_b.runtime-optimized.after.mir} |  2 +-
 ...> intrinsics.f_u64.runtime-optimized.after.mir} |  2 +-
 ... intrinsics.f_unit.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/intrinsics.rs            |  4 ++--
 ...oops.filter_mapped.runtime-optimized.after.mir} |  2 +-
 ...=> loops.int_range.runtime-optimized.after.mir} |  2 +-
 ...ir => loops.mapped.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/loops.rs                 |  8 ++++----
 ... => loops.vec_move.runtime-optimized.after.mir} |  2 +-
 ... => matchbr.match1.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/matchbr.rs               |  2 +-
 ...ro.issue_77355_opt.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/matches_macro.rs         |  2 +-
 ...eplace.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...place.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...eplace.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...place.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/mem_replace.rs           |  4 ++--
 tests/mir-opt/pre-codegen/no_inlined_clone.rs      |  2 +-
 ...one.{impl#0}-clone.runtime-optimized.after.mir} |  2 +-
 ....runtime-optimized.after.32bit.panic-abort.mir} |  2 +-
 ...runtime-optimized.after.32bit.panic-unwind.mir} |  2 +-
 ....runtime-optimized.after.64bit.panic-abort.mir} |  2 +-
 ...runtime-optimized.after.64bit.panic-unwind.mir} |  2 +-
 .../mir-opt/pre-codegen/optimizes_into_variable.rs |  2 +-
 ...direct.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...irect.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...traits.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...raits.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/option_bubble_debug.rs   |  4 ++--
 ...dd_fat.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...d_fat.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...d_thin.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._thin.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/ptr_offset.rs            |  4 ++--
 ...d_loop.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._loop.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...e_loop.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._loop.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...r_next.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._next.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...r_next.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._next.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/range_iter.rs            |  8 ++++----
 ...e_option_map.ezmap.runtime-optimized.after.mir} |  2 +-
 ..._via_question_mark.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/simple_option_map.rs     |  4 ++--
 tests/mir-opt/pre-codegen/slice_filter.rs          |  4 ++--
 ...iant_a-{closure#0}.runtime-optimized.after.mir} |  2 +-
 ...iant_b-{closure#0}.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/slice_index.rs           | 10 +++++-----
 ..._usize.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...usize.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ..._range.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...range.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ..._range.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...range.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ..._usize.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...usize.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ..._range.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...range.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...d_loop.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._loop.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...d_loop.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._loop.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...e_loop.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._loop.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...e_loop.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._loop.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/slice_iter.rs            | 14 +++++++-------
 ..._empty.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...empty.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...t_back.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._back.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...r_next.runtime-optimized.after.panic-abort.mir} |  2 +-
 ..._next.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ....outer.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...outer.runtime-optimized.after.panic-unwind.mir} |  2 +-
 tests/mir-opt/pre-codegen/spans.rs                 |  2 +-
 ...tes.forget_at_home.runtime-optimized.after.mir} |  2 +-
 ...smutes.neo_to_cast.runtime-optimized.after.mir} |  2 +-
 ....pad_for_alignment.runtime-optimized.after.mir} |  2 +-
 ...es.prefix_of_array.runtime-optimized.after.mir} |  2 +-
 ...tes.prefix_to_cast.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/transmutes.rs            | 10 +++++-----
 ...> try_identity.new.runtime-optimized.after.mir} |  2 +-
 ...> try_identity.old.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/try_identity.rs          |  4 ++--
 ...rd.demo_ge_partial.runtime-optimized.after.mir} |  2 +-
 ..._ord.demo_le_total.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/tuple_ord.rs             |  4 ++--
 tests/mir-opt/pre-codegen/two_unwrap_unchecked.rs  |  2 +-
 ...o_unwrap_unchecked.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/pre-codegen/vec_deref.rs             |  2 +-
 ..._slice.runtime-optimized.after.panic-abort.mir} |  2 +-
 ...slice.runtime-optimized.after.panic-unwind.mir} |  2 +-
 ...r_const.no_codegen.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/remove_never_const.rs                |  2 +-
 ...=> tls_access.main.runtime-optimized.after.mir} |  2 +-
 tests/mir-opt/tls_access.rs                        |  2 +-
 179 files changed, 220 insertions(+), 220 deletions(-)
 rename tests/mir-opt/building/match/deref-patterns/{string.foo.PreCodegen.after.mir => string.foo.runtime-optimized.after.mir} (97%)
 rename tests/mir-opt/building/{while_storage.while_loop.PreCodegen.after.panic-abort.mir => while_storage.while_loop.runtime-optimized.after.panic-abort.mir} (96%)
 rename tests/mir-opt/building/{while_storage.while_loop.PreCodegen.after.panic-unwind.mir => while_storage.while_loop.runtime-optimized.after.panic-unwind.mir} (96%)
 rename tests/mir-opt/const_prop/{control_flow_simplification.hello.PreCodegen.before.panic-unwind.mir => control_flow_simplification.hello.runtime-optimized.after.panic-abort.mir} (63%)
 rename tests/mir-opt/const_prop/{control_flow_simplification.hello.PreCodegen.before.panic-abort.mir => control_flow_simplification.hello.runtime-optimized.after.panic-unwind.mir} (63%)
 rename tests/mir-opt/const_prop/{return_place.add.PreCodegen.before.panic-abort.mir => return_place.add.runtime-optimized.after.panic-abort.mir} (89%)
 rename tests/mir-opt/const_prop/{return_place.add.PreCodegen.before.panic-unwind.mir => return_place.add.runtime-optimized.after.panic-unwind.mir} (89%)
 rename tests/mir-opt/inline/{rustc_no_mir_inline.caller.PreCodegen.after.panic-abort.mir => rustc_no_mir_inline.caller.runtime-optimized.after.panic-abort.mir} (79%)
 rename tests/mir-opt/inline/{rustc_no_mir_inline.caller.PreCodegen.after.panic-unwind.mir => rustc_no_mir_inline.caller.runtime-optimized.after.panic-unwind.mir} (79%)
 rename tests/mir-opt/inline/{unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-abort.mir => unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-abort.mir} (86%)
 rename tests/mir-opt/inline/{unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-unwind.mir => unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-unwind.mir} (86%)
 rename tests/mir-opt/inline/{unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-abort.mir => unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-abort.mir} (87%)
 rename tests/mir-opt/inline/{unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-unwind.mir => unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-unwind.mir} (87%)
 rename tests/mir-opt/inline/{unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-abort.mir => unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-abort.mir} (92%)
 rename tests/mir-opt/inline/{unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-unwind.mir => unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-unwind.mir} (92%)
 rename tests/mir-opt/issues/{issue_59352.num_to_digit.PreCodegen.after.64bit.panic-abort.mir => issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-abort.mir} (96%)
 rename tests/mir-opt/issues/{issue_59352.num_to_digit.PreCodegen.after.32bit.panic-unwind.mir => issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-unwind.mir} (96%)
 rename tests/mir-opt/issues/{issue_59352.num_to_digit.PreCodegen.after.32bit.panic-abort.mir => issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-abort.mir} (96%)
 rename tests/mir-opt/issues/{issue_59352.num_to_digit.PreCodegen.after.64bit.panic-unwind.mir => issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-unwind.mir} (96%)
 rename tests/mir-opt/{pattern_types.main.PreCodegen.after.mir => pattern_types.main.runtime-optimized.after.mir} (84%)
 rename tests/mir-opt/pre-codegen/{array_eq.eq_ipv4.PreCodegen.after.panic-abort.mir => array_eq.eq_ipv4.runtime-optimized.after.panic-abort.mir} (92%)
 rename tests/mir-opt/pre-codegen/{array_eq.eq_ipv4.PreCodegen.after.panic-unwind.mir => array_eq.eq_ipv4.runtime-optimized.after.panic-unwind.mir} (92%)
 rename tests/mir-opt/pre-codegen/{array_eq.eq_ipv6.PreCodegen.after.panic-abort.mir => array_eq.eq_ipv6.runtime-optimized.after.panic-abort.mir} (92%)
 rename tests/mir-opt/pre-codegen/{array_eq.eq_ipv6.PreCodegen.after.panic-unwind.mir => array_eq.eq_ipv6.runtime-optimized.after.panic-unwind.mir} (92%)
 rename tests/mir-opt/pre-codegen/{array_eq.eq_odd_length.PreCodegen.after.panic-abort.mir => array_eq.eq_odd_length.runtime-optimized.after.panic-abort.mir} (91%)
 rename tests/mir-opt/pre-codegen/{array_eq.eq_odd_length.PreCodegen.after.panic-unwind.mir => array_eq.eq_odd_length.runtime-optimized.after.panic-unwind.mir} (91%)
 rename tests/mir-opt/pre-codegen/{chained_comparison.bitand.PreCodegen.after.mir => chained_comparison.bitand.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{chained_comparison.naive.PreCodegen.after.mir => chained_comparison.naive.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{chained_comparison.returning.PreCodegen.after.mir => chained_comparison.returning.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{checked_ops.checked_shl.PreCodegen.after.panic-abort.mir => checked_ops.checked_shl.runtime-optimized.after.panic-abort.mir} (95%)
 rename tests/mir-opt/pre-codegen/{checked_ops.checked_shl.PreCodegen.after.panic-unwind.mir => checked_ops.checked_shl.runtime-optimized.after.panic-unwind.mir} (95%)
 rename tests/mir-opt/pre-codegen/{checked_ops.saturating_sub_at_home.PreCodegen.after.panic-abort.mir => checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-abort.mir} (93%)
 rename tests/mir-opt/pre-codegen/{checked_ops.saturating_sub_at_home.PreCodegen.after.panic-unwind.mir => checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-unwind.mir} (93%)
 rename tests/mir-opt/pre-codegen/{checked_ops.step_forward.PreCodegen.after.panic-abort.mir => checked_ops.step_forward.runtime-optimized.after.panic-abort.mir} (97%)
 rename tests/mir-opt/pre-codegen/{checked_ops.step_forward.PreCodegen.after.panic-unwind.mir => checked_ops.step_forward.runtime-optimized.after.panic-unwind.mir} (97%)
 rename tests/mir-opt/pre-codegen/{checked_ops.use_checked_sub.PreCodegen.after.panic-abort.mir => checked_ops.use_checked_sub.runtime-optimized.after.panic-abort.mir} (95%)
 rename tests/mir-opt/pre-codegen/{checked_ops.use_checked_sub.PreCodegen.after.panic-unwind.mir => checked_ops.use_checked_sub.runtime-optimized.after.panic-unwind.mir} (95%)
 rename tests/mir-opt/pre-codegen/{clone_as_copy.clone_as_copy.PreCodegen.after.mir => clone_as_copy.clone_as_copy.runtime-optimized.after.mir} (88%)
 rename tests/mir-opt/pre-codegen/{clone_as_copy.enum_clone_as_copy.PreCodegen.after.mir => clone_as_copy.enum_clone_as_copy.runtime-optimized.after.mir} (93%)
 rename tests/mir-opt/pre-codegen/{const_promotion_option_ordering_eq.direct.PreCodegen.after.mir => const_promotion_option_ordering_eq.direct.runtime-optimized.after.mir} (95%)
 rename tests/mir-opt/pre-codegen/{const_promotion_option_ordering_eq.with_let.PreCodegen.after.mir => const_promotion_option_ordering_eq.with_let.runtime-optimized.after.mir} (95%)
 rename tests/mir-opt/pre-codegen/{dead_on_invalid_place.invalid_place.PreCodegen.after.mir => dead_on_invalid_place.invalid_place.runtime-optimized.after.mir} (78%)
 rename tests/mir-opt/pre-codegen/{deref_nested_borrows.src.PreCodegen.after.panic-abort.mir => deref_nested_borrows.src.runtime-optimized.after.panic-abort.mir} (93%)
 rename tests/mir-opt/pre-codegen/{deref_nested_borrows.src.PreCodegen.after.panic-unwind.mir => deref_nested_borrows.src.runtime-optimized.after.panic-unwind.mir} (93%)
 rename tests/mir-opt/pre-codegen/{derived_ord.demo_le.PreCodegen.after.mir => derived_ord.demo_le.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{derived_ord.{impl#0}-partial_cmp.PreCodegen.after.mir => derived_ord.{impl#0}-partial_cmp.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-abort.mir => derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-abort.mir} (97%)
 rename tests/mir-opt/pre-codegen/{derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-unwind.mir => derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-unwind.mir} (97%)
 rename tests/mir-opt/pre-codegen/{derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-abort.mir => derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-abort.mir} (97%)
 rename tests/mir-opt/pre-codegen/{derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-unwind.mir => derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-unwind.mir} (97%)
 rename tests/mir-opt/pre-codegen/{drop_box_of_sized.drop_bytes.PreCodegen.after.panic-unwind.mir => drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{drop_box_of_sized.drop_bytes.PreCodegen.after.panic-abort.mir => drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{drop_box_of_sized.drop_generic.PreCodegen.after.panic-abort.mir => drop_box_of_sized.drop_generic.runtime-optimized.after.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{drop_box_of_sized.drop_generic.PreCodegen.after.panic-unwind.mir => drop_box_of_sized.drop_generic.runtime-optimized.after.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-abort.mir => drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-abort.mir => drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-unwind.mir => drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-unwind.mir => drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{duplicate_switch_targets.ub_if_b.PreCodegen.after.mir => duplicate_switch_targets.ub_if_b.runtime-optimized.after.mir} (91%)
 rename tests/mir-opt/pre-codegen/{intrinsics.f_u64.PreCodegen.after.mir => intrinsics.f_u64.runtime-optimized.after.mir} (87%)
 rename tests/mir-opt/pre-codegen/{intrinsics.f_unit.PreCodegen.after.mir => intrinsics.f_unit.runtime-optimized.after.mir} (87%)
 rename tests/mir-opt/pre-codegen/{loops.filter_mapped.PreCodegen.after.mir => loops.filter_mapped.runtime-optimized.after.mir} (97%)
 rename tests/mir-opt/pre-codegen/{loops.int_range.PreCodegen.after.mir => loops.int_range.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{loops.mapped.PreCodegen.after.mir => loops.mapped.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{loops.vec_move.PreCodegen.after.mir => loops.vec_move.runtime-optimized.after.mir} (99%)
 rename tests/mir-opt/pre-codegen/{matchbr.match1.PreCodegen.after.mir => matchbr.match1.runtime-optimized.after.mir} (81%)
 rename tests/mir-opt/pre-codegen/{matches_macro.issue_77355_opt.PreCodegen.after.mir => matches_macro.issue_77355_opt.runtime-optimized.after.mir} (87%)
 rename tests/mir-opt/pre-codegen/{mem_replace.manual_replace.PreCodegen.after.panic-unwind.mir => mem_replace.manual_replace.runtime-optimized.after.panic-abort.mir} (82%)
 rename tests/mir-opt/pre-codegen/{mem_replace.manual_replace.PreCodegen.after.panic-abort.mir => mem_replace.manual_replace.runtime-optimized.after.panic-unwind.mir} (82%)
 rename tests/mir-opt/pre-codegen/{mem_replace.mem_replace.PreCodegen.after.panic-unwind.mir => mem_replace.mem_replace.runtime-optimized.after.panic-abort.mir} (84%)
 rename tests/mir-opt/pre-codegen/{mem_replace.mem_replace.PreCodegen.after.panic-abort.mir => mem_replace.mem_replace.runtime-optimized.after.panic-unwind.mir} (84%)
 rename tests/mir-opt/pre-codegen/{no_inlined_clone.{impl#0}-clone.PreCodegen.after.mir => no_inlined_clone.{impl#0}-clone.runtime-optimized.after.mir} (90%)
 rename tests/mir-opt/pre-codegen/{optimizes_into_variable.main.PreCodegen.after.64bit.panic-unwind.mir => optimizes_into_variable.main.runtime-optimized.after.32bit.panic-abort.mir} (86%)
 rename tests/mir-opt/pre-codegen/{optimizes_into_variable.main.PreCodegen.after.32bit.panic-unwind.mir => optimizes_into_variable.main.runtime-optimized.after.32bit.panic-unwind.mir} (86%)
 rename tests/mir-opt/pre-codegen/{optimizes_into_variable.main.PreCodegen.after.32bit.panic-abort.mir => optimizes_into_variable.main.runtime-optimized.after.64bit.panic-abort.mir} (86%)
 rename tests/mir-opt/pre-codegen/{optimizes_into_variable.main.PreCodegen.after.64bit.panic-abort.mir => optimizes_into_variable.main.runtime-optimized.after.64bit.panic-unwind.mir} (86%)
 rename tests/mir-opt/pre-codegen/{option_bubble_debug.option_direct.PreCodegen.after.panic-abort.mir => option_bubble_debug.option_direct.runtime-optimized.after.panic-abort.mir} (92%)
 rename tests/mir-opt/pre-codegen/{option_bubble_debug.option_direct.PreCodegen.after.panic-unwind.mir => option_bubble_debug.option_direct.runtime-optimized.after.panic-unwind.mir} (92%)
 rename tests/mir-opt/pre-codegen/{option_bubble_debug.option_traits.PreCodegen.after.panic-abort.mir => option_bubble_debug.option_traits.runtime-optimized.after.panic-abort.mir} (95%)
 rename tests/mir-opt/pre-codegen/{option_bubble_debug.option_traits.PreCodegen.after.panic-unwind.mir => option_bubble_debug.option_traits.runtime-optimized.after.panic-unwind.mir} (95%)
 rename tests/mir-opt/pre-codegen/{ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir => ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-abort.mir} (95%)
 rename tests/mir-opt/pre-codegen/{ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir => ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-unwind.mir} (95%)
 rename tests/mir-opt/pre-codegen/{ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir => ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-abort.mir} (94%)
 rename tests/mir-opt/pre-codegen/{ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir => ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-unwind.mir} (94%)
 rename tests/mir-opt/pre-codegen/{range_iter.forward_loop.PreCodegen.after.panic-abort.mir => range_iter.forward_loop.runtime-optimized.after.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{range_iter.forward_loop.PreCodegen.after.panic-unwind.mir => range_iter.forward_loop.runtime-optimized.after.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{range_iter.inclusive_loop.PreCodegen.after.panic-abort.mir => range_iter.inclusive_loop.runtime-optimized.after.panic-abort.mir} (97%)
 rename tests/mir-opt/pre-codegen/{range_iter.inclusive_loop.PreCodegen.after.panic-unwind.mir => range_iter.inclusive_loop.runtime-optimized.after.panic-unwind.mir} (97%)
 rename tests/mir-opt/pre-codegen/{range_iter.range_inclusive_iter_next.PreCodegen.after.panic-abort.mir => range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-abort.mir} (87%)
 rename tests/mir-opt/pre-codegen/{range_iter.range_inclusive_iter_next.PreCodegen.after.panic-unwind.mir => range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-unwind.mir} (87%)
 rename tests/mir-opt/pre-codegen/{range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir => range_iter.range_iter_next.runtime-optimized.after.panic-abort.mir} (97%)
 rename tests/mir-opt/pre-codegen/{range_iter.range_iter_next.PreCodegen.after.panic-abort.mir => range_iter.range_iter_next.runtime-optimized.after.panic-unwind.mir} (97%)
 rename tests/mir-opt/pre-codegen/{simple_option_map.ezmap.PreCodegen.after.mir => simple_option_map.ezmap.runtime-optimized.after.mir} (96%)
 rename tests/mir-opt/pre-codegen/{simple_option_map.map_via_question_mark.PreCodegen.after.mir => simple_option_map.map_via_question_mark.runtime-optimized.after.mir} (97%)
 rename tests/mir-opt/pre-codegen/{slice_filter.variant_a-{closure#0}.PreCodegen.after.mir => slice_filter.variant_a-{closure#0}.runtime-optimized.after.mir} (98%)
 rename tests/mir-opt/pre-codegen/{slice_filter.variant_b-{closure#0}.PreCodegen.after.mir => slice_filter.variant_b-{closure#0}.runtime-optimized.after.mir} (96%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir => slice_index.slice_get_mut_usize.runtime-optimized.after.panic-abort.mir} (94%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir => slice_index.slice_get_mut_usize.runtime-optimized.after.panic-unwind.mir} (94%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir => slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-abort.mir} (96%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir => slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-unwind.mir} (96%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_index_range.PreCodegen.after.panic-abort.mir => slice_index.slice_index_range.runtime-optimized.after.panic-abort.mir} (97%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_index_range.PreCodegen.after.panic-unwind.mir => slice_index.slice_index_range.runtime-optimized.after.panic-unwind.mir} (97%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_index_usize.PreCodegen.after.panic-abort.mir => slice_index.slice_index_usize.runtime-optimized.after.panic-abort.mir} (89%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_index_usize.PreCodegen.after.panic-unwind.mir => slice_index.slice_index_usize.runtime-optimized.after.panic-unwind.mir} (89%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir => slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-abort.mir} (96%)
 rename tests/mir-opt/pre-codegen/{slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir => slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-unwind.mir} (96%)
 rename tests/mir-opt/pre-codegen/{slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir => slice_iter.enumerated_loop.runtime-optimized.after.panic-abort.mir} (99%)
 rename tests/mir-opt/pre-codegen/{slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir => slice_iter.enumerated_loop.runtime-optimized.after.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{slice_iter.forward_loop.PreCodegen.after.panic-abort.mir => slice_iter.forward_loop.runtime-optimized.after.panic-abort.mir} (99%)
 rename tests/mir-opt/pre-codegen/{slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir => slice_iter.forward_loop.runtime-optimized.after.panic-unwind.mir} (99%)
 rename tests/mir-opt/pre-codegen/{slice_iter.range_loop.PreCodegen.after.panic-abort.mir => slice_iter.range_loop.runtime-optimized.after.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{slice_iter.range_loop.PreCodegen.after.panic-unwind.mir => slice_iter.range_loop.runtime-optimized.after.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir => slice_iter.reverse_loop.runtime-optimized.after.panic-abort.mir} (99%)
 rename tests/mir-opt/pre-codegen/{slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir => slice_iter.reverse_loop.runtime-optimized.after.panic-unwind.mir} (99%)
 rename tests/mir-opt/pre-codegen/{slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-abort.mir => slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-abort.mir} (96%)
 rename tests/mir-opt/pre-codegen/{slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-unwind.mir => slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-unwind.mir} (96%)
 rename tests/mir-opt/pre-codegen/{slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-unwind.mir => slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-abort.mir => slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{slice_iter.slice_iter_next.PreCodegen.after.panic-unwind.mir => slice_iter.slice_iter_next.runtime-optimized.after.panic-abort.mir} (98%)
 rename tests/mir-opt/pre-codegen/{slice_iter.slice_iter_next.PreCodegen.after.panic-abort.mir => slice_iter.slice_iter_next.runtime-optimized.after.panic-unwind.mir} (98%)
 rename tests/mir-opt/pre-codegen/{spans.outer.PreCodegen.after.panic-abort.mir => spans.outer.runtime-optimized.after.panic-abort.mir} (93%)
 rename tests/mir-opt/pre-codegen/{spans.outer.PreCodegen.after.panic-unwind.mir => spans.outer.runtime-optimized.after.panic-unwind.mir} (93%)
 rename tests/mir-opt/pre-codegen/{transmutes.forget_at_home.PreCodegen.after.mir => transmutes.forget_at_home.runtime-optimized.after.mir} (88%)
 rename tests/mir-opt/pre-codegen/{transmutes.neo_to_cast.PreCodegen.after.mir => transmutes.neo_to_cast.runtime-optimized.after.mir} (80%)
 rename tests/mir-opt/pre-codegen/{transmutes.pad_for_alignment.PreCodegen.after.mir => transmutes.pad_for_alignment.runtime-optimized.after.mir} (93%)
 rename tests/mir-opt/pre-codegen/{transmutes.prefix_of_array.PreCodegen.after.mir => transmutes.prefix_of_array.runtime-optimized.after.mir} (94%)
 rename tests/mir-opt/pre-codegen/{transmutes.prefix_to_cast.PreCodegen.after.mir => transmutes.prefix_to_cast.runtime-optimized.after.mir} (89%)
 rename tests/mir-opt/pre-codegen/{try_identity.new.PreCodegen.after.mir => try_identity.new.runtime-optimized.after.mir} (96%)
 rename tests/mir-opt/pre-codegen/{try_identity.old.PreCodegen.after.mir => try_identity.old.runtime-optimized.after.mir} (94%)
 rename tests/mir-opt/pre-codegen/{tuple_ord.demo_ge_partial.PreCodegen.after.mir => tuple_ord.demo_ge_partial.runtime-optimized.after.mir} (97%)
 rename tests/mir-opt/pre-codegen/{tuple_ord.demo_le_total.PreCodegen.after.mir => tuple_ord.demo_le_total.runtime-optimized.after.mir} (97%)
 rename tests/mir-opt/pre-codegen/{two_unwrap_unchecked.two_unwrap_unchecked.PreCodegen.after.mir => two_unwrap_unchecked.two_unwrap_unchecked.runtime-optimized.after.mir} (95%)
 rename tests/mir-opt/pre-codegen/{vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir => vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-abort.mir} (97%)
 rename tests/mir-opt/pre-codegen/{vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir => vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-unwind.mir} (97%)
 rename tests/mir-opt/{remove_never_const.no_codegen.PreCodegen.after.mir => remove_never_const.no_codegen.runtime-optimized.after.mir} (68%)
 rename tests/mir-opt/{tls_access.main.PreCodegen.after.mir => tls_access.main.runtime-optimized.after.mir} (91%)

diff --git a/tests/mir-opt/building/match/deref-patterns/string.foo.PreCodegen.after.mir b/tests/mir-opt/building/match/deref-patterns/string.foo.runtime-optimized.after.mir
similarity index 97%
rename from tests/mir-opt/building/match/deref-patterns/string.foo.PreCodegen.after.mir
rename to tests/mir-opt/building/match/deref-patterns/string.foo.runtime-optimized.after.mir
index c7c26d6351ad..c7217e31a7f9 100644
--- a/tests/mir-opt/building/match/deref-patterns/string.foo.PreCodegen.after.mir
+++ b/tests/mir-opt/building/match/deref-patterns/string.foo.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `foo` after PreCodegen
+// MIR for `foo` after runtime-optimized
 
 fn foo(_1: Option<String>) -> i32 {
     debug s => _1;
diff --git a/tests/mir-opt/building/match/deref-patterns/string.rs b/tests/mir-opt/building/match/deref-patterns/string.rs
index 2426cb7d1a75..406ecc7aeabb 100644
--- a/tests/mir-opt/building/match/deref-patterns/string.rs
+++ b/tests/mir-opt/building/match/deref-patterns/string.rs
@@ -4,7 +4,7 @@
 #![feature(deref_patterns)]
 #![crate_type = "lib"]
 
-// EMIT_MIR string.foo.PreCodegen.after.mir
+// EMIT_MIR string.foo.runtime-optimized.after.mir
 pub fn foo(s: Option<String>) -> i32 {
     match s {
         Some("a") => 1234,
diff --git a/tests/mir-opt/building/while_storage.rs b/tests/mir-opt/building/while_storage.rs
index cd226eb0c1e2..c193cfe39499 100644
--- a/tests/mir-opt/building/while_storage.rs
+++ b/tests/mir-opt/building/while_storage.rs
@@ -7,7 +7,7 @@ fn get_bool(c: bool) -> bool {
     c
 }
 
-// EMIT_MIR while_storage.while_loop.PreCodegen.after.mir
+// EMIT_MIR while_storage.while_loop.runtime-optimized.after.mir
 fn while_loop(c: bool) {
     // CHECK-LABEL: fn while_loop(
     // CHECK: bb0: {
diff --git a/tests/mir-opt/building/while_storage.while_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/building/while_storage.while_loop.runtime-optimized.after.panic-abort.mir
similarity index 96%
rename from tests/mir-opt/building/while_storage.while_loop.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/building/while_storage.while_loop.runtime-optimized.after.panic-abort.mir
index 44a8b7342b2e..458261f1fb97 100644
--- a/tests/mir-opt/building/while_storage.while_loop.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/building/while_storage.while_loop.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `while_loop` after PreCodegen
+// MIR for `while_loop` after runtime-optimized
 
 fn while_loop(_1: bool) -> () {
     debug c => _1;
diff --git a/tests/mir-opt/building/while_storage.while_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/building/while_storage.while_loop.runtime-optimized.after.panic-unwind.mir
similarity index 96%
rename from tests/mir-opt/building/while_storage.while_loop.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/building/while_storage.while_loop.runtime-optimized.after.panic-unwind.mir
index 9a6403006744..d1703f23f3a1 100644
--- a/tests/mir-opt/building/while_storage.while_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/building/while_storage.while_loop.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `while_loop` after PreCodegen
+// MIR for `while_loop` after runtime-optimized
 
 fn while_loop(_1: bool) -> () {
     debug c => _1;
diff --git a/tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.panic-unwind.mir b/tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-abort.mir
similarity index 63%
rename from tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.panic-unwind.mir
rename to tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-abort.mir
index 2b90410f95d9..86eda4942a7c 100644
--- a/tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.panic-unwind.mir
+++ b/tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `hello` before PreCodegen
+// MIR for `hello` after runtime-optimized
 
 fn hello() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.panic-abort.mir b/tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-unwind.mir
similarity index 63%
rename from tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.panic-abort.mir
rename to tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-unwind.mir
index 2b90410f95d9..86eda4942a7c 100644
--- a/tests/mir-opt/const_prop/control_flow_simplification.hello.PreCodegen.before.panic-abort.mir
+++ b/tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `hello` before PreCodegen
+// MIR for `hello` after runtime-optimized
 
 fn hello() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/const_prop/control_flow_simplification.rs b/tests/mir-opt/const_prop/control_flow_simplification.rs
index 8ec630d6f48d..640579a3ebec 100644
--- a/tests/mir-opt/const_prop/control_flow_simplification.rs
+++ b/tests/mir-opt/const_prop/control_flow_simplification.rs
@@ -9,7 +9,7 @@ trait NeedsDrop: Sized {
 impl<This> NeedsDrop for This {}
 
 // EMIT_MIR control_flow_simplification.hello.GVN.diff
-// EMIT_MIR control_flow_simplification.hello.PreCodegen.before.mir
+// EMIT_MIR control_flow_simplification.hello.runtime-optimized.after.mir
 fn hello<T>() {
     // CHECK-LABEL: fn hello(
     // CHECK: bb0:
diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir b/tests/mir-opt/const_prop/return_place.add.runtime-optimized.after.panic-abort.mir
similarity index 89%
rename from tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir
rename to tests/mir-opt/const_prop/return_place.add.runtime-optimized.after.panic-abort.mir
index 66fd61cc3aee..6d429a50ce58 100644
--- a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir
+++ b/tests/mir-opt/const_prop/return_place.add.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `add` before PreCodegen
+// MIR for `add` after runtime-optimized
 
 fn add() -> u32 {
     let mut _0: u32;
diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir b/tests/mir-opt/const_prop/return_place.add.runtime-optimized.after.panic-unwind.mir
similarity index 89%
rename from tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir
rename to tests/mir-opt/const_prop/return_place.add.runtime-optimized.after.panic-unwind.mir
index f9b07a59de9c..8e5b3c667639 100644
--- a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir
+++ b/tests/mir-opt/const_prop/return_place.add.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `add` before PreCodegen
+// MIR for `add` after runtime-optimized
 
 fn add() -> u32 {
     let mut _0: u32;
diff --git a/tests/mir-opt/const_prop/return_place.rs b/tests/mir-opt/const_prop/return_place.rs
index c5293aa73e55..6459e526f1ac 100644
--- a/tests/mir-opt/const_prop/return_place.rs
+++ b/tests/mir-opt/const_prop/return_place.rs
@@ -3,7 +3,7 @@
 //@ compile-flags: -C overflow-checks=on -Zdump-mir-exclude-alloc-bytes
 
 // EMIT_MIR return_place.add.GVN.diff
-// EMIT_MIR return_place.add.PreCodegen.before.mir
+// EMIT_MIR return_place.add.runtime-optimized.after.mir
 fn add() -> u32 {
     // CHECK-LABEL: fn add(
     // CHECK: _0 = const 4_u32;
diff --git a/tests/mir-opt/inline/rustc_no_mir_inline.caller.PreCodegen.after.panic-abort.mir b/tests/mir-opt/inline/rustc_no_mir_inline.caller.runtime-optimized.after.panic-abort.mir
similarity index 79%
rename from tests/mir-opt/inline/rustc_no_mir_inline.caller.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/inline/rustc_no_mir_inline.caller.runtime-optimized.after.panic-abort.mir
index d0772e51a07f..f6a6e86bff26 100644
--- a/tests/mir-opt/inline/rustc_no_mir_inline.caller.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/inline/rustc_no_mir_inline.caller.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `caller` after PreCodegen
+// MIR for `caller` after runtime-optimized
 
 fn caller() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/inline/rustc_no_mir_inline.caller.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/inline/rustc_no_mir_inline.caller.runtime-optimized.after.panic-unwind.mir
similarity index 79%
rename from tests/mir-opt/inline/rustc_no_mir_inline.caller.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/inline/rustc_no_mir_inline.caller.runtime-optimized.after.panic-unwind.mir
index 39ad4f1010b7..c8703ce51598 100644
--- a/tests/mir-opt/inline/rustc_no_mir_inline.caller.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/inline/rustc_no_mir_inline.caller.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `caller` after PreCodegen
+// MIR for `caller` after runtime-optimized
 
 fn caller() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/inline/rustc_no_mir_inline.rs b/tests/mir-opt/inline/rustc_no_mir_inline.rs
index b008df32726b..9ce4e5f0b67e 100644
--- a/tests/mir-opt/inline/rustc_no_mir_inline.rs
+++ b/tests/mir-opt/inline/rustc_no_mir_inline.rs
@@ -9,7 +9,7 @@
 pub fn callee() {}
 
 // EMIT_MIR rustc_no_mir_inline.caller.Inline.diff
-// EMIT_MIR rustc_no_mir_inline.caller.PreCodegen.after.mir
+// EMIT_MIR rustc_no_mir_inline.caller.runtime-optimized.after.mir
 pub fn caller() {
     // CHECK-LABEL: fn caller(
     // CHECK: callee()
diff --git a/tests/mir-opt/inline/unchecked_shifts.rs b/tests/mir-opt/inline/unchecked_shifts.rs
index a20b13dc1149..167b4beecdfb 100644
--- a/tests/mir-opt/inline/unchecked_shifts.rs
+++ b/tests/mir-opt/inline/unchecked_shifts.rs
@@ -7,7 +7,7 @@
 // After MCP#693, though, that's the backend's problem, not something in MIR.
 
 // EMIT_MIR unchecked_shifts.unchecked_shl_unsigned_smaller.Inline.diff
-// EMIT_MIR unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.mir
+// EMIT_MIR unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.mir
 pub unsafe fn unchecked_shl_unsigned_smaller(a: u16, b: u32) -> u16 {
     // CHECK-LABEL: fn unchecked_shl_unsigned_smaller(
     // CHECK: (inlined #[track_caller] core::num::<impl u16>::unchecked_shl)
@@ -15,7 +15,7 @@ pub unsafe fn unchecked_shl_unsigned_smaller(a: u16, b: u32) -> u16 {
 }
 
 // EMIT_MIR unchecked_shifts.unchecked_shr_signed_bigger.Inline.diff
-// EMIT_MIR unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.mir
+// EMIT_MIR unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.mir
 pub unsafe fn unchecked_shr_signed_bigger(a: i64, b: u32) -> i64 {
     // CHECK-LABEL: fn unchecked_shr_signed_bigger(
     // CHECK: (inlined #[track_caller] core::num::<impl i64>::unchecked_shr)
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-abort.mir b/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-abort.mir
similarity index 86%
rename from tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-abort.mir
index 0fc7c4b7947e..d185a4365f90 100644
--- a/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `unchecked_shl_unsigned_smaller` after PreCodegen
+// MIR for `unchecked_shl_unsigned_smaller` after runtime-optimized
 
 fn unchecked_shl_unsigned_smaller(_1: u16, _2: u32) -> u16 {
     debug a => _1;
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-unwind.mir
similarity index 86%
rename from tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-unwind.mir
index 0fc7c4b7947e..d185a4365f90 100644
--- a/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `unchecked_shl_unsigned_smaller` after PreCodegen
+// MIR for `unchecked_shl_unsigned_smaller` after runtime-optimized
 
 fn unchecked_shl_unsigned_smaller(_1: u16, _2: u32) -> u16 {
     debug a => _1;
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-abort.mir b/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-abort.mir
similarity index 87%
rename from tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-abort.mir
index bef7fa7b1df7..cb51c0e6bcef 100644
--- a/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `unchecked_shr_signed_bigger` after PreCodegen
+// MIR for `unchecked_shr_signed_bigger` after runtime-optimized
 
 fn unchecked_shr_signed_bigger(_1: i64, _2: u32) -> i64 {
     debug a => _1;
diff --git a/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-unwind.mir
similarity index 87%
rename from tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-unwind.mir
index bef7fa7b1df7..cb51c0e6bcef 100644
--- a/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/inline/unchecked_shifts.unchecked_shr_signed_bigger.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `unchecked_shr_signed_bigger` after PreCodegen
+// MIR for `unchecked_shr_signed_bigger` after runtime-optimized
 
 fn unchecked_shr_signed_bigger(_1: i64, _2: u32) -> i64 {
     debug a => _1;
diff --git a/tests/mir-opt/inline/unwrap_unchecked.rs b/tests/mir-opt/inline/unwrap_unchecked.rs
index 13c76c5bb53e..f5e48a71ae19 100644
--- a/tests/mir-opt/inline/unwrap_unchecked.rs
+++ b/tests/mir-opt/inline/unwrap_unchecked.rs
@@ -4,7 +4,7 @@
 //@ compile-flags: -Zmir-opt-level=2 -Zinline-mir
 
 // EMIT_MIR unwrap_unchecked.unwrap_unchecked.Inline.diff
-// EMIT_MIR unwrap_unchecked.unwrap_unchecked.PreCodegen.after.mir
+// EMIT_MIR unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.mir
 pub unsafe fn unwrap_unchecked<T>(slf: Option<T>) -> T {
     // CHECK-LABEL: fn unwrap_unchecked(
     // CHECK: (inlined #[track_caller] Option::<T>::unwrap_unchecked)
diff --git a/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-abort.mir b/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-abort.mir
similarity index 92%
rename from tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-abort.mir
index e0fcd5c92247..32694fdc9f40 100644
--- a/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `unwrap_unchecked` after PreCodegen
+// MIR for `unwrap_unchecked` after runtime-optimized
 
 fn unwrap_unchecked(_1: Option<T>) -> T {
     debug slf => _1;
diff --git a/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-unwind.mir
similarity index 92%
rename from tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-unwind.mir
index e0fcd5c92247..32694fdc9f40 100644
--- a/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/inline/unwrap_unchecked.unwrap_unchecked.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `unwrap_unchecked` after PreCodegen
+// MIR for `unwrap_unchecked` after runtime-optimized
 
 fn unwrap_unchecked(_1: Option<T>) -> T {
     debug slf => _1;
diff --git a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.64bit.panic-abort.mir b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-abort.mir
similarity index 96%
rename from tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.64bit.panic-abort.mir
rename to tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-abort.mir
index f3c83f62edf6..14aac21eabdd 100644
--- a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.64bit.panic-abort.mir
+++ b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `num_to_digit` after PreCodegen
+// MIR for `num_to_digit` after runtime-optimized
 
 fn num_to_digit(_1: char) -> u32 {
     debug num => _1;
diff --git a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.32bit.panic-unwind.mir b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-unwind.mir
similarity index 96%
rename from tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.32bit.panic-unwind.mir
rename to tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-unwind.mir
index 0e55df24cc57..1a4ddd037023 100644
--- a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.32bit.panic-unwind.mir
+++ b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `num_to_digit` after PreCodegen
+// MIR for `num_to_digit` after runtime-optimized
 
 fn num_to_digit(_1: char) -> u32 {
     debug num => _1;
diff --git a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.32bit.panic-abort.mir b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-abort.mir
similarity index 96%
rename from tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.32bit.panic-abort.mir
rename to tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-abort.mir
index f3c83f62edf6..14aac21eabdd 100644
--- a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.32bit.panic-abort.mir
+++ b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `num_to_digit` after PreCodegen
+// MIR for `num_to_digit` after runtime-optimized
 
 fn num_to_digit(_1: char) -> u32 {
     debug num => _1;
diff --git a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.64bit.panic-unwind.mir b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-unwind.mir
similarity index 96%
rename from tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.64bit.panic-unwind.mir
rename to tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-unwind.mir
index 0e55df24cc57..1a4ddd037023 100644
--- a/tests/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.64bit.panic-unwind.mir
+++ b/tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `num_to_digit` after PreCodegen
+// MIR for `num_to_digit` after runtime-optimized
 
 fn num_to_digit(_1: char) -> u32 {
     debug num => _1;
diff --git a/tests/mir-opt/issues/issue_59352.rs b/tests/mir-opt/issues/issue_59352.rs
index 516a712f1db1..4af37bda62f8 100644
--- a/tests/mir-opt/issues/issue_59352.rs
+++ b/tests/mir-opt/issues/issue_59352.rs
@@ -9,7 +9,7 @@
 // Once the optimizer can do that, this test case will need to be updated and codegen/issue-59352.rs
 // removed.
 
-// EMIT_MIR issue_59352.num_to_digit.PreCodegen.after.mir
+// EMIT_MIR issue_59352.num_to_digit.runtime-optimized.after.mir
 //@ compile-flags: -Z mir-opt-level=3 -Z span_free_formats
 
 pub fn num_to_digit(num: char) -> u32 {
diff --git a/tests/mir-opt/pattern_types.main.PreCodegen.after.mir b/tests/mir-opt/pattern_types.main.runtime-optimized.after.mir
similarity index 84%
rename from tests/mir-opt/pattern_types.main.PreCodegen.after.mir
rename to tests/mir-opt/pattern_types.main.runtime-optimized.after.mir
index cc01f51973c8..7477ff32d554 100644
--- a/tests/mir-opt/pattern_types.main.PreCodegen.after.mir
+++ b/tests/mir-opt/pattern_types.main.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `main` after PreCodegen
+// MIR for `main` after runtime-optimized
 
 fn main() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/pattern_types.rs b/tests/mir-opt/pattern_types.rs
index d5847b95f732..2bb5909e6ab4 100644
--- a/tests/mir-opt/pattern_types.rs
+++ b/tests/mir-opt/pattern_types.rs
@@ -3,7 +3,7 @@
 
 use std::pat::pattern_type;
 
-// EMIT_MIR pattern_types.main.PreCodegen.after.mir
+// EMIT_MIR pattern_types.main.runtime-optimized.after.mir
 fn main() {
     // CHECK: debug x => const 2_u32 is 1..
     let x: pattern_type!(u32 is 1..) = unsafe { std::mem::transmute(2) };
diff --git a/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.runtime-optimized.after.panic-abort.mir
similarity index 92%
rename from tests/mir-opt/pre-codegen/array_eq.eq_ipv4.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/array_eq.eq_ipv4.runtime-optimized.after.panic-abort.mir
index 258be57f67c9..d48e1b603664 100644
--- a/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `eq_ipv4` after PreCodegen
+// MIR for `eq_ipv4` after runtime-optimized
 
 fn eq_ipv4(_1: &[u8; 4], _2: &[u8; 4]) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.runtime-optimized.after.panic-unwind.mir
similarity index 92%
rename from tests/mir-opt/pre-codegen/array_eq.eq_ipv4.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/array_eq.eq_ipv4.runtime-optimized.after.panic-unwind.mir
index 258be57f67c9..d48e1b603664 100644
--- a/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/array_eq.eq_ipv4.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `eq_ipv4` after PreCodegen
+// MIR for `eq_ipv4` after runtime-optimized
 
 fn eq_ipv4(_1: &[u8; 4], _2: &[u8; 4]) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.runtime-optimized.after.panic-abort.mir
similarity index 92%
rename from tests/mir-opt/pre-codegen/array_eq.eq_ipv6.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/array_eq.eq_ipv6.runtime-optimized.after.panic-abort.mir
index e36781345083..c76008171a2a 100644
--- a/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `eq_ipv6` after PreCodegen
+// MIR for `eq_ipv6` after runtime-optimized
 
 fn eq_ipv6(_1: &[u16; 8], _2: &[u16; 8]) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.runtime-optimized.after.panic-unwind.mir
similarity index 92%
rename from tests/mir-opt/pre-codegen/array_eq.eq_ipv6.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/array_eq.eq_ipv6.runtime-optimized.after.panic-unwind.mir
index e36781345083..c76008171a2a 100644
--- a/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/array_eq.eq_ipv6.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `eq_ipv6` after PreCodegen
+// MIR for `eq_ipv6` after runtime-optimized
 
 fn eq_ipv6(_1: &[u16; 8], _2: &[u16; 8]) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.runtime-optimized.after.panic-abort.mir
similarity index 91%
rename from tests/mir-opt/pre-codegen/array_eq.eq_odd_length.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/array_eq.eq_odd_length.runtime-optimized.after.panic-abort.mir
index 06d7f222df14..03ea7411284b 100644
--- a/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `eq_odd_length` after PreCodegen
+// MIR for `eq_odd_length` after runtime-optimized
 
 fn eq_odd_length(_1: &[u8; 3], _2: &[u8; 3]) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.runtime-optimized.after.panic-unwind.mir
similarity index 91%
rename from tests/mir-opt/pre-codegen/array_eq.eq_odd_length.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/array_eq.eq_odd_length.runtime-optimized.after.panic-unwind.mir
index 06d7f222df14..03ea7411284b 100644
--- a/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/array_eq.eq_odd_length.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `eq_odd_length` after PreCodegen
+// MIR for `eq_odd_length` after runtime-optimized
 
 fn eq_odd_length(_1: &[u8; 3], _2: &[u8; 3]) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/array_eq.rs b/tests/mir-opt/pre-codegen/array_eq.rs
index 0bfe34eb3761..ee60b4d9a7ab 100644
--- a/tests/mir-opt/pre-codegen/array_eq.rs
+++ b/tests/mir-opt/pre-codegen/array_eq.rs
@@ -3,14 +3,14 @@
 
 #![crate_type = "lib"]
 
-// EMIT_MIR array_eq.eq_odd_length.PreCodegen.after.mir
+// EMIT_MIR array_eq.eq_odd_length.runtime-optimized.after.mir
 pub unsafe fn eq_odd_length<T: Copy>(a: &[u8; 3], b: &[u8; 3]) -> bool {
     // CHECK-LABEL: fn eq_odd_length(_1: &[u8; 3], _2: &[u8; 3]) -> bool
     // CHECK: _0 = raw_eq::<[u8; 3]>(move _1, move _2)
     a == b
 }
 
-// EMIT_MIR array_eq.eq_ipv4.PreCodegen.after.mir
+// EMIT_MIR array_eq.eq_ipv4.runtime-optimized.after.mir
 pub unsafe fn eq_ipv4<T: Copy>(a: &[u8; 4], b: &[u8; 4]) -> bool {
     // CHECK-LABEL: fn eq_ipv4(_1: &[u8; 4], _2: &[u8; 4]) -> bool
     // CHECK: [[A:_.+]] = copy (*_1) as u32 (Transmute);
@@ -19,7 +19,7 @@
     a == b
 }
 
-// EMIT_MIR array_eq.eq_ipv6.PreCodegen.after.mir
+// EMIT_MIR array_eq.eq_ipv6.runtime-optimized.after.mir
 pub unsafe fn eq_ipv6<T: Copy>(a: &[u16; 8], b: &[u16; 8]) -> bool {
     // CHECK-LABEL: fn eq_ipv6(_1: &[u16; 8], _2: &[u16; 8]) -> bool
     // CHECK: [[A:_.+]] = copy (*_1) as u128 (Transmute);
diff --git a/tests/mir-opt/pre-codegen/chained_comparison.bitand.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/chained_comparison.bitand.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/chained_comparison.bitand.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/chained_comparison.bitand.runtime-optimized.after.mir
index 9b77bdb7cf61..8cc922d453d2 100644
--- a/tests/mir-opt/pre-codegen/chained_comparison.bitand.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/chained_comparison.bitand.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `bitand` after PreCodegen
+// MIR for `bitand` after runtime-optimized
 
 fn bitand(_1: &Blueprint, _2: &Blueprint) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/chained_comparison.naive.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/chained_comparison.naive.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/chained_comparison.naive.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/chained_comparison.naive.runtime-optimized.after.mir
index 9b3e28ab5b8e..1312b1b4e972 100644
--- a/tests/mir-opt/pre-codegen/chained_comparison.naive.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/chained_comparison.naive.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `naive` after PreCodegen
+// MIR for `naive` after runtime-optimized
 
 fn naive(_1: &Blueprint, _2: &Blueprint) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/chained_comparison.returning.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/chained_comparison.returning.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/chained_comparison.returning.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/chained_comparison.returning.runtime-optimized.after.mir
index 72d52701d112..36d15af8b29b 100644
--- a/tests/mir-opt/pre-codegen/chained_comparison.returning.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/chained_comparison.returning.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `returning` after PreCodegen
+// MIR for `returning` after runtime-optimized
 
 fn returning(_1: &Blueprint, _2: &Blueprint) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/chained_comparison.rs b/tests/mir-opt/pre-codegen/chained_comparison.rs
index 8c359bda143a..d0ad5d3cf943 100644
--- a/tests/mir-opt/pre-codegen/chained_comparison.rs
+++ b/tests/mir-opt/pre-codegen/chained_comparison.rs
@@ -46,6 +46,6 @@ pub fn returning(a: &Blueprint, b: &Blueprint) -> bool {
     true
 }
 
-// EMIT_MIR chained_comparison.naive.PreCodegen.after.mir
-// EMIT_MIR chained_comparison.bitand.PreCodegen.after.mir
-// EMIT_MIR chained_comparison.returning.PreCodegen.after.mir
+// EMIT_MIR chained_comparison.naive.runtime-optimized.after.mir
+// EMIT_MIR chained_comparison.bitand.runtime-optimized.after.mir
+// EMIT_MIR chained_comparison.returning.runtime-optimized.after.mir
diff --git a/tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/checked_ops.checked_shl.runtime-optimized.after.panic-abort.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/checked_ops.checked_shl.runtime-optimized.after.panic-abort.mir
index c97c9b45d6ad..9a7a230fdb48 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.checked_shl.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `checked_shl` after PreCodegen
+// MIR for `checked_shl` after runtime-optimized
 
 fn checked_shl(_1: u32, _2: u32) -> Option<u32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/checked_ops.checked_shl.runtime-optimized.after.panic-unwind.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/checked_ops.checked_shl.runtime-optimized.after.panic-unwind.mir
index c97c9b45d6ad..9a7a230fdb48 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.checked_shl.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.checked_shl.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `checked_shl` after PreCodegen
+// MIR for `checked_shl` after runtime-optimized
 
 fn checked_shl(_1: u32, _2: u32) -> Option<u32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/checked_ops.rs b/tests/mir-opt/pre-codegen/checked_ops.rs
index dfbc0f4a1108..690b35430c74 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.rs
+++ b/tests/mir-opt/pre-codegen/checked_ops.rs
@@ -4,7 +4,7 @@
 #![crate_type = "lib"]
 #![feature(step_trait)]
 
-// EMIT_MIR checked_ops.step_forward.PreCodegen.after.mir
+// EMIT_MIR checked_ops.step_forward.runtime-optimized.after.mir
 pub fn step_forward(x: u16, n: usize) -> u16 {
     // This uses `u16` so that the conversion to usize is always widening.
 
@@ -13,7 +13,7 @@ pub fn step_forward(x: u16, n: usize) -> u16 {
     std::iter::Step::forward(x, n)
 }
 
-// EMIT_MIR checked_ops.checked_shl.PreCodegen.after.mir
+// EMIT_MIR checked_ops.checked_shl.runtime-optimized.after.mir
 pub fn checked_shl(x: u32, rhs: u32) -> Option<u32> {
     // CHECK-LABEL: fn checked_shl
     // CHECK: [[TEMP:_[0-9]+]] = ShlUnchecked(copy _1, copy _2)
@@ -21,7 +21,7 @@ pub fn checked_shl(x: u32, rhs: u32) -> Option<u32> {
     x.checked_shl(rhs)
 }
 
-// EMIT_MIR checked_ops.use_checked_sub.PreCodegen.after.mir
+// EMIT_MIR checked_ops.use_checked_sub.runtime-optimized.after.mir
 pub fn use_checked_sub(x: u32, rhs: u32) {
     // We want this to be equivalent to open-coding it, leaving no `Option`s around.
     // FIXME(#138544): It's not yet.
@@ -37,7 +37,7 @@ pub fn use_checked_sub(x: u32, rhs: u32) {
     }
 }
 
-// EMIT_MIR checked_ops.saturating_sub_at_home.PreCodegen.after.mir
+// EMIT_MIR checked_ops.saturating_sub_at_home.runtime-optimized.after.mir
 pub fn saturating_sub_at_home(lhs: u32, rhs: u32) -> u32 {
     // FIXME(#138544): Similarly here, the `Option` ought to optimize away
 
diff --git a/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-abort.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-abort.mir
index dc7567b57e70..1ffe006d2887 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `saturating_sub_at_home` after PreCodegen
+// MIR for `saturating_sub_at_home` after runtime-optimized
 
 fn saturating_sub_at_home(_1: u32, _2: u32) -> u32 {
     debug lhs => _1;
diff --git a/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-unwind.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-unwind.mir
index dc7567b57e70..1ffe006d2887 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.saturating_sub_at_home.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `saturating_sub_at_home` after PreCodegen
+// MIR for `saturating_sub_at_home` after runtime-optimized
 
 fn saturating_sub_at_home(_1: u32, _2: u32) -> u32 {
     debug lhs => _1;
diff --git a/tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/checked_ops.step_forward.runtime-optimized.after.panic-abort.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/checked_ops.step_forward.runtime-optimized.after.panic-abort.mir
index 7b681946bee1..073baaa75be9 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.step_forward.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `step_forward` after PreCodegen
+// MIR for `step_forward` after runtime-optimized
 
 fn step_forward(_1: u16, _2: usize) -> u16 {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/checked_ops.step_forward.runtime-optimized.after.panic-unwind.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/checked_ops.step_forward.runtime-optimized.after.panic-unwind.mir
index a0137b23ec4f..9ada3691f3a2 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.step_forward.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.step_forward.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `step_forward` after PreCodegen
+// MIR for `step_forward` after runtime-optimized
 
 fn step_forward(_1: u16, _2: usize) -> u16 {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.runtime-optimized.after.panic-abort.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.runtime-optimized.after.panic-abort.mir
index 426c114dfc2a..f24a8e41b7db 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `use_checked_sub` after PreCodegen
+// MIR for `use_checked_sub` after runtime-optimized
 
 fn use_checked_sub(_1: u32, _2: u32) -> () {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.runtime-optimized.after.panic-unwind.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.runtime-optimized.after.panic-unwind.mir
index f73c64a9b092..6bcb730be7f1 100644
--- a/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/checked_ops.use_checked_sub.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `use_checked_sub` after PreCodegen
+// MIR for `use_checked_sub` after runtime-optimized
 
 fn use_checked_sub(_1: u32, _2: u32) -> () {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/clone_as_copy.clone_as_copy.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/clone_as_copy.clone_as_copy.runtime-optimized.after.mir
similarity index 88%
rename from tests/mir-opt/pre-codegen/clone_as_copy.clone_as_copy.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/clone_as_copy.clone_as_copy.runtime-optimized.after.mir
index 1e6e2ee1b8b7..18069a37ed90 100644
--- a/tests/mir-opt/pre-codegen/clone_as_copy.clone_as_copy.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/clone_as_copy.clone_as_copy.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `clone_as_copy` after PreCodegen
+// MIR for `clone_as_copy` after runtime-optimized
 
 fn clone_as_copy(_1: &NestCopy) -> NestCopy {
     debug v => _1;
diff --git a/tests/mir-opt/pre-codegen/clone_as_copy.enum_clone_as_copy.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/clone_as_copy.enum_clone_as_copy.runtime-optimized.after.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/clone_as_copy.enum_clone_as_copy.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/clone_as_copy.enum_clone_as_copy.runtime-optimized.after.mir
index 76bb49bc9c1b..ef907c83c10e 100644
--- a/tests/mir-opt/pre-codegen/clone_as_copy.enum_clone_as_copy.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/clone_as_copy.enum_clone_as_copy.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `enum_clone_as_copy` after PreCodegen
+// MIR for `enum_clone_as_copy` after runtime-optimized
 
 fn enum_clone_as_copy(_1: &Enum1) -> Enum1 {
     debug v => _1;
diff --git a/tests/mir-opt/pre-codegen/clone_as_copy.rs b/tests/mir-opt/pre-codegen/clone_as_copy.rs
index 00f24754d591..3c8d07c89c8a 100644
--- a/tests/mir-opt/pre-codegen/clone_as_copy.rs
+++ b/tests/mir-opt/pre-codegen/clone_as_copy.rs
@@ -22,7 +22,7 @@ enum Enum1 {
     B(NestCopy),
 }
 
-// EMIT_MIR clone_as_copy.clone_as_copy.PreCodegen.after.mir
+// EMIT_MIR clone_as_copy.clone_as_copy.runtime-optimized.after.mir
 fn clone_as_copy(v: &NestCopy) -> NestCopy {
     // CHECK-LABEL: fn clone_as_copy(
     // CHECK: let [[DEAD_VAR:_.*]]: &AllCopy;
@@ -33,7 +33,7 @@ fn clone_as_copy(v: &NestCopy) -> NestCopy {
     v.clone()
 }
 
-// EMIT_MIR clone_as_copy.enum_clone_as_copy.PreCodegen.after.mir
+// EMIT_MIR clone_as_copy.enum_clone_as_copy.runtime-optimized.after.mir
 fn enum_clone_as_copy(v: &Enum1) -> Enum1 {
     // CHECK-LABEL: fn enum_clone_as_copy(
     // CHECK: bb0: {
diff --git a/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.direct.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.direct.runtime-optimized.after.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.direct.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.direct.runtime-optimized.after.mir
index 66b51ad48e7a..b1bbceae330c 100644
--- a/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.direct.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.direct.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `direct` after PreCodegen
+// MIR for `direct` after runtime-optimized
 
 fn direct(_1: Option<std::cmp::Ordering>) -> bool {
     debug e => _1;
diff --git a/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.rs b/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.rs
index 3c1e96fa4748..0d8113e8b86f 100644
--- a/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.rs
+++ b/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.rs
@@ -10,7 +10,7 @@
 
 use std::cmp::Ordering;
 
-// EMIT_MIR const_promotion_option_ordering_eq.direct.PreCodegen.after.mir
+// EMIT_MIR const_promotion_option_ordering_eq.direct.runtime-optimized.after.mir
 pub fn direct(e: Option<Ordering>) -> bool {
     // CHECK-LABEL: fn direct(
     // CHECK-NOT: promoted[
@@ -19,7 +19,7 @@ pub fn direct(e: Option<Ordering>) -> bool {
     e == Some(Ordering::Equal)
 }
 
-// EMIT_MIR const_promotion_option_ordering_eq.with_let.PreCodegen.after.mir
+// EMIT_MIR const_promotion_option_ordering_eq.with_let.runtime-optimized.after.mir
 pub fn with_let(e: Option<Ordering>) -> bool {
     // CHECK-LABEL: fn with_let(
     // CHECK-NOT: promoted[
diff --git a/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.with_let.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.with_let.runtime-optimized.after.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.with_let.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.with_let.runtime-optimized.after.mir
index f089e9ad960b..86ef69b9a4cd 100644
--- a/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.with_let.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/const_promotion_option_ordering_eq.with_let.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `with_let` after PreCodegen
+// MIR for `with_let` after runtime-optimized
 
 fn with_let(_1: Option<std::cmp::Ordering>) -> bool {
     debug e => _1;
diff --git a/tests/mir-opt/pre-codegen/dead_on_invalid_place.invalid_place.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/dead_on_invalid_place.invalid_place.runtime-optimized.after.mir
similarity index 78%
rename from tests/mir-opt/pre-codegen/dead_on_invalid_place.invalid_place.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/dead_on_invalid_place.invalid_place.runtime-optimized.after.mir
index 4a2127178fb0..655305851b7e 100644
--- a/tests/mir-opt/pre-codegen/dead_on_invalid_place.invalid_place.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/dead_on_invalid_place.invalid_place.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `invalid_place` after PreCodegen
+// MIR for `invalid_place` after runtime-optimized
 
 fn invalid_place(_1: bool) -> bool {
     debug c1_ref => _2;
diff --git a/tests/mir-opt/pre-codegen/dead_on_invalid_place.rs b/tests/mir-opt/pre-codegen/dead_on_invalid_place.rs
index 5abe9fa43a5d..30b6480391f5 100644
--- a/tests/mir-opt/pre-codegen/dead_on_invalid_place.rs
+++ b/tests/mir-opt/pre-codegen/dead_on_invalid_place.rs
@@ -3,7 +3,7 @@
 
 use std::intrinsics::mir::*;
 
-// EMIT_MIR dead_on_invalid_place.invalid_place.PreCodegen.after.mir
+// EMIT_MIR dead_on_invalid_place.invalid_place.runtime-optimized.after.mir
 #[custom_mir(dialect = "runtime")]
 pub fn invalid_place(c: bool) -> bool {
     // CHECK-LABEL: fn invalid_place
diff --git a/tests/mir-opt/pre-codegen/deref_nested_borrows.rs b/tests/mir-opt/pre-codegen/deref_nested_borrows.rs
index 17a873a1c05e..a07f299fa29d 100644
--- a/tests/mir-opt/pre-codegen/deref_nested_borrows.rs
+++ b/tests/mir-opt/pre-codegen/deref_nested_borrows.rs
@@ -29,4 +29,4 @@ fn main() {
 }
 
 // EMIT_MIR deref_nested_borrows.src.GVN.diff
-// EMIT_MIR deref_nested_borrows.src.PreCodegen.after.mir
+// EMIT_MIR deref_nested_borrows.src.runtime-optimized.after.mir
diff --git a/tests/mir-opt/pre-codegen/deref_nested_borrows.src.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/deref_nested_borrows.src.runtime-optimized.after.panic-abort.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/deref_nested_borrows.src.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/deref_nested_borrows.src.runtime-optimized.after.panic-abort.mir
index 01eb41401da0..1385663e271d 100644
--- a/tests/mir-opt/pre-codegen/deref_nested_borrows.src.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/deref_nested_borrows.src.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `src` after PreCodegen
+// MIR for `src` after runtime-optimized
 
 fn src(_1: &&u8) -> bool {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/deref_nested_borrows.src.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/deref_nested_borrows.src.runtime-optimized.after.panic-unwind.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/deref_nested_borrows.src.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/deref_nested_borrows.src.runtime-optimized.after.panic-unwind.mir
index fb16da720be4..ef192696afdb 100644
--- a/tests/mir-opt/pre-codegen/deref_nested_borrows.src.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/deref_nested_borrows.src.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `src` after PreCodegen
+// MIR for `src` after runtime-optimized
 
 fn src(_1: &&u8) -> bool {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/derived_ord.demo_le.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/derived_ord.demo_le.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/derived_ord.demo_le.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/derived_ord.demo_le.runtime-optimized.after.mir
index 257b43050c3c..928c987b3476 100644
--- a/tests/mir-opt/pre-codegen/derived_ord.demo_le.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/derived_ord.demo_le.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `demo_le` after PreCodegen
+// MIR for `demo_le` after runtime-optimized
 
 fn demo_le(_1: &MultiField, _2: &MultiField) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/derived_ord.rs b/tests/mir-opt/pre-codegen/derived_ord.rs
index a67756c22d46..ee625603bcd9 100644
--- a/tests/mir-opt/pre-codegen/derived_ord.rs
+++ b/tests/mir-opt/pre-codegen/derived_ord.rs
@@ -33,5 +33,5 @@ pub fn demo_le(a: &MultiField, b: &MultiField) -> bool {
     *a <= *b
 }
 
-// EMIT_MIR derived_ord.{impl#0}-partial_cmp.PreCodegen.after.mir
-// EMIT_MIR derived_ord.demo_le.PreCodegen.after.mir
+// EMIT_MIR derived_ord.{impl#0}-partial_cmp.runtime-optimized.after.mir
+// EMIT_MIR derived_ord.demo_le.runtime-optimized.after.mir
diff --git a/tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.runtime-optimized.after.mir
index 5993bd79d274..e629576e52b5 100644
--- a/tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `<impl at $DIR/derived_ord.rs:5:10: 5:20>::partial_cmp` after PreCodegen
+// MIR for `<impl at $DIR/derived_ord.rs:5:10: 5:20>::partial_cmp` after runtime-optimized
 
 fn <impl at $DIR/derived_ord.rs:5:10: 5:20>::partial_cmp(_1: &MultiField, _2: &MultiField) -> Option<std::cmp::Ordering> {
     debug self => _1;
diff --git a/tests/mir-opt/pre-codegen/derived_ord_debug.rs b/tests/mir-opt/pre-codegen/derived_ord_debug.rs
index 1d6a884cee44..82851509d666 100644
--- a/tests/mir-opt/pre-codegen/derived_ord_debug.rs
+++ b/tests/mir-opt/pre-codegen/derived_ord_debug.rs
@@ -6,8 +6,8 @@
 #[derive(PartialOrd, Ord, PartialEq, Eq)]
 pub struct MultiField(char, i16);
 
-// EMIT_MIR derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.mir
-// EMIT_MIR derived_ord_debug.{impl#1}-cmp.PreCodegen.after.mir
+// EMIT_MIR derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.mir
+// EMIT_MIR derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.mir
 
 // CHECK-LABEL: partial_cmp(_1: &MultiField, _2: &MultiField) -> Option<std::cmp::Ordering>
 // CHECK: = <char as PartialOrd>::partial_cmp(
diff --git a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-abort.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-abort.mir
index 9fc8da3a1120..85f7e76eea8c 100644
--- a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `<impl at $DIR/derived_ord_debug.rs:6:10: 6:20>::partial_cmp` after PreCodegen
+// MIR for `<impl at $DIR/derived_ord_debug.rs:6:10: 6:20>::partial_cmp` after runtime-optimized
 
 fn <impl at $DIR/derived_ord_debug.rs:6:10: 6:20>::partial_cmp(_1: &MultiField, _2: &MultiField) -> Option<std::cmp::Ordering> {
     debug self => _1;
diff --git a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-unwind.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-unwind.mir
index 29cc54150764..cca704662dd7 100644
--- a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#0}-partial_cmp.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `<impl at $DIR/derived_ord_debug.rs:6:10: 6:20>::partial_cmp` after PreCodegen
+// MIR for `<impl at $DIR/derived_ord_debug.rs:6:10: 6:20>::partial_cmp` after runtime-optimized
 
 fn <impl at $DIR/derived_ord_debug.rs:6:10: 6:20>::partial_cmp(_1: &MultiField, _2: &MultiField) -> Option<std::cmp::Ordering> {
     debug self => _1;
diff --git a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-abort.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-abort.mir
index 66d96021aa9b..004de976667d 100644
--- a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `<impl at $DIR/derived_ord_debug.rs:6:22: 6:25>::cmp` after PreCodegen
+// MIR for `<impl at $DIR/derived_ord_debug.rs:6:22: 6:25>::cmp` after runtime-optimized
 
 fn <impl at $DIR/derived_ord_debug.rs:6:22: 6:25>::cmp(_1: &MultiField, _2: &MultiField) -> std::cmp::Ordering {
     debug self => _1;
diff --git a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-unwind.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-unwind.mir
index 2dcba6195f71..5df51f2b3f25 100644
--- a/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/derived_ord_debug.{impl#1}-cmp.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `<impl at $DIR/derived_ord_debug.rs:6:22: 6:25>::cmp` after PreCodegen
+// MIR for `<impl at $DIR/derived_ord_debug.rs:6:22: 6:25>::cmp` after runtime-optimized
 
 fn <impl at $DIR/derived_ord_debug.rs:6:22: 6:25>::cmp(_1: &MultiField, _2: &MultiField) -> std::cmp::Ordering {
     debug self => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-abort.mir
index 927564300150..8384d563e52d 100644
--- a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `drop_bytes` after PreCodegen
+// MIR for `drop_bytes` after runtime-optimized
 
 fn drop_bytes(_1: *mut Box<[u8; 1024]>) -> () {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-unwind.mir
index 927564300150..8384d563e52d 100644
--- a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_bytes.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `drop_bytes` after PreCodegen
+// MIR for `drop_bytes` after runtime-optimized
 
 fn drop_bytes(_1: *mut Box<[u8; 1024]>) -> () {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.runtime-optimized.after.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.runtime-optimized.after.panic-abort.mir
index 27f6d77305ca..3d24aa8c349e 100644
--- a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `drop_generic` after PreCodegen
+// MIR for `drop_generic` after runtime-optimized
 
 fn drop_generic(_1: *mut Box<T>) -> () {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.runtime-optimized.after.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.runtime-optimized.after.panic-unwind.mir
index 27f6d77305ca..3d24aa8c349e 100644
--- a/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/drop_box_of_sized.drop_generic.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `drop_generic` after PreCodegen
+// MIR for `drop_generic` after runtime-optimized
 
 fn drop_generic(_1: *mut Box<T>) -> () {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_box_of_sized.rs b/tests/mir-opt/pre-codegen/drop_box_of_sized.rs
index 3d340eb103a7..732223c4054a 100644
--- a/tests/mir-opt/pre-codegen/drop_box_of_sized.rs
+++ b/tests/mir-opt/pre-codegen/drop_box_of_sized.rs
@@ -3,7 +3,7 @@
 
 #![crate_type = "lib"]
 
-// EMIT_MIR drop_box_of_sized.drop_generic.PreCodegen.after.mir
+// EMIT_MIR drop_box_of_sized.drop_generic.runtime-optimized.after.mir
 pub unsafe fn drop_generic<T: Copy>(x: *mut Box<T>) {
     // CHECK-LABEL: fn drop_generic
     // CHECK: [[ALIGNMENT:_.+]] = const <T as std::mem::SizedTypeProperties>::ALIGN as std::mem::Alignment (Transmute)
@@ -11,7 +11,7 @@ pub unsafe fn drop_generic<T: Copy>(x: *mut Box<T>) {
     std::ptr::drop_in_place(x)
 }
 
-// EMIT_MIR drop_box_of_sized.drop_bytes.PreCodegen.after.mir
+// EMIT_MIR drop_box_of_sized.drop_bytes.runtime-optimized.after.mir
 pub unsafe fn drop_bytes(x: *mut Box<[u8; 1024]>) {
     // CHECK-LABEL: fn drop_bytes
     // CHECK: alloc::alloc::__rust_dealloc({{.+}}, const 1024_usize, {{.+}}Align1Shl0 {{.+}})
diff --git a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-abort.mir b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-abort.mir
rename to tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-abort.mir
index 004fd74da144..7c0cede85a4c 100644
--- a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `generic_in_place` after PreCodegen
+// MIR for `generic_in_place` after runtime-optimized
 
 fn generic_in_place(_1: *mut Box<[T]>) -> () {
     debug ptr => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-abort.mir b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-abort.mir
rename to tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-unwind.mir
index 004fd74da144..7c0cede85a4c 100644
--- a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.32bit.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `generic_in_place` after PreCodegen
+// MIR for `generic_in_place` after runtime-optimized
 
 fn generic_in_place(_1: *mut Box<[T]>) -> () {
     debug ptr => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-unwind.mir b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-abort.mir
index 004fd74da144..7c0cede85a4c 100644
--- a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.64bit.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `generic_in_place` after PreCodegen
+// MIR for `generic_in_place` after runtime-optimized
 
 fn generic_in_place(_1: *mut Box<[T]>) -> () {
     debug ptr => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-unwind.mir b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-unwind.mir
index 004fd74da144..7c0cede85a4c 100644
--- a/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.PreCodegen.after.32bit.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/drop_boxed_slice.generic_in_place.runtime-optimized.after.64bit.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `generic_in_place` after PreCodegen
+// MIR for `generic_in_place` after runtime-optimized
 
 fn generic_in_place(_1: *mut Box<[T]>) -> () {
     debug ptr => _1;
diff --git a/tests/mir-opt/pre-codegen/drop_boxed_slice.rs b/tests/mir-opt/pre-codegen/drop_boxed_slice.rs
index 8f28bc712b4b..095f87723e1c 100644
--- a/tests/mir-opt/pre-codegen/drop_boxed_slice.rs
+++ b/tests/mir-opt/pre-codegen/drop_boxed_slice.rs
@@ -4,7 +4,7 @@
 
 #![crate_type = "lib"]
 
-// EMIT_MIR drop_boxed_slice.generic_in_place.PreCodegen.after.mir
+// EMIT_MIR drop_boxed_slice.generic_in_place.runtime-optimized.after.mir
 pub unsafe fn generic_in_place<T: Copy>(ptr: *mut Box<[T]>) {
     // CHECK-LABEL: fn generic_in_place(_1: *mut Box<[T]>)
     // CHECK: (inlined <Box<[T]> as Drop>::drop)
diff --git a/tests/mir-opt/pre-codegen/duplicate_switch_targets.rs b/tests/mir-opt/pre-codegen/duplicate_switch_targets.rs
index 58e59686de7f..07bc4795788e 100644
--- a/tests/mir-opt/pre-codegen/duplicate_switch_targets.rs
+++ b/tests/mir-opt/pre-codegen/duplicate_switch_targets.rs
@@ -8,7 +8,7 @@ pub enum Thing {
     B,
 }
 
-// EMIT_MIR duplicate_switch_targets.ub_if_b.PreCodegen.after.mir
+// EMIT_MIR duplicate_switch_targets.ub_if_b.runtime-optimized.after.mir
 pub unsafe fn ub_if_b(t: Thing) -> Thing {
     match t {
         Thing::A => t,
diff --git a/tests/mir-opt/pre-codegen/duplicate_switch_targets.ub_if_b.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/duplicate_switch_targets.ub_if_b.runtime-optimized.after.mir
similarity index 91%
rename from tests/mir-opt/pre-codegen/duplicate_switch_targets.ub_if_b.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/duplicate_switch_targets.ub_if_b.runtime-optimized.after.mir
index d08aa8456e7f..97ac547c6fea 100644
--- a/tests/mir-opt/pre-codegen/duplicate_switch_targets.ub_if_b.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/duplicate_switch_targets.ub_if_b.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `ub_if_b` after PreCodegen
+// MIR for `ub_if_b` after runtime-optimized
 
 fn ub_if_b(_1: Thing) -> Thing {
     debug t => _1;
diff --git a/tests/mir-opt/pre-codegen/intrinsics.f_u64.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/intrinsics.f_u64.runtime-optimized.after.mir
similarity index 87%
rename from tests/mir-opt/pre-codegen/intrinsics.f_u64.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/intrinsics.f_u64.runtime-optimized.after.mir
index 1109da31d958..0a5fa6daa928 100644
--- a/tests/mir-opt/pre-codegen/intrinsics.f_u64.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/intrinsics.f_u64.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `f_u64` after PreCodegen
+// MIR for `f_u64` after runtime-optimized
 
 fn f_u64() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/pre-codegen/intrinsics.f_unit.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/intrinsics.f_unit.runtime-optimized.after.mir
similarity index 87%
rename from tests/mir-opt/pre-codegen/intrinsics.f_unit.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/intrinsics.f_unit.runtime-optimized.after.mir
index 2768c2bb2d7b..7c35963169d7 100644
--- a/tests/mir-opt/pre-codegen/intrinsics.f_unit.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/intrinsics.f_unit.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `f_unit` after PreCodegen
+// MIR for `f_unit` after runtime-optimized
 
 fn f_unit() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/pre-codegen/intrinsics.rs b/tests/mir-opt/pre-codegen/intrinsics.rs
index 42200e0b87fc..32a859d5c406 100644
--- a/tests/mir-opt/pre-codegen/intrinsics.rs
+++ b/tests/mir-opt/pre-codegen/intrinsics.rs
@@ -7,12 +7,12 @@
 #![feature(core_intrinsics)]
 #![crate_type = "lib"]
 
-// EMIT_MIR intrinsics.f_unit.PreCodegen.after.mir
+// EMIT_MIR intrinsics.f_unit.runtime-optimized.after.mir
 pub fn f_unit() {
     f_dispatch(());
 }
 
-// EMIT_MIR intrinsics.f_u64.PreCodegen.after.mir
+// EMIT_MIR intrinsics.f_u64.runtime-optimized.after.mir
 pub fn f_u64() {
     f_dispatch(0u64);
 }
diff --git a/tests/mir-opt/pre-codegen/loops.filter_mapped.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.filter_mapped.runtime-optimized.after.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/loops.filter_mapped.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/loops.filter_mapped.runtime-optimized.after.mir
index 6921827c599b..b3d38472a6a7 100644
--- a/tests/mir-opt/pre-codegen/loops.filter_mapped.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/loops.filter_mapped.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `filter_mapped` after PreCodegen
+// MIR for `filter_mapped` after runtime-optimized
 
 fn filter_mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> Option<U>) -> () {
     debug iter => _1;
diff --git a/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.int_range.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/loops.int_range.runtime-optimized.after.mir
index 49b373afdd38..cd146079c632 100644
--- a/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/loops.int_range.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `int_range` after PreCodegen
+// MIR for `int_range` after runtime-optimized
 
 fn int_range(_1: usize, _2: usize) -> () {
     debug start => _1;
diff --git a/tests/mir-opt/pre-codegen/loops.mapped.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.mapped.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/loops.mapped.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/loops.mapped.runtime-optimized.after.mir
index c65b94a3e2a2..f7c294bc1feb 100644
--- a/tests/mir-opt/pre-codegen/loops.mapped.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/loops.mapped.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `mapped` after PreCodegen
+// MIR for `mapped` after runtime-optimized
 
 fn mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> U) -> () {
     debug iter => _1;
diff --git a/tests/mir-opt/pre-codegen/loops.rs b/tests/mir-opt/pre-codegen/loops.rs
index 281595f165be..ae2d63fe6736 100644
--- a/tests/mir-opt/pre-codegen/loops.rs
+++ b/tests/mir-opt/pre-codegen/loops.rs
@@ -32,7 +32,7 @@ pub fn vec_move(mut v: Vec<impl Sized>) {
 #[inline(never)]
 fn opaque(_: impl Sized) {}
 
-// EMIT_MIR loops.int_range.PreCodegen.after.mir
-// EMIT_MIR loops.mapped.PreCodegen.after.mir
-// EMIT_MIR loops.filter_mapped.PreCodegen.after.mir
-// EMIT_MIR loops.vec_move.PreCodegen.after.mir
+// EMIT_MIR loops.int_range.runtime-optimized.after.mir
+// EMIT_MIR loops.mapped.runtime-optimized.after.mir
+// EMIT_MIR loops.filter_mapped.runtime-optimized.after.mir
+// EMIT_MIR loops.vec_move.runtime-optimized.after.mir
diff --git a/tests/mir-opt/pre-codegen/loops.vec_move.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.vec_move.runtime-optimized.after.mir
similarity index 99%
rename from tests/mir-opt/pre-codegen/loops.vec_move.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/loops.vec_move.runtime-optimized.after.mir
index 5d22791eaa89..a49688ae891d 100644
--- a/tests/mir-opt/pre-codegen/loops.vec_move.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/loops.vec_move.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `vec_move` after PreCodegen
+// MIR for `vec_move` after runtime-optimized
 
 fn vec_move(_1: Vec<impl Sized>) -> () {
     debug v => _1;
diff --git a/tests/mir-opt/pre-codegen/matchbr.match1.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/matchbr.match1.runtime-optimized.after.mir
similarity index 81%
rename from tests/mir-opt/pre-codegen/matchbr.match1.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/matchbr.match1.runtime-optimized.after.mir
index 3a202728ea91..7a3d2dd6d095 100644
--- a/tests/mir-opt/pre-codegen/matchbr.match1.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/matchbr.match1.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `match1` after PreCodegen
+// MIR for `match1` after runtime-optimized
 
 fn match1(_1: bool, _2: i32, _3: i32) -> i32 {
     debug c => _1;
diff --git a/tests/mir-opt/pre-codegen/matchbr.rs b/tests/mir-opt/pre-codegen/matchbr.rs
index 1822739da2c7..621f4249a67d 100644
--- a/tests/mir-opt/pre-codegen/matchbr.rs
+++ b/tests/mir-opt/pre-codegen/matchbr.rs
@@ -1,6 +1,6 @@
 #![crate_type = "lib"]
 
-// EMIT_MIR matchbr.match1.PreCodegen.after.mir
+// EMIT_MIR matchbr.match1.runtime-optimized.after.mir
 pub fn match1(c: bool, v1: i32, v2: i32) -> i32 {
     // CHECK-LABEL: fn match1(
     // CHECK: bb0:
diff --git a/tests/mir-opt/pre-codegen/matches_macro.issue_77355_opt.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/matches_macro.issue_77355_opt.runtime-optimized.after.mir
similarity index 87%
rename from tests/mir-opt/pre-codegen/matches_macro.issue_77355_opt.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/matches_macro.issue_77355_opt.runtime-optimized.after.mir
index 2d6f82f6137f..12e25e96d923 100644
--- a/tests/mir-opt/pre-codegen/matches_macro.issue_77355_opt.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/matches_macro.issue_77355_opt.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `issue_77355_opt` after PreCodegen
+// MIR for `issue_77355_opt` after runtime-optimized
 
 fn issue_77355_opt(_1: Foo) -> u64 {
     debug num => _1;
diff --git a/tests/mir-opt/pre-codegen/matches_macro.rs b/tests/mir-opt/pre-codegen/matches_macro.rs
index 42de22965718..e354ab9fbb10 100644
--- a/tests/mir-opt/pre-codegen/matches_macro.rs
+++ b/tests/mir-opt/pre-codegen/matches_macro.rs
@@ -10,7 +10,7 @@ pub enum Foo {
     F,
 }
 
-// EMIT_MIR matches_macro.issue_77355_opt.PreCodegen.after.mir
+// EMIT_MIR matches_macro.issue_77355_opt.runtime-optimized.after.mir
 fn issue_77355_opt(num: Foo) -> u64 {
     // CHECK-LABEL: fn issue_77355_opt(
     // CHECK: switchInt({{.*}}) -> [1: bb1, 2: bb1, otherwise: bb2];
diff --git a/tests/mir-opt/pre-codegen/mem_replace.manual_replace.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/mem_replace.manual_replace.runtime-optimized.after.panic-abort.mir
similarity index 82%
rename from tests/mir-opt/pre-codegen/mem_replace.manual_replace.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/mem_replace.manual_replace.runtime-optimized.after.panic-abort.mir
index c10f3c429627..187917c67872 100644
--- a/tests/mir-opt/pre-codegen/mem_replace.manual_replace.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/mem_replace.manual_replace.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `manual_replace` after PreCodegen
+// MIR for `manual_replace` after runtime-optimized
 
 fn manual_replace(_1: &mut u32, _2: u32) -> u32 {
     debug r => _1;
diff --git a/tests/mir-opt/pre-codegen/mem_replace.manual_replace.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/mem_replace.manual_replace.runtime-optimized.after.panic-unwind.mir
similarity index 82%
rename from tests/mir-opt/pre-codegen/mem_replace.manual_replace.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/mem_replace.manual_replace.runtime-optimized.after.panic-unwind.mir
index c10f3c429627..187917c67872 100644
--- a/tests/mir-opt/pre-codegen/mem_replace.manual_replace.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/mem_replace.manual_replace.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `manual_replace` after PreCodegen
+// MIR for `manual_replace` after runtime-optimized
 
 fn manual_replace(_1: &mut u32, _2: u32) -> u32 {
     debug r => _1;
diff --git a/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/mem_replace.mem_replace.runtime-optimized.after.panic-abort.mir
similarity index 84%
rename from tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/mem_replace.mem_replace.runtime-optimized.after.panic-abort.mir
index 958a06bcd34f..5475e4b76ef9 100644
--- a/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/mem_replace.mem_replace.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `mem_replace` after PreCodegen
+// MIR for `mem_replace` after runtime-optimized
 
 fn mem_replace(_1: &mut u32, _2: u32) -> u32 {
     debug r => _1;
diff --git a/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/mem_replace.mem_replace.runtime-optimized.after.panic-unwind.mir
similarity index 84%
rename from tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/mem_replace.mem_replace.runtime-optimized.after.panic-unwind.mir
index 958a06bcd34f..5475e4b76ef9 100644
--- a/tests/mir-opt/pre-codegen/mem_replace.mem_replace.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/mem_replace.mem_replace.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `mem_replace` after PreCodegen
+// MIR for `mem_replace` after runtime-optimized
 
 fn mem_replace(_1: &mut u32, _2: u32) -> u32 {
     debug r => _1;
diff --git a/tests/mir-opt/pre-codegen/mem_replace.rs b/tests/mir-opt/pre-codegen/mem_replace.rs
index 750a7907c15e..d2474d954dc1 100644
--- a/tests/mir-opt/pre-codegen/mem_replace.rs
+++ b/tests/mir-opt/pre-codegen/mem_replace.rs
@@ -6,14 +6,14 @@
 
 #![crate_type = "lib"]
 
-// EMIT_MIR mem_replace.manual_replace.PreCodegen.after.mir
+// EMIT_MIR mem_replace.manual_replace.runtime-optimized.after.mir
 pub fn manual_replace(r: &mut u32, v: u32) -> u32 {
     let temp = *r;
     *r = v;
     temp
 }
 
-// EMIT_MIR mem_replace.mem_replace.PreCodegen.after.mir
+// EMIT_MIR mem_replace.mem_replace.runtime-optimized.after.mir
 pub fn mem_replace(r: &mut u32, v: u32) -> u32 {
     std::mem::replace(r, v)
 }
diff --git a/tests/mir-opt/pre-codegen/no_inlined_clone.rs b/tests/mir-opt/pre-codegen/no_inlined_clone.rs
index 475b230b4652..b86fe21716fc 100644
--- a/tests/mir-opt/pre-codegen/no_inlined_clone.rs
+++ b/tests/mir-opt/pre-codegen/no_inlined_clone.rs
@@ -1,6 +1,6 @@
 #![crate_type = "lib"]
 
-// EMIT_MIR no_inlined_clone.{impl#0}-clone.PreCodegen.after.mir
+// EMIT_MIR no_inlined_clone.{impl#0}-clone.runtime-optimized.after.mir
 
 // CHECK-LABEL: ::clone(
 // CHECK-NOT: inlined clone::impls::<impl Clone for {{.*}}>::clone
diff --git a/tests/mir-opt/pre-codegen/no_inlined_clone.{impl#0}-clone.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/no_inlined_clone.{impl#0}-clone.runtime-optimized.after.mir
similarity index 90%
rename from tests/mir-opt/pre-codegen/no_inlined_clone.{impl#0}-clone.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/no_inlined_clone.{impl#0}-clone.runtime-optimized.after.mir
index 9020cf1ef37f..6361b9f9be6a 100644
--- a/tests/mir-opt/pre-codegen/no_inlined_clone.{impl#0}-clone.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/no_inlined_clone.{impl#0}-clone.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `<impl at $DIR/no_inlined_clone.rs:9:10: 9:15>::clone` after PreCodegen
+// MIR for `<impl at $DIR/no_inlined_clone.rs:9:10: 9:15>::clone` after runtime-optimized
 
 fn <impl at $DIR/no_inlined_clone.rs:9:10: 9:15>::clone(_1: &Foo) -> Foo {
     debug self => _1;
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.64bit.panic-unwind.mir b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.32bit.panic-abort.mir
similarity index 86%
rename from tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.64bit.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.32bit.panic-abort.mir
index 681dadff302b..1be0cd30068e 100644
--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.64bit.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.32bit.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `main` after PreCodegen
+// MIR for `main` after runtime-optimized
 
 fn main() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.32bit.panic-unwind.mir b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.32bit.panic-unwind.mir
similarity index 86%
rename from tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.32bit.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.32bit.panic-unwind.mir
index 681dadff302b..1be0cd30068e 100644
--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.32bit.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.32bit.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `main` after PreCodegen
+// MIR for `main` after runtime-optimized
 
 fn main() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.32bit.panic-abort.mir b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.64bit.panic-abort.mir
similarity index 86%
rename from tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.32bit.panic-abort.mir
rename to tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.64bit.panic-abort.mir
index 681dadff302b..1be0cd30068e 100644
--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.32bit.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.64bit.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `main` after PreCodegen
+// MIR for `main` after runtime-optimized
 
 fn main() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.64bit.panic-abort.mir b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.64bit.panic-unwind.mir
similarity index 86%
rename from tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.64bit.panic-abort.mir
rename to tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.64bit.panic-unwind.mir
index 681dadff302b..1be0cd30068e 100644
--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.PreCodegen.after.64bit.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.runtime-optimized.after.64bit.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `main` after PreCodegen
+// MIR for `main` after runtime-optimized
 
 fn main() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.rs b/tests/mir-opt/pre-codegen/optimizes_into_variable.rs
index 6fb71bda9b44..dd94475bd4c9 100644
--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.rs
+++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.rs
@@ -11,7 +11,7 @@ struct Point {
 // EMIT_MIR optimizes_into_variable.main.ScalarReplacementOfAggregates.diff
 // EMIT_MIR optimizes_into_variable.main.GVN.diff
 // EMIT_MIR optimizes_into_variable.main.SimplifyLocals-final.after.mir
-// EMIT_MIR optimizes_into_variable.main.PreCodegen.after.mir
+// EMIT_MIR optimizes_into_variable.main.runtime-optimized.after.mir
 fn main() {
     let x = 2 + 2;
     let y = [0, 1, 2, 3, 4, 5][3];
diff --git a/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.runtime-optimized.after.panic-abort.mir
similarity index 92%
rename from tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.runtime-optimized.after.panic-abort.mir
index b29662dfa613..5a4bdce1eb23 100644
--- a/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `option_direct` after PreCodegen
+// MIR for `option_direct` after runtime-optimized
 
 fn option_direct(_1: Option<u32>) -> Option<u32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.runtime-optimized.after.panic-unwind.mir
similarity index 92%
rename from tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.runtime-optimized.after.panic-unwind.mir
index b29662dfa613..5a4bdce1eb23 100644
--- a/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/option_bubble_debug.option_direct.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `option_direct` after PreCodegen
+// MIR for `option_direct` after runtime-optimized
 
 fn option_direct(_1: Option<u32>) -> Option<u32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.runtime-optimized.after.panic-abort.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.runtime-optimized.after.panic-abort.mir
index 55f44d954d80..26ccbb7d89fd 100644
--- a/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `option_traits` after PreCodegen
+// MIR for `option_traits` after runtime-optimized
 
 fn option_traits(_1: Option<u32>) -> Option<u32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.runtime-optimized.after.panic-unwind.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.runtime-optimized.after.panic-unwind.mir
index b42aea38d3e3..c9cb25b647ef 100644
--- a/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/option_bubble_debug.option_traits.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `option_traits` after PreCodegen
+// MIR for `option_traits` after runtime-optimized
 
 fn option_traits(_1: Option<u32>) -> Option<u32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/option_bubble_debug.rs b/tests/mir-opt/pre-codegen/option_bubble_debug.rs
index b9bf78a1d6ec..96d4b412efba 100644
--- a/tests/mir-opt/pre-codegen/option_bubble_debug.rs
+++ b/tests/mir-opt/pre-codegen/option_bubble_debug.rs
@@ -5,7 +5,7 @@
 #![crate_type = "lib"]
 #![feature(try_blocks)]
 
-// EMIT_MIR option_bubble_debug.option_direct.PreCodegen.after.mir
+// EMIT_MIR option_bubble_debug.option_direct.runtime-optimized.after.mir
 pub fn option_direct(x: Option<u32>) -> Option<u32> {
     // CHECK-LABEL: fn option_direct(_1: Option<u32>) -> Option<u32>
     // CHECK: = discriminant(_1);
@@ -18,7 +18,7 @@ pub fn option_direct(x: Option<u32>) -> Option<u32> {
     }
 }
 
-// EMIT_MIR option_bubble_debug.option_traits.PreCodegen.after.mir
+// EMIT_MIR option_bubble_debug.option_traits.runtime-optimized.after.mir
 pub fn option_traits(x: Option<u32>) -> Option<u32> {
     // CHECK-LABEL: fn option_traits(_1: Option<u32>) -> Option<u32>
     // CHECK: = <Option<u32> as Try>::branch(copy _1)
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-abort.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-abort.mir
index a6dad00bbdb1..1b53ef91b342 100644
--- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `demo_byte_add_fat` after PreCodegen
+// MIR for `demo_byte_add_fat` after runtime-optimized
 
 fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] {
     debug p => _1;
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-unwind.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-unwind.mir
index a6dad00bbdb1..1b53ef91b342 100644
--- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_fat.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `demo_byte_add_fat` after PreCodegen
+// MIR for `demo_byte_add_fat` after runtime-optimized
 
 fn demo_byte_add_fat(_1: *const [u32], _2: usize) -> *const [u32] {
     debug p => _1;
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-abort.mir
similarity index 94%
rename from tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-abort.mir
index cb7f15657463..8d026782963f 100644
--- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `demo_byte_add_thin` after PreCodegen
+// MIR for `demo_byte_add_thin` after runtime-optimized
 
 fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
     debug p => _1;
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-unwind.mir
similarity index 94%
rename from tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-unwind.mir
index cb7f15657463..8d026782963f 100644
--- a/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/ptr_offset.demo_byte_add_thin.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `demo_byte_add_thin` after PreCodegen
+// MIR for `demo_byte_add_thin` after runtime-optimized
 
 fn demo_byte_add_thin(_1: *const u32, _2: usize) -> *const u32 {
     debug p => _1;
diff --git a/tests/mir-opt/pre-codegen/ptr_offset.rs b/tests/mir-opt/pre-codegen/ptr_offset.rs
index 1e936222a2dd..ddeec5d79c65 100644
--- a/tests/mir-opt/pre-codegen/ptr_offset.rs
+++ b/tests/mir-opt/pre-codegen/ptr_offset.rs
@@ -5,12 +5,12 @@
 
 #![crate_type = "lib"]
 
-// EMIT_MIR ptr_offset.demo_byte_add_thin.PreCodegen.after.mir
+// EMIT_MIR ptr_offset.demo_byte_add_thin.runtime-optimized.after.mir
 pub unsafe fn demo_byte_add_thin(p: *const u32, n: usize) -> *const u32 {
     p.byte_add(n)
 }
 
-// EMIT_MIR ptr_offset.demo_byte_add_fat.PreCodegen.after.mir
+// EMIT_MIR ptr_offset.demo_byte_add_fat.runtime-optimized.after.mir
 pub unsafe fn demo_byte_add_fat(p: *const [u32], n: usize) -> *const [u32] {
     p.byte_add(n)
 }
diff --git a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/range_iter.forward_loop.runtime-optimized.after.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/range_iter.forward_loop.runtime-optimized.after.panic-abort.mir
index d107a37da0fe..47c78d4e8013 100644
--- a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.forward_loop.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `forward_loop` after PreCodegen
+// MIR for `forward_loop` after runtime-optimized
 
 fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     debug start => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.forward_loop.runtime-optimized.after.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/range_iter.forward_loop.runtime-optimized.after.panic-unwind.mir
index 207dde62f7d6..5dfcba18be02 100644
--- a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.forward_loop.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `forward_loop` after PreCodegen
+// MIR for `forward_loop` after runtime-optimized
 
 fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     debug start => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.runtime-optimized.after.panic-abort.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/range_iter.inclusive_loop.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/range_iter.inclusive_loop.runtime-optimized.after.panic-abort.mir
index 63d9b1d1d003..5e1291f71663 100644
--- a/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `inclusive_loop` after PreCodegen
+// MIR for `inclusive_loop` after runtime-optimized
 
 fn inclusive_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     debug start => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.runtime-optimized.after.panic-unwind.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/range_iter.inclusive_loop.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/range_iter.inclusive_loop.runtime-optimized.after.panic-unwind.mir
index 33c9b492c5f1..2e82343e4443 100644
--- a/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.inclusive_loop.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `inclusive_loop` after PreCodegen
+// MIR for `inclusive_loop` after runtime-optimized
 
 fn inclusive_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     debug start => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-abort.mir
similarity index 87%
rename from tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-abort.mir
index 13969e5d2385..aaf54ccf7e9f 100644
--- a/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `range_inclusive_iter_next` after PreCodegen
+// MIR for `range_inclusive_iter_next` after runtime-optimized
 
 fn range_inclusive_iter_next(_1: &mut std::ops::RangeInclusive<u32>) -> Option<u32> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-unwind.mir
similarity index 87%
rename from tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-unwind.mir
index 98cd58284dfa..127912b37da6 100644
--- a/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.range_inclusive_iter_next.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `range_inclusive_iter_next` after PreCodegen
+// MIR for `range_inclusive_iter_next` after runtime-optimized
 
 fn range_inclusive_iter_next(_1: &mut std::ops::RangeInclusive<u32>) -> Option<u32> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.runtime-optimized.after.panic-abort.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/range_iter.range_iter_next.runtime-optimized.after.panic-abort.mir
index 55caea9d8f96..6cd78c56db99 100644
--- a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `range_iter_next` after PreCodegen
+// MIR for `range_iter_next` after runtime-optimized
 
 fn range_iter_next(_1: &mut std::ops::Range<u32>) -> Option<u32> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.runtime-optimized.after.panic-unwind.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/range_iter.range_iter_next.runtime-optimized.after.panic-unwind.mir
index 55caea9d8f96..6cd78c56db99 100644
--- a/tests/mir-opt/pre-codegen/range_iter.range_iter_next.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/range_iter.range_iter_next.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `range_iter_next` after PreCodegen
+// MIR for `range_iter_next` after runtime-optimized
 
 fn range_iter_next(_1: &mut std::ops::Range<u32>) -> Option<u32> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/range_iter.rs b/tests/mir-opt/pre-codegen/range_iter.rs
index 856d57cd6e4f..79a97f0ad2c1 100644
--- a/tests/mir-opt/pre-codegen/range_iter.rs
+++ b/tests/mir-opt/pre-codegen/range_iter.rs
@@ -6,24 +6,24 @@
 
 use std::ops::{Range, RangeInclusive};
 
-// EMIT_MIR range_iter.range_iter_next.PreCodegen.after.mir
+// EMIT_MIR range_iter.range_iter_next.runtime-optimized.after.mir
 pub fn range_iter_next(it: &mut Range<u32>) -> Option<u32> {
     it.next()
 }
 
-// EMIT_MIR range_iter.range_inclusive_iter_next.PreCodegen.after.mir
+// EMIT_MIR range_iter.range_inclusive_iter_next.runtime-optimized.after.mir
 pub fn range_inclusive_iter_next(it: &mut RangeInclusive<u32>) -> Option<u32> {
     it.next()
 }
 
-// EMIT_MIR range_iter.forward_loop.PreCodegen.after.mir
+// EMIT_MIR range_iter.forward_loop.runtime-optimized.after.mir
 pub fn forward_loop(start: u32, end: u32, f: impl Fn(u32)) {
     for x in start..end {
         f(x)
     }
 }
 
-// EMIT_MIR range_iter.inclusive_loop.PreCodegen.after.mir
+// EMIT_MIR range_iter.inclusive_loop.runtime-optimized.after.mir
 pub fn inclusive_loop(start: u32, end: u32, f: impl Fn(u32)) {
     for x in start..=end {
         f(x)
diff --git a/tests/mir-opt/pre-codegen/simple_option_map.ezmap.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/simple_option_map.ezmap.runtime-optimized.after.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/simple_option_map.ezmap.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/simple_option_map.ezmap.runtime-optimized.after.mir
index 876fa96dfb6f..273f7bfafa2c 100644
--- a/tests/mir-opt/pre-codegen/simple_option_map.ezmap.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/simple_option_map.ezmap.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `ezmap` after PreCodegen
+// MIR for `ezmap` after runtime-optimized
 
 fn ezmap(_1: Option<i32>) -> Option<i32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/simple_option_map.map_via_question_mark.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/simple_option_map.map_via_question_mark.runtime-optimized.after.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/simple_option_map.map_via_question_mark.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/simple_option_map.map_via_question_mark.runtime-optimized.after.mir
index ff0396b168f8..26648a3173d6 100644
--- a/tests/mir-opt/pre-codegen/simple_option_map.map_via_question_mark.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/simple_option_map.map_via_question_mark.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `map_via_question_mark` after PreCodegen
+// MIR for `map_via_question_mark` after runtime-optimized
 
 fn map_via_question_mark(_1: Option<i32>) -> Option<i32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/simple_option_map.rs b/tests/mir-opt/pre-codegen/simple_option_map.rs
index f0d7b51a6439..8f3ea6f0ae28 100644
--- a/tests/mir-opt/pre-codegen/simple_option_map.rs
+++ b/tests/mir-opt/pre-codegen/simple_option_map.rs
@@ -11,7 +11,7 @@ fn map<T, U, F>(slf: Option<T>, f: F) -> Option<U>
     }
 }
 
-// EMIT_MIR simple_option_map.ezmap.PreCodegen.after.mir
+// EMIT_MIR simple_option_map.ezmap.runtime-optimized.after.mir
 pub fn ezmap(x: Option<i32>) -> Option<i32> {
     // We expect this to all be inlined, as though it was written without the
     // combinator and without the closure, using just a plain match.
@@ -23,7 +23,7 @@ pub fn ezmap(x: Option<i32>) -> Option<i32> {
     map(x, |n| n + 1)
 }
 
-// EMIT_MIR simple_option_map.map_via_question_mark.PreCodegen.after.mir
+// EMIT_MIR simple_option_map.map_via_question_mark.runtime-optimized.after.mir
 pub fn map_via_question_mark(x: Option<i32>) -> Option<i32> {
     // FIXME(#138544): Ideally this would optimize out the `ControlFlow` local.
 
diff --git a/tests/mir-opt/pre-codegen/slice_filter.rs b/tests/mir-opt/pre-codegen/slice_filter.rs
index a6f4a52075df..053830b3e47f 100644
--- a/tests/mir-opt/pre-codegen/slice_filter.rs
+++ b/tests/mir-opt/pre-codegen/slice_filter.rs
@@ -11,5 +11,5 @@ pub fn variant_b(input: &[(usize, usize, usize, usize)]) -> usize {
     input.iter().filter(|&&(a, b, c, d)| a <= c && d <= b || c <= a && b <= d).count()
 }
 
-// EMIT_MIR slice_filter.variant_a-{closure#0}.PreCodegen.after.mir
-// EMIT_MIR slice_filter.variant_b-{closure#0}.PreCodegen.after.mir
+// EMIT_MIR slice_filter.variant_a-{closure#0}.runtime-optimized.after.mir
+// EMIT_MIR slice_filter.variant_b-{closure#0}.runtime-optimized.after.mir
diff --git a/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.runtime-optimized.after.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.runtime-optimized.after.mir
index 690325d87936..d4ba112510aa 100644
--- a/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `variant_a::{closure#0}` after PreCodegen
+// MIR for `variant_a::{closure#0}` after runtime-optimized
 
 fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:7:25: 7:39}, _2: &&(usize, usize, usize, usize)) -> bool {
     let mut _0: bool;
diff --git a/tests/mir-opt/pre-codegen/slice_filter.variant_b-{closure#0}.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/slice_filter.variant_b-{closure#0}.runtime-optimized.after.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/slice_filter.variant_b-{closure#0}.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/slice_filter.variant_b-{closure#0}.runtime-optimized.after.mir
index 05549e857c1a..47ea0fb694c8 100644
--- a/tests/mir-opt/pre-codegen/slice_filter.variant_b-{closure#0}.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/slice_filter.variant_b-{closure#0}.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `variant_b::{closure#0}` after PreCodegen
+// MIR for `variant_b::{closure#0}` after runtime-optimized
 
 fn variant_b::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:11:25: 11:41}, _2: &&(usize, usize, usize, usize)) -> bool {
     let mut _0: bool;
diff --git a/tests/mir-opt/pre-codegen/slice_index.rs b/tests/mir-opt/pre-codegen/slice_index.rs
index 5dac535d195a..52bdd0f67825 100644
--- a/tests/mir-opt/pre-codegen/slice_index.rs
+++ b/tests/mir-opt/pre-codegen/slice_index.rs
@@ -6,7 +6,7 @@
 
 use std::ops::Range;
 
-// EMIT_MIR slice_index.slice_index_usize.PreCodegen.after.mir
+// EMIT_MIR slice_index.slice_index_usize.runtime-optimized.after.mir
 pub fn slice_index_usize(slice: &[u32], index: usize) -> u32 {
     // CHECK-LABEL: slice_index_usize
     // CHECK: [[LEN:_[0-9]+]] = PtrMetadata(copy _1)
@@ -16,7 +16,7 @@ pub fn slice_index_usize(slice: &[u32], index: usize) -> u32 {
     slice[index]
 }
 
-// EMIT_MIR slice_index.slice_get_mut_usize.PreCodegen.after.mir
+// EMIT_MIR slice_index.slice_get_mut_usize.runtime-optimized.after.mir
 pub fn slice_get_mut_usize(slice: &mut [u32], index: usize) -> Option<&mut u32> {
     // CHECK-LABEL: slice_get_mut_usize
     // CHECK: [[LEN:_[0-9]+]] = PtrMetadata(copy _1)
@@ -25,13 +25,13 @@ pub fn slice_get_mut_usize(slice: &mut [u32], index: usize) -> Option<&mut u32>
     slice.get_mut(index)
 }
 
-// EMIT_MIR slice_index.slice_index_range.PreCodegen.after.mir
+// EMIT_MIR slice_index.slice_index_range.runtime-optimized.after.mir
 pub fn slice_index_range(slice: &[u32], index: Range<usize>) -> &[u32] {
     // CHECK-LABEL: slice_index_range
     &slice[index]
 }
 
-// EMIT_MIR slice_index.slice_get_unchecked_mut_range.PreCodegen.after.mir
+// EMIT_MIR slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.mir
 pub unsafe fn slice_get_unchecked_mut_range(slice: &mut [u32], index: Range<usize>) -> &mut [u32] {
     // CHECK-LABEL: slice_get_unchecked_mut_range
     // CHECK: [[START:_[0-9]+]] = move (_2.0: usize);
@@ -44,7 +44,7 @@ pub unsafe fn slice_get_unchecked_mut_range(slice: &mut [u32], index: Range<usiz
     slice.get_unchecked_mut(index)
 }
 
-// EMIT_MIR slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.mir
+// EMIT_MIR slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.mir
 pub unsafe fn slice_ptr_get_unchecked_range(
     slice: *const [u32],
     index: Range<usize>,
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.runtime-optimized.after.panic-abort.mir
similarity index 94%
rename from tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.runtime-optimized.after.panic-abort.mir
index ebe8b23354be..8ab6ef6109f0 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_get_mut_usize` after PreCodegen
+// MIR for `slice_get_mut_usize` after runtime-optimized
 
 fn slice_get_mut_usize(_1: &mut [u32], _2: usize) -> Option<&mut u32> {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.runtime-optimized.after.panic-unwind.mir
similarity index 94%
rename from tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.runtime-optimized.after.panic-unwind.mir
index ebe8b23354be..8ab6ef6109f0 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_mut_usize.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_get_mut_usize` after PreCodegen
+// MIR for `slice_get_mut_usize` after runtime-optimized
 
 fn slice_get_mut_usize(_1: &mut [u32], _2: usize) -> Option<&mut u32> {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-abort.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-abort.mir
index 67194ea7225f..9ce88f4bd299 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_get_unchecked_mut_range` after PreCodegen
+// MIR for `slice_get_unchecked_mut_range` after runtime-optimized
 
 fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range<usize>) -> &mut [u32] {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-unwind.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-unwind.mir
index 67194ea7225f..9ce88f4bd299 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_get_unchecked_mut_range` after PreCodegen
+// MIR for `slice_get_unchecked_mut_range` after runtime-optimized
 
 fn slice_get_unchecked_mut_range(_1: &mut [u32], _2: std::ops::Range<usize>) -> &mut [u32] {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_index_range.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_index_range.runtime-optimized.after.panic-abort.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/slice_index.slice_index_range.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_index_range.runtime-optimized.after.panic-abort.mir
index ed82be1bac33..1d8c44fa4e2a 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_index_range.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_index_range.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_index_range` after PreCodegen
+// MIR for `slice_index_range` after runtime-optimized
 
 fn slice_index_range(_1: &[u32], _2: std::ops::Range<usize>) -> &[u32] {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_index_range.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_index_range.runtime-optimized.after.panic-unwind.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/slice_index.slice_index_range.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_index_range.runtime-optimized.after.panic-unwind.mir
index cf2b8d664708..e66ee3581da2 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_index_range.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_index_range.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_index_range` after PreCodegen
+// MIR for `slice_index_range` after runtime-optimized
 
 fn slice_index_range(_1: &[u32], _2: std::ops::Range<usize>) -> &[u32] {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.runtime-optimized.after.panic-abort.mir
similarity index 89%
rename from tests/mir-opt/pre-codegen/slice_index.slice_index_usize.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_index_usize.runtime-optimized.after.panic-abort.mir
index 81e60b8ec2ca..a7984bfeb748 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_index_usize` after PreCodegen
+// MIR for `slice_index_usize` after runtime-optimized
 
 fn slice_index_usize(_1: &[u32], _2: usize) -> u32 {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.runtime-optimized.after.panic-unwind.mir
similarity index 89%
rename from tests/mir-opt/pre-codegen/slice_index.slice_index_usize.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_index_usize.runtime-optimized.after.panic-unwind.mir
index c0fdc839608d..de419769fcf2 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_index_usize.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_index_usize` after PreCodegen
+// MIR for `slice_index_usize` after runtime-optimized
 
 fn slice_index_usize(_1: &[u32], _2: usize) -> u32 {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-abort.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-abort.mir
index 21bc3bcc07c4..276fe6a9f679 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_ptr_get_unchecked_range` after PreCodegen
+// MIR for `slice_ptr_get_unchecked_range` after runtime-optimized
 
 fn slice_ptr_get_unchecked_range(_1: *const [u32], _2: std::ops::Range<usize>) -> *const [u32] {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-unwind.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-unwind.mir
index 21bc3bcc07c4..276fe6a9f679 100644
--- a/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_ptr_get_unchecked_range` after PreCodegen
+// MIR for `slice_ptr_get_unchecked_range` after runtime-optimized
 
 fn slice_ptr_get_unchecked_range(_1: *const [u32], _2: std::ops::Range<usize>) -> *const [u32] {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.runtime-optimized.after.panic-abort.mir
similarity index 99%
rename from tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.runtime-optimized.after.panic-abort.mir
index 575659e6d0de..fc254be26474 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `enumerated_loop` after PreCodegen
+// MIR for `enumerated_loop` after runtime-optimized
 
 fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.runtime-optimized.after.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.runtime-optimized.after.panic-unwind.mir
index 07522650e293..034416c173b4 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.enumerated_loop.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `enumerated_loop` after PreCodegen
+// MIR for `enumerated_loop` after runtime-optimized
 
 fn enumerated_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.runtime-optimized.after.panic-abort.mir
similarity index 99%
rename from tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_iter.forward_loop.runtime-optimized.after.panic-abort.mir
index f41dbd567003..5f8fefc57c41 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `forward_loop` after PreCodegen
+// MIR for `forward_loop` after runtime-optimized
 
 fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.runtime-optimized.after.panic-unwind.mir
similarity index 99%
rename from tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_iter.forward_loop.runtime-optimized.after.panic-unwind.mir
index e06c093e3a5b..3bcd93396f61 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.forward_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.forward_loop.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `forward_loop` after PreCodegen
+// MIR for `forward_loop` after runtime-optimized
 
 fn forward_loop(_1: &[T], _2: impl Fn(&T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.range_loop.runtime-optimized.after.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_iter.range_loop.runtime-optimized.after.panic-abort.mir
index 43e2d24674d9..e817d9cd8728 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.range_loop.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `range_loop` after PreCodegen
+// MIR for `range_loop` after runtime-optimized
 
 fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.range_loop.runtime-optimized.after.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_iter.range_loop.runtime-optimized.after.panic-unwind.mir
index 59aa46bd8cc3..b780f686570f 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.range_loop.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `range_loop` after PreCodegen
+// MIR for `range_loop` after runtime-optimized
 
 fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.runtime-optimized.after.panic-abort.mir
similarity index 99%
rename from tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_iter.reverse_loop.runtime-optimized.after.panic-abort.mir
index 1f96a8e14a5b..bd0e3a025f42 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `reverse_loop` after PreCodegen
+// MIR for `reverse_loop` after runtime-optimized
 
 fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.runtime-optimized.after.panic-unwind.mir
similarity index 99%
rename from tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_iter.reverse_loop.runtime-optimized.after.panic-unwind.mir
index 84d3c68aba0d..d0b125be28d4 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.reverse_loop.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `reverse_loop` after PreCodegen
+// MIR for `reverse_loop` after runtime-optimized
 
 fn reverse_loop(_1: &[T], _2: impl Fn(&T)) -> () {
     debug slice => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.rs b/tests/mir-opt/pre-codegen/slice_iter.rs
index f9049c79803e..fa353a94256b 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.rs
+++ b/tests/mir-opt/pre-codegen/slice_iter.rs
@@ -16,43 +16,43 @@
 // As such, feel free to `--bless` whatever changes you get here, so long as
 // doing so doesn't add substantially more MIR.
 
-// EMIT_MIR slice_iter.slice_iter_generic_is_empty.PreCodegen.after.mir
+// EMIT_MIR slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.mir
 pub fn slice_iter_generic_is_empty<T>(it: &std::slice::Iter<'_, T>) -> bool {
     it.is_empty()
 }
 
-// EMIT_MIR slice_iter.slice_iter_next.PreCodegen.after.mir
+// EMIT_MIR slice_iter.slice_iter_next.runtime-optimized.after.mir
 pub fn slice_iter_next<'a, T>(it: &mut std::slice::Iter<'a, T>) -> Option<&'a T> {
     it.next()
 }
 
-// EMIT_MIR slice_iter.slice_iter_mut_next_back.PreCodegen.after.mir
+// EMIT_MIR slice_iter.slice_iter_mut_next_back.runtime-optimized.after.mir
 pub fn slice_iter_mut_next_back<'a, T>(it: &mut std::slice::IterMut<'a, T>) -> Option<&'a mut T> {
     it.next_back()
 }
 
-// EMIT_MIR slice_iter.forward_loop.PreCodegen.after.mir
+// EMIT_MIR slice_iter.forward_loop.runtime-optimized.after.mir
 pub fn forward_loop<'a, T>(slice: &'a [T], f: impl Fn(&T)) {
     for x in slice.iter() {
         f(x)
     }
 }
 
-// EMIT_MIR slice_iter.reverse_loop.PreCodegen.after.mir
+// EMIT_MIR slice_iter.reverse_loop.runtime-optimized.after.mir
 pub fn reverse_loop<'a, T>(slice: &'a [T], f: impl Fn(&T)) {
     for x in slice.iter().rev() {
         f(x)
     }
 }
 
-// EMIT_MIR slice_iter.enumerated_loop.PreCodegen.after.mir
+// EMIT_MIR slice_iter.enumerated_loop.runtime-optimized.after.mir
 pub fn enumerated_loop<'a, T>(slice: &'a [T], f: impl Fn(usize, &T)) {
     for (i, x) in slice.iter().enumerate() {
         f(i, x)
     }
 }
 
-// EMIT_MIR slice_iter.range_loop.PreCodegen.after.mir
+// EMIT_MIR slice_iter.range_loop.runtime-optimized.after.mir
 pub fn range_loop<'a, T>(slice: &'a [T], f: impl Fn(usize, &T)) {
     for i in 0..slice.len() {
         let x = &slice[i];
diff --git a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-abort.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-abort.mir
index 04f78fa3e7e3..9228a51ab919 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_iter_generic_is_empty` after PreCodegen
+// MIR for `slice_iter_generic_is_empty` after runtime-optimized
 
 fn slice_iter_generic_is_empty(_1: &std::slice::Iter<'_, T>) -> bool {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-unwind.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-unwind.mir
index 04f78fa3e7e3..9228a51ab919 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_generic_is_empty.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_iter_generic_is_empty` after PreCodegen
+// MIR for `slice_iter_generic_is_empty` after runtime-optimized
 
 fn slice_iter_generic_is_empty(_1: &std::slice::Iter<'_, T>) -> bool {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-abort.mir
index 94471cbb157c..d9c8fb05ec0a 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_iter_mut_next_back` after PreCodegen
+// MIR for `slice_iter_mut_next_back` after runtime-optimized
 
 fn slice_iter_mut_next_back(_1: &mut std::slice::IterMut<'_, T>) -> Option<&mut T> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-unwind.mir
index 94471cbb157c..d9c8fb05ec0a 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_mut_next_back.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_iter_mut_next_back` after PreCodegen
+// MIR for `slice_iter_mut_next_back` after runtime-optimized
 
 fn slice_iter_mut_next_back(_1: &mut std::slice::IterMut<'_, T>) -> Option<&mut T> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.runtime-optimized.after.panic-abort.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.runtime-optimized.after.panic-abort.mir
index 70e21435cc18..7596384ac4a8 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_iter_next` after PreCodegen
+// MIR for `slice_iter_next` after runtime-optimized
 
 fn slice_iter_next(_1: &mut std::slice::Iter<'_, T>) -> Option<&T> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.runtime-optimized.after.panic-unwind.mir
similarity index 98%
rename from tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.runtime-optimized.after.panic-unwind.mir
index 70e21435cc18..7596384ac4a8 100644
--- a/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/slice_iter.slice_iter_next.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `slice_iter_next` after PreCodegen
+// MIR for `slice_iter_next` after runtime-optimized
 
 fn slice_iter_next(_1: &mut std::slice::Iter<'_, T>) -> Option<&T> {
     debug it => _1;
diff --git a/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/spans.outer.runtime-optimized.after.panic-abort.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/spans.outer.runtime-optimized.after.panic-abort.mir
index 79aa9c5ae1e3..d8b15701bbd9 100644
--- a/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/spans.outer.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `outer` after PreCodegen
+// MIR for `outer` after runtime-optimized
 
 fn outer(_1: u8) -> u8 {
     debug v => _1;                       // in scope 0 at $DIR/spans.rs:10:14: 10:15
diff --git a/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/spans.outer.runtime-optimized.after.panic-unwind.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/spans.outer.runtime-optimized.after.panic-unwind.mir
index 79aa9c5ae1e3..d8b15701bbd9 100644
--- a/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/spans.outer.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `outer` after PreCodegen
+// MIR for `outer` after runtime-optimized
 
 fn outer(_1: u8) -> u8 {
     debug v => _1;                       // in scope 0 at $DIR/spans.rs:10:14: 10:15
diff --git a/tests/mir-opt/pre-codegen/spans.rs b/tests/mir-opt/pre-codegen/spans.rs
index 51aad44579da..97258ee26bb0 100644
--- a/tests/mir-opt/pre-codegen/spans.rs
+++ b/tests/mir-opt/pre-codegen/spans.rs
@@ -6,7 +6,7 @@
 
 #![crate_type = "lib"]
 
-// EMIT_MIR spans.outer.PreCodegen.after.mir
+// EMIT_MIR spans.outer.runtime-optimized.after.mir
 pub fn outer(v: u8) -> u8 {
     inner(&v)
 }
diff --git a/tests/mir-opt/pre-codegen/transmutes.forget_at_home.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/transmutes.forget_at_home.runtime-optimized.after.mir
similarity index 88%
rename from tests/mir-opt/pre-codegen/transmutes.forget_at_home.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/transmutes.forget_at_home.runtime-optimized.after.mir
index 5fc28fddedf8..80ad68c8a48b 100644
--- a/tests/mir-opt/pre-codegen/transmutes.forget_at_home.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/transmutes.forget_at_home.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `forget_at_home` after PreCodegen
+// MIR for `forget_at_home` after runtime-optimized
 
 fn forget_at_home(_1: String) -> () {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/transmutes.neo_to_cast.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/transmutes.neo_to_cast.runtime-optimized.after.mir
similarity index 80%
rename from tests/mir-opt/pre-codegen/transmutes.neo_to_cast.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/transmutes.neo_to_cast.runtime-optimized.after.mir
index 6d6b1775d05b..a69276731d49 100644
--- a/tests/mir-opt/pre-codegen/transmutes.neo_to_cast.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/transmutes.neo_to_cast.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `neo_to_cast` after PreCodegen
+// MIR for `neo_to_cast` after runtime-optimized
 
 fn neo_to_cast(_1: f32) -> i32 {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/transmutes.pad_for_alignment.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/transmutes.pad_for_alignment.runtime-optimized.after.mir
similarity index 93%
rename from tests/mir-opt/pre-codegen/transmutes.pad_for_alignment.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/transmutes.pad_for_alignment.runtime-optimized.after.mir
index 100eebf0c244..87d0f684fdbb 100644
--- a/tests/mir-opt/pre-codegen/transmutes.pad_for_alignment.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/transmutes.pad_for_alignment.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `pad_for_alignment` after PreCodegen
+// MIR for `pad_for_alignment` after runtime-optimized
 
 fn pad_for_alignment(_1: u32) -> Align64<u32> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/transmutes.prefix_of_array.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/transmutes.prefix_of_array.runtime-optimized.after.mir
similarity index 94%
rename from tests/mir-opt/pre-codegen/transmutes.prefix_of_array.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/transmutes.prefix_of_array.runtime-optimized.after.mir
index 4050338e2418..44eb659b39b4 100644
--- a/tests/mir-opt/pre-codegen/transmutes.prefix_of_array.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/transmutes.prefix_of_array.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `prefix_of_array` after PreCodegen
+// MIR for `prefix_of_array` after runtime-optimized
 
 fn prefix_of_array(_1: [u32; 4]) -> [u32; 2] {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/transmutes.prefix_to_cast.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/transmutes.prefix_to_cast.runtime-optimized.after.mir
similarity index 89%
rename from tests/mir-opt/pre-codegen/transmutes.prefix_to_cast.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/transmutes.prefix_to_cast.runtime-optimized.after.mir
index c0500fbae06f..2c80439bcec7 100644
--- a/tests/mir-opt/pre-codegen/transmutes.prefix_to_cast.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/transmutes.prefix_to_cast.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `prefix_to_cast` after PreCodegen
+// MIR for `prefix_to_cast` after runtime-optimized
 
 fn prefix_to_cast(_1: f32) -> i32 {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/transmutes.rs b/tests/mir-opt/pre-codegen/transmutes.rs
index 4825e6079c2e..d8369e839b6b 100644
--- a/tests/mir-opt/pre-codegen/transmutes.rs
+++ b/tests/mir-opt/pre-codegen/transmutes.rs
@@ -6,21 +6,21 @@
 
 use std::mem::{transmute_neo, transmute_prefix};
 
-// EMIT_MIR transmutes.neo_to_cast.PreCodegen.after.mir
+// EMIT_MIR transmutes.neo_to_cast.runtime-optimized.after.mir
 pub fn neo_to_cast(x: f32) -> i32 {
     // CHECK-LABEL: fn neo_to_cast
     // CHECK: _0 = copy _1 as i32 (Transmute);
     unsafe { transmute_neo(x) }
 }
 
-// EMIT_MIR transmutes.prefix_to_cast.PreCodegen.after.mir
+// EMIT_MIR transmutes.prefix_to_cast.runtime-optimized.after.mir
 pub fn prefix_to_cast(x: f32) -> i32 {
     // CHECK-LABEL: fn prefix_to_cast
     // CHECK: _0 = copy _1 as i32 (Transmute);
     unsafe { transmute_prefix(x) }
 }
 
-// EMIT_MIR transmutes.prefix_of_array.PreCodegen.after.mir
+// EMIT_MIR transmutes.prefix_of_array.runtime-optimized.after.mir
 pub fn prefix_of_array(x: [u32; 4]) -> [u32; 2] {
     // CHECK-LABEL: fn prefix_of_array
     // CHECK: _2 = copy _1 as {{.+}}::Transmute<[u32; 4], [u32; 2]> (Transmute);
@@ -32,7 +32,7 @@ pub fn prefix_to_cast(x: f32) -> i32 {
 #[repr(C, align(64))]
 struct Align64<T>(T);
 
-// EMIT_MIR transmutes.pad_for_alignment.PreCodegen.after.mir
+// EMIT_MIR transmutes.pad_for_alignment.runtime-optimized.after.mir
 pub fn pad_for_alignment(x: u32) -> Align64<u32> {
     // CHECK-LABEL: fn pad_for_alignment
     // CHECK: _2 = copy _1 as {{.+}}::ManuallyDrop<u32> (Transmute);
@@ -41,7 +41,7 @@ pub fn pad_for_alignment(x: u32) -> Align64<u32> {
     unsafe { transmute_prefix(x) }
 }
 
-// EMIT_MIR transmutes.forget_at_home.PreCodegen.after.mir
+// EMIT_MIR transmutes.forget_at_home.runtime-optimized.after.mir
 pub fn forget_at_home(x: String) {
     // CHECK-LABEL: fn forget_at_home
     // CHECK: bb0:
diff --git a/tests/mir-opt/pre-codegen/try_identity.new.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/try_identity.new.runtime-optimized.after.mir
similarity index 96%
rename from tests/mir-opt/pre-codegen/try_identity.new.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/try_identity.new.runtime-optimized.after.mir
index 6035f245c497..6780fa4d3ea2 100644
--- a/tests/mir-opt/pre-codegen/try_identity.new.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/try_identity.new.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `new` after PreCodegen
+// MIR for `new` after runtime-optimized
 
 fn new(_1: Result<T, E>) -> Result<T, E> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/try_identity.old.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/try_identity.old.runtime-optimized.after.mir
similarity index 94%
rename from tests/mir-opt/pre-codegen/try_identity.old.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/try_identity.old.runtime-optimized.after.mir
index aec51bfd8d74..b74470181143 100644
--- a/tests/mir-opt/pre-codegen/try_identity.old.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/try_identity.old.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `old` after PreCodegen
+// MIR for `old` after runtime-optimized
 
 fn old(_1: Result<T, E>) -> Result<T, E> {
     debug x => _1;
diff --git a/tests/mir-opt/pre-codegen/try_identity.rs b/tests/mir-opt/pre-codegen/try_identity.rs
index 876f86fe52ba..30c557e981f0 100644
--- a/tests/mir-opt/pre-codegen/try_identity.rs
+++ b/tests/mir-opt/pre-codegen/try_identity.rs
@@ -6,7 +6,7 @@
 
 use std::ops::ControlFlow;
 
-// EMIT_MIR try_identity.new.PreCodegen.after.mir
+// EMIT_MIR try_identity.new.runtime-optimized.after.mir
 fn new<T, E>(x: Result<T, E>) -> Result<T, E> {
     Ok(
         match {
@@ -21,7 +21,7 @@ fn new<T, E>(x: Result<T, E>) -> Result<T, E> {
     )
 }
 
-// EMIT_MIR try_identity.old.PreCodegen.after.mir
+// EMIT_MIR try_identity.old.runtime-optimized.after.mir
 fn old<T, E>(x: Result<T, E>) -> Result<T, E> {
     Ok(match x {
         Ok(v) => v,
diff --git a/tests/mir-opt/pre-codegen/tuple_ord.demo_ge_partial.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/tuple_ord.demo_ge_partial.runtime-optimized.after.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/tuple_ord.demo_ge_partial.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/tuple_ord.demo_ge_partial.runtime-optimized.after.mir
index 29bfe962974c..079a57c91690 100644
--- a/tests/mir-opt/pre-codegen/tuple_ord.demo_ge_partial.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/tuple_ord.demo_ge_partial.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `demo_ge_partial` after PreCodegen
+// MIR for `demo_ge_partial` after runtime-optimized
 
 fn demo_ge_partial(_1: &(f32, f32), _2: &(f32, f32)) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/tuple_ord.demo_le_total.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/tuple_ord.demo_le_total.runtime-optimized.after.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/tuple_ord.demo_le_total.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/tuple_ord.demo_le_total.runtime-optimized.after.mir
index 7678c92a1f0c..e4dd5225fe02 100644
--- a/tests/mir-opt/pre-codegen/tuple_ord.demo_le_total.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/tuple_ord.demo_le_total.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `demo_le_total` after PreCodegen
+// MIR for `demo_le_total` after runtime-optimized
 
 fn demo_le_total(_1: &(u16, i16), _2: &(u16, i16)) -> bool {
     debug a => _1;
diff --git a/tests/mir-opt/pre-codegen/tuple_ord.rs b/tests/mir-opt/pre-codegen/tuple_ord.rs
index 74a919e54246..30064343d971 100644
--- a/tests/mir-opt/pre-codegen/tuple_ord.rs
+++ b/tests/mir-opt/pre-codegen/tuple_ord.rs
@@ -3,13 +3,13 @@
 
 #![crate_type = "lib"]
 
-// EMIT_MIR tuple_ord.demo_le_total.PreCodegen.after.mir
+// EMIT_MIR tuple_ord.demo_le_total.runtime-optimized.after.mir
 pub fn demo_le_total(a: &(u16, i16), b: &(u16, i16)) -> bool {
     // CHECK-LABEL: demo_le_total
     a <= b
 }
 
-// EMIT_MIR tuple_ord.demo_ge_partial.PreCodegen.after.mir
+// EMIT_MIR tuple_ord.demo_ge_partial.runtime-optimized.after.mir
 pub fn demo_ge_partial(a: &(f32, f32), b: &(f32, f32)) -> bool {
     // CHECK-LABEL: demo_ge_partial
     a >= b
diff --git a/tests/mir-opt/pre-codegen/two_unwrap_unchecked.rs b/tests/mir-opt/pre-codegen/two_unwrap_unchecked.rs
index 7b742b956ae5..7b7d7b44d0f2 100644
--- a/tests/mir-opt/pre-codegen/two_unwrap_unchecked.rs
+++ b/tests/mir-opt/pre-codegen/two_unwrap_unchecked.rs
@@ -3,7 +3,7 @@
 #![crate_type = "lib"]
 
 // EMIT_MIR two_unwrap_unchecked.two_unwrap_unchecked.GVN.diff
-// EMIT_MIR two_unwrap_unchecked.two_unwrap_unchecked.PreCodegen.after.mir
+// EMIT_MIR two_unwrap_unchecked.two_unwrap_unchecked.runtime-optimized.after.mir
 pub fn two_unwrap_unchecked(v: &Option<i32>) -> i32 {
     // CHECK-LABEL: fn two_unwrap_unchecked(
     // CHECK: [[DEREF_V:_.*]] = copy (*_1);
diff --git a/tests/mir-opt/pre-codegen/two_unwrap_unchecked.two_unwrap_unchecked.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/two_unwrap_unchecked.two_unwrap_unchecked.runtime-optimized.after.mir
similarity index 95%
rename from tests/mir-opt/pre-codegen/two_unwrap_unchecked.two_unwrap_unchecked.PreCodegen.after.mir
rename to tests/mir-opt/pre-codegen/two_unwrap_unchecked.two_unwrap_unchecked.runtime-optimized.after.mir
index 75543a53e286..9853713df439 100644
--- a/tests/mir-opt/pre-codegen/two_unwrap_unchecked.two_unwrap_unchecked.PreCodegen.after.mir
+++ b/tests/mir-opt/pre-codegen/two_unwrap_unchecked.two_unwrap_unchecked.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `two_unwrap_unchecked` after PreCodegen
+// MIR for `two_unwrap_unchecked` after runtime-optimized
 
 fn two_unwrap_unchecked(_1: &Option<i32>) -> i32 {
     debug v => _1;
diff --git a/tests/mir-opt/pre-codegen/vec_deref.rs b/tests/mir-opt/pre-codegen/vec_deref.rs
index 75edd9bd8794..806df39561b1 100644
--- a/tests/mir-opt/pre-codegen/vec_deref.rs
+++ b/tests/mir-opt/pre-codegen/vec_deref.rs
@@ -7,7 +7,7 @@
 // Added after it stopped inlining in a nightly; see
 // <https://github.com/rust-lang/rust/issues/123174>
 
-// EMIT_MIR vec_deref.vec_deref_to_slice.PreCodegen.after.mir
+// EMIT_MIR vec_deref.vec_deref_to_slice.runtime-optimized.after.mir
 pub fn vec_deref_to_slice(v: &Vec<u8>) -> &[u8] {
     v
 }
diff --git a/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-abort.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir
rename to tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-abort.mir
index 730aedf4f1a3..831a7d2a7b97 100644
--- a/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-abort.mir
+++ b/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-abort.mir
@@ -1,4 +1,4 @@
-// MIR for `vec_deref_to_slice` after PreCodegen
+// MIR for `vec_deref_to_slice` after runtime-optimized
 
 fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
     debug v => _1;
diff --git a/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-unwind.mir
similarity index 97%
rename from tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir
rename to tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-unwind.mir
index 730aedf4f1a3..831a7d2a7b97 100644
--- a/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.PreCodegen.after.panic-unwind.mir
+++ b/tests/mir-opt/pre-codegen/vec_deref.vec_deref_to_slice.runtime-optimized.after.panic-unwind.mir
@@ -1,4 +1,4 @@
-// MIR for `vec_deref_to_slice` after PreCodegen
+// MIR for `vec_deref_to_slice` after runtime-optimized
 
 fn vec_deref_to_slice(_1: &Vec<u8>) -> &[u8] {
     debug v => _1;
diff --git a/tests/mir-opt/remove_never_const.no_codegen.PreCodegen.after.mir b/tests/mir-opt/remove_never_const.no_codegen.runtime-optimized.after.mir
similarity index 68%
rename from tests/mir-opt/remove_never_const.no_codegen.PreCodegen.after.mir
rename to tests/mir-opt/remove_never_const.no_codegen.runtime-optimized.after.mir
index 695bf2336857..2eed35c83a70 100644
--- a/tests/mir-opt/remove_never_const.no_codegen.PreCodegen.after.mir
+++ b/tests/mir-opt/remove_never_const.no_codegen.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `no_codegen` after PreCodegen
+// MIR for `no_codegen` after runtime-optimized
 
 fn no_codegen() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/remove_never_const.rs b/tests/mir-opt/remove_never_const.rs
index 9307b8e76050..ab7f369e6802 100644
--- a/tests/mir-opt/remove_never_const.rs
+++ b/tests/mir-opt/remove_never_const.rs
@@ -11,7 +11,7 @@ impl<T> PrintName<T> {
     const VOID: ! = panic!();
 }
 
-// EMIT_MIR remove_never_const.no_codegen.PreCodegen.after.mir
+// EMIT_MIR remove_never_const.no_codegen.runtime-optimized.after.mir
 fn no_codegen<T>() {
     let _ = PrintName::<T>::VOID;
 }
diff --git a/tests/mir-opt/tls_access.main.PreCodegen.after.mir b/tests/mir-opt/tls_access.main.runtime-optimized.after.mir
similarity index 91%
rename from tests/mir-opt/tls_access.main.PreCodegen.after.mir
rename to tests/mir-opt/tls_access.main.runtime-optimized.after.mir
index 1c59e938423b..9154e75d3880 100644
--- a/tests/mir-opt/tls_access.main.PreCodegen.after.mir
+++ b/tests/mir-opt/tls_access.main.runtime-optimized.after.mir
@@ -1,4 +1,4 @@
-// MIR for `main` after PreCodegen
+// MIR for `main` after runtime-optimized
 
 fn main() -> () {
     let mut _0: ();
diff --git a/tests/mir-opt/tls_access.rs b/tests/mir-opt/tls_access.rs
index 465282e1a2e7..e70c44fd9ade 100644
--- a/tests/mir-opt/tls_access.rs
+++ b/tests/mir-opt/tls_access.rs
@@ -1,5 +1,5 @@
 //@ skip-filecheck
-// EMIT_MIR tls_access.main.PreCodegen.after.mir
+// EMIT_MIR tls_access.main.runtime-optimized.after.mir
 //@ compile-flags: -Zmir-opt-level=0
 
 #![feature(thread_local)]