Skip to content

Commit bdb020e

Browse files
authored
BE-268: HashQL: Rename PreInlining to PreInline for consistency (#8238)
1 parent 843c87a commit bdb020e

24 files changed

+26
-32
lines changed

libs/@local/hashql/compiletest/src/suite/mir_pass_transform_inline.rs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ use hashql_mir::{
2020
use super::{
2121
RunContext, Suite, SuiteDiagnostic,
2222
common::process_issues,
23-
mir_pass_transform_pre_inlining::{
24-
MirRenderer, RenderContext, Stage, mir_pass_transform_pre_inlining,
23+
mir_pass_transform_pre_inline::{
24+
MirRenderer, RenderContext, Stage, mir_pass_transform_pre_inline,
2525
},
2626
};
2727
use crate::suite::{
28-
mir_pass_transform_pre_inlining::{D2Renderer, TextRenderer},
28+
mir_pass_transform_pre_inline::{D2Renderer, TextRenderer},
2929
mir_reify::{d2_output_enabled, mir_spawn_d2},
3030
};
3131

@@ -38,14 +38,8 @@ pub(crate) fn mir_pass_transform_inline<'heap>(
3838
environment: &mut Environment<'heap>,
3939
diagnostics: &mut Vec<SuiteDiagnostic>,
4040
) -> Result<(DefId, DefIdVec<Body<'heap>>, Scratch), SuiteDiagnostic> {
41-
let (root, mut bodies, mut scratch) = mir_pass_transform_pre_inlining(
42-
heap,
43-
expr,
44-
interner,
45-
&mut render,
46-
environment,
47-
diagnostics,
48-
)?;
41+
let (root, mut bodies, mut scratch) =
42+
mir_pass_transform_pre_inline(heap, expr, interner, &mut render, environment, diagnostics)?;
4943

5044
let mut context = MirContext {
5145
heap,

libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inlining.rs renamed to libs/@local/hashql/compiletest/src/suite/mir_pass_transform_pre_inline.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use hashql_mir::{
1111
context::MirContext,
1212
def::{DefId, DefIdSlice, DefIdVec},
1313
intern::Interner,
14-
pass::{Changed, GlobalTransformPass as _, GlobalTransformState, transform::PreInlining},
14+
pass::{Changed, GlobalTransformPass as _, GlobalTransformState, transform::PreInline},
1515
};
1616

1717
use super::{RunContext, Suite, SuiteDiagnostic, common::process_issues, mir_reify::mir_reify};
@@ -156,7 +156,7 @@ where
156156
}
157157
}
158158

159-
pub(crate) fn mir_pass_transform_pre_inlining<'heap>(
159+
pub(crate) fn mir_pass_transform_pre_inline<'heap>(
160160
heap: &'heap Heap,
161161
expr: Expr<'heap>,
162162
interner: &Interner<'heap>,
@@ -187,7 +187,7 @@ pub(crate) fn mir_pass_transform_pre_inlining<'heap>(
187187
};
188188
let mut scratch = Scratch::new();
189189

190-
let mut pass = PreInlining::new_in(&mut scratch);
190+
let mut pass = PreInline::new_in(&mut scratch);
191191
let _: Changed = pass.run(
192192
&mut context,
193193
&mut GlobalTransformState::new_in(&bodies, heap),
@@ -212,9 +212,9 @@ pub(crate) fn mir_pass_transform_pre_inlining<'heap>(
212212
Ok((root, bodies, scratch))
213213
}
214214

215-
pub(crate) struct MirPassTransformPreInlining;
215+
pub(crate) struct MirPassTransformPreInline;
216216

217-
impl Suite for MirPassTransformPreInlining {
217+
impl Suite for MirPassTransformPreInline {
218218
fn priority(&self) -> usize {
219219
1
220220
}
@@ -224,7 +224,7 @@ impl Suite for MirPassTransformPreInlining {
224224
}
225225

226226
fn name(&self) -> &'static str {
227-
"mir/pass/transform/pre-inlining"
227+
"mir/pass/transform/pre-inline"
228228
}
229229

230230
fn description(&self) -> &'static str {
@@ -249,7 +249,7 @@ impl Suite for MirPassTransformPreInlining {
249249
let mut buffer = Vec::new();
250250
let mut d2 = d2_output_enabled(self, suite_directives, reports).then(mir_spawn_d2);
251251

252-
mir_pass_transform_pre_inlining(
252+
mir_pass_transform_pre_inline(
253253
heap,
254254
expr,
255255
&interner,

libs/@local/hashql/compiletest/src/suite/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mod mir_pass_transform_dse;
2727
mod mir_pass_transform_forward_substitution;
2828
mod mir_pass_transform_inline;
2929
mod mir_pass_transform_inst_simplify;
30-
mod mir_pass_transform_pre_inlining;
30+
mod mir_pass_transform_pre_inline;
3131
mod mir_reify;
3232
mod parse_syntax_dump;
3333

@@ -64,7 +64,7 @@ use self::{
6464
mir_pass_transform_forward_substitution::MirPassTransformForwardSubstitution,
6565
mir_pass_transform_inline::MirPassTransformInline,
6666
mir_pass_transform_inst_simplify::MirPassTransformInstSimplify,
67-
mir_pass_transform_pre_inlining::MirPassTransformPreInlining, mir_reify::MirReifySuite,
67+
mir_pass_transform_pre_inline::MirPassTransformPreInline, mir_reify::MirReifySuite,
6868
parse_syntax_dump::ParseSyntaxDumpSuite,
6969
};
7070
use crate::executor::TrialError;
@@ -166,7 +166,7 @@ const SUITES: &[&dyn Suite] = &[
166166
&MirPassTransformForwardSubstitution,
167167
&MirPassTransformInline,
168168
&MirPassTransformInstSimplify,
169-
&MirPassTransformPreInlining,
169+
&MirPassTransformPreInline,
170170
&MirReifySuite,
171171
&ParseSyntaxDumpSuite,
172172
];

libs/@local/hashql/mir/benches/transform.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use hashql_mir::{
2424
pass::{
2525
GlobalTransformPass as _, GlobalTransformState, TransformPass as _,
2626
transform::{
27-
CfgSimplify, DeadStoreElimination, ForwardSubstitution, InstSimplify, PreInlining,
27+
CfgSimplify, DeadStoreElimination, ForwardSubstitution, InstSimplify, PreInline,
2828
},
2929
},
3030
};
@@ -505,7 +505,7 @@ fn pipeline(criterion: &mut Criterion) {
505505
run_bencher(bencher, create_linear_cfg, |context, body, scratch| {
506506
let bodies = IdSlice::from_raw_mut(core::slice::from_mut(body));
507507

508-
PreInlining::new_in(scratch).run(
508+
PreInline::new_in(scratch).run(
509509
context,
510510
&mut GlobalTransformState::new_in(bodies, context.heap),
511511
bodies,
@@ -516,7 +516,7 @@ fn pipeline(criterion: &mut Criterion) {
516516
run_bencher(bencher, create_diamond_cfg, |context, body, scratch| {
517517
let bodies = IdSlice::from_raw_mut(core::slice::from_mut(body));
518518

519-
PreInlining::new_in(scratch).run(
519+
PreInline::new_in(scratch).run(
520520
context,
521521
&mut GlobalTransformState::new_in(bodies, context.heap),
522522
bodies,
@@ -527,7 +527,7 @@ fn pipeline(criterion: &mut Criterion) {
527527
run_bencher(bencher, create_complex_cfg, |context, body, scratch| {
528528
let bodies = IdSlice::from_raw_mut(core::slice::from_mut(body));
529529

530-
PreInlining::new_in(scratch).run(
530+
PreInline::new_in(scratch).run(
531531
context,
532532
&mut GlobalTransformState::new_in(bodies, context.heap),
533533
bodies,

libs/@local/hashql/mir/src/pass/transform/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub mod error;
88
mod forward_substitution;
99
mod inline;
1010
mod inst_simplify;
11-
mod pre_inlining;
11+
mod pre_inline;
1212
mod ssa_repair;
1313

1414
pub use self::{
@@ -21,6 +21,6 @@ pub use self::{
2121
forward_substitution::ForwardSubstitution,
2222
inline::{Inline, InlineConfig, InlineCostEstimationConfig, InlineHeuristicsConfig},
2323
inst_simplify::InstSimplify,
24-
pre_inlining::PreInlining,
24+
pre_inline::PreInline,
2525
ssa_repair::SsaRepair,
2626
};

libs/@local/hashql/mir/src/pass/transform/pre_inlining.rs renamed to libs/@local/hashql/mir/src/pass/transform/pre_inline.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Pre-inlining optimization pass.
22
//!
3-
//! This module contains the [`PreInlining`] pass, which runs a fixpoint loop of local and global
3+
//! This module contains the [`PreInline`] pass, which runs a fixpoint loop of local and global
44
//! transformations to optimize MIR bodies before inlining occurs.
55
66
use core::alloc::Allocator;
@@ -45,11 +45,11 @@ use crate::{
4545
/// This pass manages its own per-body change tracking and does not populate the caller-provided
4646
/// [`GlobalTransformState`]. Callers receive a combined [`Changed`] result indicating whether any
4747
/// body was modified.
48-
pub struct PreInlining<A: Allocator> {
48+
pub struct PreInline<A: Allocator> {
4949
alloc: A,
5050
}
5151

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

181181
const MAX_ITERATIONS: usize = 16;
182182

183-
impl<'env, 'heap, A: BumpAllocator> GlobalTransformPass<'env, 'heap> for PreInlining<A> {
183+
impl<'env, 'heap, A: BumpAllocator> GlobalTransformPass<'env, 'heap> for PreInline<A> {
184184
#[expect(clippy::integer_division_remainder_used)]
185185
fn run(
186186
&mut self,
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
suite = "mir/pass/transform/pre-inline"

libs/@local/hashql/mir/tests/ui/pass/pre_inlining/basic-constant-folding.jsonc renamed to libs/@local/hashql/mir/tests/ui/pass/pre_inline/basic-constant-folding.jsonc

File renamed without changes.

libs/@local/hashql/mir/tests/ui/pass/pre_inlining/basic-constant-folding.stdout renamed to libs/@local/hashql/mir/tests/ui/pass/pre_inline/basic-constant-folding.stdout

File renamed without changes.

libs/@local/hashql/mir/tests/ui/pass/pre_inlining/chain-simplification.jsonc renamed to libs/@local/hashql/mir/tests/ui/pass/pre_inline/chain-simplification.jsonc

File renamed without changes.

0 commit comments

Comments
 (0)