Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};

Expand All @@ -38,14 +38,8 @@ pub(crate) fn mir_pass_transform_inline<'heap>(
environment: &mut Environment<'heap>,
diagnostics: &mut Vec<SuiteDiagnostic>,
) -> Result<(DefId, DefIdVec<Body<'heap>>, 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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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>,
Expand Down Expand Up @@ -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),
Expand All @@ -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
}
Expand All @@ -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 {
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions libs/@local/hashql/compiletest/src/suite/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -166,7 +166,7 @@ const SUITES: &[&dyn Suite] = &[
&MirPassTransformForwardSubstitution,
&MirPassTransformInline,
&MirPassTransformInstSimplify,
&MirPassTransformPreInlining,
&MirPassTransformPreInline,
&MirReifySuite,
&ParseSyntaxDumpSuite,
];
Expand Down
8 changes: 4 additions & 4 deletions libs/@local/hashql/mir/benches/transform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use hashql_mir::{
pass::{
GlobalTransformPass as _, GlobalTransformState, TransformPass as _,
transform::{
CfgSimplify, DeadStoreElimination, ForwardSubstitution, InstSimplify, PreInlining,
CfgSimplify, DeadStoreElimination, ForwardSubstitution, InstSimplify, PreInline,
},
},
};
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions libs/@local/hashql/mir/src/pass/transform/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand All @@ -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,
};
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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<A: Allocator> {
pub struct PreInline<A: Allocator> {
alloc: A,
}

impl<A: BumpAllocator> PreInlining<A> {
impl<A: BumpAllocator> PreInline<A> {
/// Creates a new pre-inlining pass with the given allocator.
///
/// The allocator is used for temporary data structures within sub-passes and is reset
Expand Down Expand Up @@ -180,7 +180,7 @@ impl<A: BumpAllocator> PreInlining<A> {

const MAX_ITERATIONS: usize = 16;

impl<'env, 'heap, A: BumpAllocator> GlobalTransformPass<'env, 'heap> for PreInlining<A> {
impl<'env, 'heap, A: BumpAllocator> GlobalTransformPass<'env, 'heap> for PreInline<A> {
#[expect(clippy::integer_division_remainder_used)]
fn run(
&mut self,
Expand Down
1 change: 1 addition & 0 deletions libs/@local/hashql/mir/tests/ui/pass/pre_inline/.spec.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
suite = "mir/pass/transform/pre-inline"

This file was deleted.

Loading