diff --git a/Cargo.lock b/Cargo.lock
index 9b2bcfd1e8b8c..ddb66892181d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3831,7 +3831,6 @@ dependencies = [
  "rustc_metadata",
  "rustc_middle",
  "rustc_mir_build",
- "rustc_mir_transform",
  "rustc_parse",
  "rustc_public",
  "rustc_resolve",
diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml
index 10e1b1987194a..aeb2063e76960 100644
--- a/compiler/rustc_driver_impl/Cargo.toml
+++ b/compiler/rustc_driver_impl/Cargo.toml
@@ -27,7 +27,6 @@ rustc_macros = { path = "../rustc_macros" }
 rustc_metadata = { path = "../rustc_metadata" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_mir_build = { path = "../rustc_mir_build" }
-rustc_mir_transform = { path = "../rustc_mir_transform" }
 rustc_parse = { path = "../rustc_parse" }
 rustc_public = { path = "../rustc_public", features = ["rustc_internal"] }
 rustc_resolve = { path = "../rustc_resolve" }
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
index aaac65721dfab..73de6cf94d5a8 100644
--- a/compiler/rustc_driver_impl/src/lib.rs
+++ b/compiler/rustc_driver_impl/src/lib.rs
@@ -6,6 +6,7 @@
 
 // tidy-alphabetical-start
 #![feature(decl_macro)]
+#![feature(file_buffered)]
 #![feature(panic_backtrace_config)]
 #![feature(panic_update_hook)]
 #![feature(trim_prefix_suffix)]
@@ -333,7 +334,7 @@ pub fn run_compiler(at_args: &[String], callbacks: &mut (dyn Callbacks + Send))
             }
 
             if tcx.sess.opts.output_types.contains_key(&OutputType::Mir) {
-                if let Err(error) = rustc_mir_transform::dump_mir::emit_mir(tcx) {
+                if let Err(error) = pretty::emit_mir(tcx) {
                     tcx.dcx().emit_fatal(CantEmitMIR { error });
                 }
             }
diff --git a/compiler/rustc_driver_impl/src/pretty.rs b/compiler/rustc_driver_impl/src/pretty.rs
index 3d3906637b8b1..426ead704ab83 100644
--- a/compiler/rustc_driver_impl/src/pretty.rs
+++ b/compiler/rustc_driver_impl/src/pretty.rs
@@ -2,6 +2,8 @@
 
 use std::cell::Cell;
 use std::fmt::Write;
+use std::fs::File;
+use std::io;
 
 use rustc_ast as ast;
 use rustc_ast_pretty::pprust as pprust_ast;
@@ -12,7 +14,7 @@ use rustc_middle::ty::{self, TyCtxt};
 use rustc_mir_build::thir::print::{thir_flat, thir_tree};
 use rustc_public::rustc_internal::pretty::write_smir_pretty;
 use rustc_session::Session;
-use rustc_session::config::{OutFileName, PpHirMode, PpMode, PpSourceMode};
+use rustc_session::config::{OutFileName, OutputType, PpHirMode, PpMode, PpSourceMode};
 use rustc_span::{FileName, Ident};
 use tracing::debug;
 
@@ -340,3 +342,21 @@ pub fn print<'tcx>(sess: &Session, ppm: PpMode, ex: PrintExtra<'tcx>) {
 
     write_or_print(&out, sess);
 }
+
+/// Implementation of `--emit=mir`.
+pub fn emit_mir(tcx: TyCtxt<'_>) -> io::Result<()> {
+    match tcx.output_filenames(()).path(OutputType::Mir) {
+        OutFileName::Stdout => {
+            let mut f = io::stdout();
+            write_mir_pretty(tcx, &mut f)?;
+        }
+        OutFileName::Real(path) => {
+            let mut f = File::create_buffered(&path)?;
+            write_mir_pretty(tcx, &mut f)?;
+            if tcx.sess.opts.json_artifact_notifications {
+                tcx.dcx().emit_artifact_notification(&path, "mir");
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/compiler/rustc_mir_transform/src/dump_mir.rs b/compiler/rustc_mir_transform/src/dump_mir.rs
deleted file mode 100644
index 50d4e9894e74a..0000000000000
--- a/compiler/rustc_mir_transform/src/dump_mir.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-//! This pass just dumps MIR at a specified point.
-
-use std::fs::File;
-use std::io;
-
-use rustc_middle::mir::{Body, write_mir_pretty};
-use rustc_middle::ty::TyCtxt;
-use rustc_session::config::{OutFileName, OutputType};
-
-pub(super) struct Marker(pub &'static str);
-
-impl<'tcx> crate::MirPass<'tcx> for Marker {
-    fn name(&self) -> &'static str {
-        self.0
-    }
-
-    fn run_pass(&self, _tcx: TyCtxt<'tcx>, _body: &mut Body<'tcx>) {}
-
-    fn is_required(&self) -> bool {
-        false
-    }
-}
-
-pub fn emit_mir(tcx: TyCtxt<'_>) -> io::Result<()> {
-    match tcx.output_filenames(()).path(OutputType::Mir) {
-        OutFileName::Stdout => {
-            let mut f = io::stdout();
-            write_mir_pretty(tcx, &mut f)?;
-        }
-        OutFileName::Real(path) => {
-            let mut f = File::create_buffered(&path)?;
-            write_mir_pretty(tcx, &mut f)?;
-            if tcx.sess.opts.json_artifact_notifications {
-                tcx.dcx().emit_artifact_notification(&path, "mir");
-            }
-        }
-    }
-    Ok(())
-}
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs
index 91dfffcf1a6a5..96033bea47e4a 100644
--- a/compiler/rustc_mir_transform/src/lib.rs
+++ b/compiler/rustc_mir_transform/src/lib.rs
@@ -2,7 +2,6 @@
 #![feature(box_patterns)]
 #![feature(const_type_name)]
 #![feature(cow_is_borrowed)]
-#![feature(file_buffered)]
 #![feature(impl_trait_in_assoc_type)]
 #![feature(iterator_try_collect)]
 #![feature(try_blocks)]
@@ -91,8 +90,6 @@ macro_rules! declare_passes {
 
         static PASS_NAMES: LazyLock<FxIndexSet<&str>> = LazyLock::new(|| {
             let mut set = FxIndexSet::default();
-            // Fake marker pass
-            set.insert("PreCodegen");
             $(
                 $(
                     set.extend(pass_names!($mod_name : $pass_name $( { $($ident),* } )? ));
@@ -145,7 +142,6 @@ declare_passes! {
     };
     mod deref_separator : Derefer;
     mod dest_prop : DestinationPropagation;
-    pub mod dump_mir : Marker;
     mod early_otherwise_branch : EarlyOtherwiseBranch;
     mod erase_deref_temps : EraseDerefTemps;
     mod elaborate_box_derefs : ElaborateBoxDerefs;
@@ -771,8 +767,6 @@ pub(crate) fn run_optimization_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'
             // Cleanup for human readability, off by default.
             &prettify::ReorderBasicBlocks,
             &prettify::ReorderLocals,
-            // Dump the end result for testing and debugging purposes.
-            &dump_mir::Marker("PreCodegen"),
         ],
         Some(MirPhase::Runtime(RuntimePhase::Optimized)),
         optimizations,
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 c7c26d6351ad2..c7217e31a7f96 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 2426cb7d1a759..406ecc7aeabb9 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 cd226eb0c1e21..c193cfe394996 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 44a8b7342b2e4..458261f1fb977 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 9a6403006744d..d1703f23f3a10 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-abort.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-abort.mir
rename to tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-abort.mir
index 2b90410f95d96..86eda4942a7cb 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-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-unwind.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-unwind.mir
rename to tests/mir-opt/const_prop/control_flow_simplification.hello.runtime-optimized.after.panic-unwind.mir
index 2b90410f95d96..86eda4942a7cb 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-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 8ec630d6f48d0..640579a3ebeca 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 66fd61cc3aee9..6d429a50ce581 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 f9b07a59de9c3..8e5b3c6676391 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 c5293aa73e55b..6459e526f1acc 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 d0772e51a07fe..f6a6e86bff26a 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 39ad4f1010b79..c8703ce515989 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 b008df32726b5..9ce4e5f0b67e2 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 a20b13dc1149d..167b4beecdfbe 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 0fc7c4b7947e2..d185a4365f905 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 0fc7c4b7947e2..d185a4365f905 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 bef7fa7b1df75..cb51c0e6bcef6 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 bef7fa7b1df75..cb51c0e6bcef6 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 13c76c5bb53e4..f5e48a71ae197 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 e0fcd5c92247c..32694fdc9f404 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 e0fcd5c92247c..32694fdc9f404 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.32bit.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.32bit.panic-abort.mir
rename to tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.32bit.panic-abort.mir
index f3c83f62edf61..14aac21eabdd6 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.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 0e55df24cc57b..1a4ddd0370234 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.64bit.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.64bit.panic-abort.mir
rename to tests/mir-opt/issues/issue_59352.num_to_digit.runtime-optimized.after.64bit.panic-abort.mir
index f3c83f62edf61..14aac21eabdd6 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.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 0e55df24cc57b..1a4ddd0370234 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 516a712f1db16..4af37bda62f8b 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 cc01f51973c84..7477ff32d5542 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 d5847b95f7328..2bb5909e6ab4b 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 258be57f67c91..d48e1b603664a 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 258be57f67c91..d48e1b603664a 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 e367813450830..c76008171a2a4 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 e367813450830..c76008171a2a4 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 06d7f222df14c..03ea7411284b3 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 06d7f222df14c..03ea7411284b3 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 0bfe34eb37618..ee60b4d9a7ab9 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 @@ pub unsafe fn eq_ipv4<T: Copy>(a: &[u8; 4], b: &[u8; 4]) -> bool {
     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 9b77bdb7cf616..8cc922d453d2b 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 9b3e28ab5b8ea..1312b1b4e972f 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 72d52701d112d..36d15af8b29bd 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 8c359bda143a1..d0ad5d3cf943e 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 c97c9b45d6ad5..9a7a230fdb48b 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 c97c9b45d6ad5..9a7a230fdb48b 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 dfbc0f4a1108d..690b35430c747 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 dc7567b57e70a..1ffe006d2887b 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 dc7567b57e70a..1ffe006d2887b 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 7b681946bee1e..073baaa75be92 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 a0137b23ec4f4..9ada3691f3a20 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 426c114dfc2ab..f24a8e41b7db5 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 f73c64a9b0929..6bcb730be7f14 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 1e6e2ee1b8b73..18069a37ed90d 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 76bb49bc9c1b3..ef907c83c10e0 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 00f24754d5913..3c8d07c89c8a0 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 66b51ad48e7a5..b1bbceae330c7 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 3c1e96fa47484..0d8113e8b86f7 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 f089e9ad960bd..86ef69b9a4cd5 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 4a2127178fb0b..655305851b7e3 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 5abe9fa43a5d2..30b6480391f51 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 17a873a1c05e7..a07f299fa29da 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 01eb41401da0a..1385663e271d1 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 fb16da720be4e..ef192696afdbb 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 257b43050c3c0..928c987b3476e 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 a67756c22d466..ee625603bcd9c 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 5993bd79d274c..e629576e52b55 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 1d6a884cee443..82851509d666f 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 9fc8da3a11204..85f7e76eea8c6 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 29cc54150764d..cca704662dd70 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 66d96021aa9be..004de976667d3 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 2dcba6195f713..5df51f2b3f253 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 9275643001501..8384d563e52d2 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 9275643001501..8384d563e52d2 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 27f6d77305ca6..3d24aa8c349e7 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 27f6d77305ca6..3d24aa8c349e7 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 3d340eb103a7b..732223c4054ad 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 004fd74da1442..7c0cede85a4ca 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 004fd74da1442..7c0cede85a4ca 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 004fd74da1442..7c0cede85a4ca 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 004fd74da1442..7c0cede85a4ca 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 8f28bc712b4b0..095f87723e1c1 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 58e59686de7f9..07bc4795788ea 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 d08aa8456e7f9..97ac547c6fea1 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 1109da31d958a..0a5fa6daa9285 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 2768c2bb2d7b8..7c35963169d7c 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 42200e0b87fcd..32a859d5c406b 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 6921827c599b4..b3d38472a6a72 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 49b373afdd380..cd146079c6328 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 c65b94a3e2a23..f7c294bc1feb2 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 281595f165bed..ae2d63fe67360 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 5d22791eaa899..a49688ae891de 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 3a202728ea913..7a3d2dd6d095c 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 1822739da2c7e..621f4249a67d1 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 2d6f82f6137fb..12e25e96d9232 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 42de229657189..e354ab9fbb100 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 c10f3c429627a..187917c67872a 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 c10f3c429627a..187917c67872a 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 958a06bcd34f8..5475e4b76ef99 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 958a06bcd34f8..5475e4b76ef99 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 750a7907c15ef..d2474d954dc12 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 475b230b46525..b86fe21716fc9 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 9020cf1ef37f2..6361b9f9be6a2 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 681dadff302b9..1be0cd30068eb 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 681dadff302b9..1be0cd30068eb 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 681dadff302b9..1be0cd30068eb 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 681dadff302b9..1be0cd30068eb 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 6fb71bda9b441..dd94475bd4c9d 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 b29662dfa613b..5a4bdce1eb230 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 b29662dfa613b..5a4bdce1eb230 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 55f44d954d806..26ccbb7d89fd1 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 b42aea38d3e35..c9cb25b647ef5 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 b9bf78a1d6ecf..96d4b412efba1 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 a6dad00bbdb19..1b53ef91b342e 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 a6dad00bbdb19..1b53ef91b342e 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 cb7f15657463b..8d026782963fe 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 cb7f15657463b..8d026782963fe 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 1e936222a2dd3..ddeec5d79c657 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 d107a37da0fe0..47c78d4e80138 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 207dde62f7d61..5dfcba18be02f 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 63d9b1d1d0038..5e1291f71663d 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 33c9b492c5f1a..2e82343e44431 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 13969e5d23858..aaf54ccf7e9f7 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 98cd58284dfaf..127912b37da63 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 55caea9d8f96d..6cd78c56db995 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 55caea9d8f96d..6cd78c56db995 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 856d57cd6e4f8..79a97f0ad2c1e 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 876fa96dfb6fe..273f7bfafa2c2 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 ff0396b168f8b..26648a3173d67 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 f0d7b51a64397..8f3ea6f0ae280 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 @@ where
     }
 }
 
-// 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 a6f4a52075dff..053830b3e47f9 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 690325d87936d..d4ba112510aa3 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 05549e857c1a7..47ea0fb694c86 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 5dac535d195ad..52bdd0f67825b 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 ebe8b23354be7..8ab6ef6109f01 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 ebe8b23354be7..8ab6ef6109f01 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-unwind.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-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-abort.mir
index 67194ea7225fd..9ce88f4bd299a 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-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-abort.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-abort.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.runtime-optimized.after.panic-unwind.mir
index 67194ea7225fd..9ce88f4bd299a 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-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 ed82be1bac33b..1d8c44fa4e2a5 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 cf2b8d664708c..e66ee3581da27 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 81e60b8ec2ca7..a7984bfeb748f 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 c0fdc839608da..de419769fcf29 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-unwind.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-unwind.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-abort.mir
index 21bc3bcc07c40..276fe6a9f6791 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-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-abort.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-abort.mir
rename to tests/mir-opt/pre-codegen/slice_index.slice_ptr_get_unchecked_range.runtime-optimized.after.panic-unwind.mir
index 21bc3bcc07c40..276fe6a9f6791 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-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 575659e6d0ded..fc254be264748 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 07522650e2939..034416c173b49 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 f41dbd567003e..5f8fefc57c412 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 e06c093e3a5bb..3bcd93396f614 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 43e2d24674d96..e817d9cd87289 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 59aa46bd8cc30..b780f686570f8 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 1f96a8e14a5b2..bd0e3a025f425 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 84d3c68aba0d1..d0b125be28d4f 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 f9049c79803ea..fa353a94256bc 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 04f78fa3e7e3b..9228a51ab9193 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 04f78fa3e7e3b..9228a51ab9193 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 94471cbb157c5..d9c8fb05ec0a0 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 94471cbb157c5..d9c8fb05ec0a0 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 70e21435cc18f..7596384ac4a89 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 70e21435cc18f..7596384ac4a89 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 79aa9c5ae1e36..d8b15701bbd9b 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 79aa9c5ae1e36..d8b15701bbd9b 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 51aad44579dae..97258ee26bb00 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 5fc28fddedf8b..80ad68c8a48bb 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 6d6b1775d05b0..a69276731d499 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 100eebf0c2448..87d0f684fdbbb 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 4050338e2418c..44eb659b39b44 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 c0500fbae06fb..2c80439bcec7d 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 4825e6079c2e3..d8369e839b6ba 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_of_array(x: [u32; 4]) -> [u32; 2] {
 #[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 6035f245c4977..6780fa4d3ea29 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 aec51bfd8d745..b74470181143a 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 876f86fe52ba7..30c557e981f01 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 29bfe962974cf..079a57c916902 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 7678c92a1f0c6..e4dd5225fe029 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 74a919e54246c..30064343d971d 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 7b742b956ae5c..7b7d7b44d0f2b 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 75543a53e2864..9853713df439b 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 75edd9bd87948..806df39561b13 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 730aedf4f1a3c..831a7d2a7b974 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 730aedf4f1a3c..831a7d2a7b974 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 695bf23368573..2eed35c83a708 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 9307b8e760508..ab7f369e68029 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 1c59e938423b7..9154e75d3880f 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 465282e1a2e7a..e70c44fd9aded 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)]