diff --git a/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_inline.rs b/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_inline.rs index 8d96f3e31f4..114e45b7436 100644 --- a/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_inline.rs +++ b/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_inline.rs @@ -20,12 +20,12 @@ use hashql_mir::{ use super::{ RunContext, Suite, SuiteDiagnostic, common::process_issues, - mir_pass_transform_pre_inlining::{ - MirRenderer, RenderContext, Stage, mir_pass_transform_pre_inlining, + mir_pass_transform_pre_inline::{ + MirRenderer, RenderContext, Stage, mir_pass_transform_pre_inline, }, }; use crate::suite::{ - mir_pass_transform_pre_inlining::{D2Renderer, TextRenderer}, + mir_pass_transform_pre_inline::{D2Renderer, TextRenderer}, mir_reify::{d2_output_enabled, mir_spawn_d2}, }; @@ -38,14 +38,8 @@ pub(crate) fn mir_pass_transform_inline<'heap>( environment: &mut Environment<'heap>, diagnostics: &mut Vec, ) -> Result<(DefId, DefIdVec>, Scratch), SuiteDiagnostic> { - let (root, mut bodies, mut scratch) = mir_pass_transform_pre_inlining( - heap, - expr, - interner, - &mut render, - environment, - diagnostics, - )?; + let (root, mut bodies, mut scratch) = + mir_pass_transform_pre_inline(heap, expr, interner, &mut render, environment, diagnostics)?; let mut context = MirContext { heap, diff --git a/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inlining.rs b/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inline.rs similarity index 95% rename from libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inlining.rs rename to libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inline.rs index e35e3e726b9..96bcaeca2ae 100644 --- a/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inlining.rs +++ b/libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inline.rs @@ -11,7 +11,7 @@ use hashql_mir::{ context::MirContext, def::{DefId, DefIdSlice, DefIdVec}, intern::Interner, - pass::{Changed, GlobalTransformPass as _, GlobalTransformState, transform::PreInlining}, + pass::{Changed, GlobalTransformPass as _, GlobalTransformState, transform::PreInline}, }; use super::{RunContext, Suite, SuiteDiagnostic, common::process_issues, mir_reify::mir_reify}; @@ -156,7 +156,7 @@ where } } -pub(crate) fn mir_pass_transform_pre_inlining<'heap>( +pub(crate) fn mir_pass_transform_pre_inline<'heap>( heap: &'heap Heap, expr: Expr<'heap>, interner: &Interner<'heap>, @@ -187,7 +187,7 @@ pub(crate) fn mir_pass_transform_pre_inlining<'heap>( }; let mut scratch = Scratch::new(); - let mut pass = PreInlining::new_in(&mut scratch); + let mut pass = PreInline::new_in(&mut scratch); let _: Changed = pass.run( &mut context, &mut GlobalTransformState::new_in(&bodies, heap), @@ -212,9 +212,9 @@ pub(crate) fn mir_pass_transform_pre_inlining<'heap>( Ok((root, bodies, scratch)) } -pub(crate) struct MirPassTransformPreInlining; +pub(crate) struct MirPassTransformPreInline; -impl Suite for MirPassTransformPreInlining { +impl Suite for MirPassTransformPreInline { fn priority(&self) -> usize { 1 } @@ -224,7 +224,7 @@ impl Suite for MirPassTransformPreInlining { } fn name(&self) -> &'static str { - "mir/pass/transform/pre-inlining" + "mir/pass/transform/pre-inline" } fn description(&self) -> &'static str { @@ -249,7 +249,7 @@ impl Suite for MirPassTransformPreInlining { let mut buffer = Vec::new(); let mut d2 = d2_output_enabled(self, suite_directives, reports).then(mir_spawn_d2); - mir_pass_transform_pre_inlining( + mir_pass_transform_pre_inline( heap, expr, &interner, diff --git a/libs/@local/hashql/compiletest/src/suite/mod.rs b/libs/@local/hashql/compiletest/src/suite/mod.rs index cc66b47a226..b55bc510778 100644 --- a/libs/@local/hashql/compiletest/src/suite/mod.rs +++ b/libs/@local/hashql/compiletest/src/suite/mod.rs @@ -27,7 +27,7 @@ mod mir_pass_transform_dse; mod mir_pass_transform_forward_substitution; mod mir_pass_transform_inline; mod mir_pass_transform_inst_simplify; -mod mir_pass_transform_pre_inlining; +mod mir_pass_transform_pre_inline; mod mir_reify; mod parse_syntax_dump; @@ -64,7 +64,7 @@ use self::{ mir_pass_transform_forward_substitution::MirPassTransformForwardSubstitution, mir_pass_transform_inline::MirPassTransformInline, mir_pass_transform_inst_simplify::MirPassTransformInstSimplify, - mir_pass_transform_pre_inlining::MirPassTransformPreInlining, mir_reify::MirReifySuite, + mir_pass_transform_pre_inline::MirPassTransformPreInline, mir_reify::MirReifySuite, parse_syntax_dump::ParseSyntaxDumpSuite, }; use crate::executor::TrialError; @@ -166,7 +166,7 @@ const SUITES: &[&dyn Suite] = &[ &MirPassTransformForwardSubstitution, &MirPassTransformInline, &MirPassTransformInstSimplify, - &MirPassTransformPreInlining, + &MirPassTransformPreInline, &MirReifySuite, &ParseSyntaxDumpSuite, ]; diff --git a/libs/@local/hashql/mir/benches/transform.rs b/libs/@local/hashql/mir/benches/transform.rs index d1c700dc4d4..773a270b921 100644 --- a/libs/@local/hashql/mir/benches/transform.rs +++ b/libs/@local/hashql/mir/benches/transform.rs @@ -24,7 +24,7 @@ use hashql_mir::{ pass::{ GlobalTransformPass as _, GlobalTransformState, TransformPass as _, transform::{ - CfgSimplify, DeadStoreElimination, ForwardSubstitution, InstSimplify, PreInlining, + CfgSimplify, DeadStoreElimination, ForwardSubstitution, InstSimplify, PreInline, }, }, }; @@ -505,7 +505,7 @@ fn pipeline(criterion: &mut Criterion) { run_bencher(bencher, create_linear_cfg, |context, body, scratch| { let bodies = IdSlice::from_raw_mut(core::slice::from_mut(body)); - PreInlining::new_in(scratch).run( + PreInline::new_in(scratch).run( context, &mut GlobalTransformState::new_in(bodies, context.heap), bodies, @@ -516,7 +516,7 @@ fn pipeline(criterion: &mut Criterion) { run_bencher(bencher, create_diamond_cfg, |context, body, scratch| { let bodies = IdSlice::from_raw_mut(core::slice::from_mut(body)); - PreInlining::new_in(scratch).run( + PreInline::new_in(scratch).run( context, &mut GlobalTransformState::new_in(bodies, context.heap), bodies, @@ -527,7 +527,7 @@ fn pipeline(criterion: &mut Criterion) { run_bencher(bencher, create_complex_cfg, |context, body, scratch| { let bodies = IdSlice::from_raw_mut(core::slice::from_mut(body)); - PreInlining::new_in(scratch).run( + PreInline::new_in(scratch).run( context, &mut GlobalTransformState::new_in(bodies, context.heap), bodies, diff --git a/libs/@local/hashql/mir/src/pass/transform/mod.rs b/libs/@local/hashql/mir/src/pass/transform/mod.rs index d404f7c0a43..656bbc9ce06 100644 --- a/libs/@local/hashql/mir/src/pass/transform/mod.rs +++ b/libs/@local/hashql/mir/src/pass/transform/mod.rs @@ -8,7 +8,7 @@ pub mod error; mod forward_substitution; mod inline; mod inst_simplify; -mod pre_inlining; +mod pre_inline; mod ssa_repair; pub use self::{ @@ -21,6 +21,6 @@ pub use self::{ forward_substitution::ForwardSubstitution, inline::{Inline, InlineConfig, InlineCostEstimationConfig, InlineHeuristicsConfig}, inst_simplify::InstSimplify, - pre_inlining::PreInlining, + pre_inline::PreInline, ssa_repair::SsaRepair, }; diff --git a/libs/@local/hashql/mir/src/pass/transform/pre_inlining.rs b/libs/@local/hashql/mir/src/pass/transform/pre_inline.rs similarity index 98% rename from libs/@local/hashql/mir/src/pass/transform/pre_inlining.rs rename to libs/@local/hashql/mir/src/pass/transform/pre_inline.rs index 77e0e176f73..3802df1e24e 100644 --- a/libs/@local/hashql/mir/src/pass/transform/pre_inlining.rs +++ b/libs/@local/hashql/mir/src/pass/transform/pre_inline.rs @@ -1,6 +1,6 @@ //! Pre-inlining optimization pass. //! -//! This module contains the [`PreInlining`] pass, which runs a fixpoint loop of local and global +//! This module contains the [`PreInline`] pass, which runs a fixpoint loop of local and global //! transformations to optimize MIR bodies before inlining occurs. use core::alloc::Allocator; @@ -45,11 +45,11 @@ use crate::{ /// This pass manages its own per-body change tracking and does not populate the caller-provided /// [`GlobalTransformState`]. Callers receive a combined [`Changed`] result indicating whether any /// body was modified. -pub struct PreInlining { +pub struct PreInline { alloc: A, } -impl PreInlining { +impl PreInline { /// Creates a new pre-inlining pass with the given allocator. /// /// The allocator is used for temporary data structures within sub-passes and is reset @@ -180,7 +180,7 @@ impl PreInlining { const MAX_ITERATIONS: usize = 16; -impl<'env, 'heap, A: BumpAllocator> GlobalTransformPass<'env, 'heap> for PreInlining { +impl<'env, 'heap, A: BumpAllocator> GlobalTransformPass<'env, 'heap> for PreInline { #[expect(clippy::integer_division_remainder_used)] fn run( &mut self, diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inline/.spec.toml b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/.spec.toml new file mode 100644 index 00000000000..c5b59336df8 --- /dev/null +++ b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/.spec.toml @@ -0,0 +1 @@ +suite = "mir/pass/transform/pre-inline" diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/basic-constant-folding.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/basic-constant-folding.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/basic-constant-folding.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/basic-constant-folding.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/basic-constant-folding.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/basic-constant-folding.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/basic-constant-folding.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/basic-constant-folding.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/chain-simplification.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/chain-simplification.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/chain-simplification.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/chain-simplification.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/chain-simplification.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/chain-simplification.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/chain-simplification.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/chain-simplification.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/closure-with-dead-branch.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/closure-with-dead-branch.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/closure-with-dead-branch.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/closure-with-dead-branch.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/closure-with-dead-branch.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/closure-with-dead-branch.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/closure-with-dead-branch.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/closure-with-dead-branch.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/dead-code-after-propagation.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/dead-code-after-propagation.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/dead-code-after-propagation.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/dead-code-after-propagation.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/dead-code-after-propagation.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/dead-code-after-propagation.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/dead-code-after-propagation.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/dead-code-after-propagation.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/inst-simplify-with-propagation.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/inst-simplify-with-propagation.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/inst-simplify-with-propagation.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/inst-simplify-with-propagation.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/inst-simplify-with-propagation.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/inst-simplify-with-propagation.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/inst-simplify-with-propagation.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/inst-simplify-with-propagation.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-if-constant.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-if-constant.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-if-constant.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-if-constant.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-if-constant.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-if-constant.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-if-constant.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-if-constant.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-let-cleanup.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-let-cleanup.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-let-cleanup.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-let-cleanup.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-let-cleanup.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-let-cleanup.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/nested-let-cleanup.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/nested-let-cleanup.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/thunk-with-dead-code.jsonc b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/thunk-with-dead-code.jsonc similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/thunk-with-dead-code.jsonc rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/thunk-with-dead-code.jsonc diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/thunk-with-dead-code.stdout b/libs/@local/hashql/mir/tests/ui/pass/pre_inline/thunk-with-dead-code.stdout similarity index 100% rename from libs/@local/hashql/mir/tests/ui/pass/pre_inlining/thunk-with-dead-code.stdout rename to libs/@local/hashql/mir/tests/ui/pass/pre_inline/thunk-with-dead-code.stdout diff --git a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/.spec.toml b/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/.spec.toml deleted file mode 100644 index e9b97f05fab..00000000000 --- a/libs/@local/hashql/mir/tests/ui/pass/pre_inlining/.spec.toml +++ /dev/null @@ -1 +0,0 @@ -suite = "mir/pass/transform/pre-inlining"