tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

phase29ao(p50): compose pattern3 if-phi via v1 value-join

Browse Source
This commit is contained in:
tomoaki
2025-12-30 20:52:21 +09:00
parent 6e733cf25c
commit 85103dd40c
8 changed files with 197 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mir/builder/control_flow/plan/composer/coreloop_gates.rs
View File

@ -28,3 +28,7 @@ pub(super) fn pattern2_value_join_gate(facts: &CanonicalLoopFacts) -> bool {
pub(super) fn pattern5_value_join_gate(facts: &CanonicalLoopFacts) -> bool {
coreloop_value_join_gate(facts) && exit_kinds_allow_return_only(facts)
}
pub(super) fn pattern3_value_join_gate(facts: &CanonicalLoopFacts) -> bool {
coreloop_value_join_gate(facts) && exit_kinds_allow_return_only(facts)
}

173
src/mir/builder/control_flow/plan/composer/coreloop_v1.rs
View File

@ -1,14 +1,14 @@
use crate::mir::builder::control_flow::joinir::patterns::router::LoopPatternContext;
use crate::mir::builder::control_flow::plan::composer::coreloop_gates::{
coreloop_value_join_gate, exit_kinds_allow_return_only, pattern2_value_join_gate,
pattern5_value_join_gate,
pattern3_value_join_gate, pattern5_value_join_gate,
};
use crate::mir::builder::control_flow::plan::facts::scan_shapes::SplitScanShape;
use crate::mir::builder::control_flow::plan::normalize::CanonicalLoopFacts;
use crate::mir::builder::control_flow::plan::normalizer::PlanNormalizer;
use crate::mir::builder::control_flow::plan::{
CorePlan, Pattern2BreakPlan, Pattern2PromotionHint, Pattern5InfiniteEarlyExitPlan,
SplitScanPlan,
CorePlan, Pattern2BreakPlan, Pattern2PromotionHint, Pattern3IfPhiPlan,
Pattern5InfiniteEarlyExitPlan, SplitScanPlan,
};
use crate::mir::builder::MirBuilder;
@ -25,6 +25,9 @@ pub(in crate::mir::builder) fn try_compose_core_loop_v1(
)? {
return Ok(Some(core));
}
if let Some(core) = try_compose_core_loop_v1_pattern3_ifphi(builder, facts, ctx)? {
return Ok(Some(core));
}
try_compose_core_loop_v1_split_scan(builder, facts, ctx)
}
@ -117,6 +120,32 @@ pub(in crate::mir::builder) fn try_compose_core_loop_v1_pattern5_infinite_early_
Ok(Some(core))
}
pub(in crate::mir::builder) fn try_compose_core_loop_v1_pattern3_ifphi(
builder: &mut MirBuilder,
facts: &CanonicalLoopFacts,
ctx: &LoopPatternContext,
) -> Result<Option<CorePlan>, String> {
if !pattern3_value_join_gate(facts) {
return Ok(None);
}
let Some(pattern3) = facts.facts.pattern3_ifphi.as_ref() else {
return Ok(None);
};
let plan = Pattern3IfPhiPlan {
loop_var: pattern3.loop_var.clone(),
carrier_var: pattern3.carrier_var.clone(),
condition: pattern3.condition.clone(),
if_condition: pattern3.if_condition.clone(),
then_update: pattern3.then_update.clone(),
else_update: pattern3.else_update.clone(),
loop_increment: pattern3.loop_increment.clone(),
};
let core = PlanNormalizer::normalize_pattern3_if_phi(builder, plan, ctx)?;
Ok(Some(core))
}
#[cfg(test)]
mod tests {
use super::try_compose_core_loop_v1;
@ -126,6 +155,7 @@ mod tests {
ValueJoinFacts,
};
use crate::mir::builder::control_flow::plan::facts::loop_facts::LoopFacts;
use crate::mir::builder::control_flow::plan::facts::pattern3_ifphi_facts::Pattern3IfPhiFacts;
use crate::mir::builder::control_flow::plan::facts::pattern5_infinite_early_exit_facts::Pattern5InfiniteEarlyExitFacts;
use crate::mir::builder::control_flow::plan::facts::pattern2_break_facts::Pattern2BreakFacts;
use crate::mir::builder::control_flow::plan::facts::scan_shapes::{
@ -537,4 +567,141 @@ mod tests {
try_compose_core_loop_v1(&mut builder, &canonical, &ctx).expect("Ok");
assert!(composed.is_none());
}
#[test]
fn coreloop_v1_composes_pattern3_with_value_join() {
let condition = ASTNode::BinaryOp {
operator: BinaryOperator::Less,
left: Box::new(v("i")),
right: Box::new(lit_int(3)),
span: Span::unknown(),
};
let if_condition = ASTNode::BinaryOp {
operator: BinaryOperator::Greater,
left: Box::new(v("i")),
right: Box::new(lit_int(0)),
span: Span::unknown(),
};
let then_update = ASTNode::BinaryOp {
operator: BinaryOperator::Add,
left: Box::new(v("sum")),
right: Box::new(lit_int(1)),
span: Span::unknown(),
};
let else_update = ASTNode::BinaryOp {
operator: BinaryOperator::Add,
left: Box::new(v("sum")),
right: Box::new(lit_int(0)),
span: Span::unknown(),
};
let loop_increment = ASTNode::BinaryOp {
operator: BinaryOperator::Add,
left: Box::new(v("i")),
right: Box::new(lit_int(1)),
span: Span::unknown(),
};
let features = LoopFeatureFacts {
value_join: Some(ValueJoinFacts { needed: true }),
..LoopFeatureFacts::default()
};
let facts = LoopFacts {
condition_shape: ConditionShape::Unknown,
step_shape: StepShape::Unknown,
skeleton: SkeletonFacts {
kind: SkeletonKind::Loop,
},
features,
scan_with_init: None,
split_scan: None,
pattern1_simplewhile: None,
pattern3_ifphi: Some(Pattern3IfPhiFacts {
loop_var: "i".to_string(),
carrier_var: "sum".to_string(),
condition: condition.clone(),
if_condition,
then_update,
else_update,
loop_increment,
}),
pattern4_continue: None,
pattern5_infinite_early_exit: None,
pattern8_bool_predicate_scan: None,
pattern9_accum_const_loop: None,
pattern2_break: None,
pattern2_loopbodylocal: None,
};
let canonical = canonicalize_loop_facts(facts);
let mut builder = MirBuilder::new();
builder.enter_function_for_test("coreloop_v1_pattern3".to_string());
let i_val = builder.alloc_typed(MirType::Integer);
let sum_val = builder.alloc_typed(MirType::Integer);
builder
.variable_ctx
.variable_map
.insert("i".to_string(), i_val);
builder
.variable_ctx
.variable_map
.insert("sum".to_string(), sum_val);
let ctx =
LoopPatternContext::new(&condition, &[], "coreloop_v1_pattern3", false, false);
let composed =
try_compose_core_loop_v1(&mut builder, &canonical, &ctx).expect("Ok");
assert!(matches!(composed, Some(crate::mir::builder::control_flow::plan::CorePlan::Loop(_))));
}
#[test]
fn coreloop_v1_rejects_pattern3_with_cleanup() {
let condition = ASTNode::Literal {
value: LiteralValue::Bool(true),
span: Span::unknown(),
};
let mut kinds_present = BTreeSet::new();
kinds_present.insert(CleanupKindFacts::Return);
let features = LoopFeatureFacts {
cleanup: Some(CleanupFacts { kinds_present }),
value_join: Some(ValueJoinFacts { needed: true }),
..LoopFeatureFacts::default()
};
let facts = LoopFacts {
condition_shape: ConditionShape::Unknown,
step_shape: StepShape::Unknown,
skeleton: SkeletonFacts {
kind: SkeletonKind::Loop,
},
features,
scan_with_init: None,
split_scan: None,
pattern1_simplewhile: None,
pattern3_ifphi: Some(Pattern3IfPhiFacts {
loop_var: "i".to_string(),
carrier_var: "sum".to_string(),
condition: condition.clone(),
if_condition: condition.clone(),
then_update: lit_int(0),
else_update: lit_int(0),
loop_increment: lit_int(0),
}),
pattern4_continue: None,
pattern5_infinite_early_exit: None,
pattern8_bool_predicate_scan: None,
pattern9_accum_const_loop: None,
pattern2_break: None,
pattern2_loopbodylocal: None,
};
let canonical = canonicalize_loop_facts(facts);
let mut builder = MirBuilder::new();
builder.enter_function_for_test("coreloop_v1_pattern3_cleanup".to_string());
let ctx = LoopPatternContext::new(
&condition,
&[],
"coreloop_v1_pattern3_cleanup",
false,
false,
);
let composed =
try_compose_core_loop_v1(&mut builder, &canonical, &ctx).expect("Ok");
assert!(composed.is_none());
}
}

18
src/mir/builder/control_flow/plan/composer/shadow_adopt.rs
View File

@ -5,7 +5,8 @@ use super::coreloop_v0::{
};
use super::coreloop_v1::try_compose_core_loop_v1;
use super::coreloop_v1::{
try_compose_core_loop_v1_pattern2_break, try_compose_core_loop_v1_pattern5_infinite_early_exit,
try_compose_core_loop_v1_pattern2_break, try_compose_core_loop_v1_pattern3_ifphi,
try_compose_core_loop_v1_pattern5_infinite_early_exit,
};
use super::PlanNormalizer;
use crate::mir::builder::control_flow::joinir::patterns::router::LoopPatternContext;
@ -165,7 +166,12 @@ pub(in crate::mir::builder) fn try_release_adopt_core_plan_for_pattern3_ifphi(
return Ok(None);
}
match compose_coreplan_for_pattern3_ifphi(builder, facts, ctx) {
let composed = if facts.value_join_needed {
try_compose_core_loop_v1_pattern3_ifphi(builder, facts, ctx)
} else {
compose_coreplan_for_pattern3_ifphi(builder, facts, ctx)
};
match composed {
Ok(Some(core)) => Ok(Some(core)),
Ok(None) | Err(_) => Ok(None),
}
@ -350,8 +356,12 @@ pub(in crate::mir::builder) fn try_shadow_adopt_core_plan(
if facts.facts.pattern3_ifphi.is_none() {
return Err("pattern3 strict/dev adopt failed: facts mismatch".to_string());
}
let core_plan = compose_coreplan_for_pattern3_ifphi(builder, facts, ctx)?
.ok_or_else(|| "pattern3 strict/dev adopt failed: compose rejected".to_string())?;
let core_plan = if facts.value_join_needed {
try_compose_core_loop_v1_pattern3_ifphi(builder, facts, ctx)?
} else {
compose_coreplan_for_pattern3_ifphi(builder, facts, ctx)?
}
.ok_or_else(|| "pattern3 strict/dev adopt failed: compose rejected".to_string())?;
Ok(Some(ShadowAdoptOutcome {
core_plan,
tag: "[coreplan/shadow_adopt:pattern3_ifphi]",

2
src/mir/builder/control_flow/plan/normalizer/pattern3_if_phi.rs
View File

@ -16,7 +16,7 @@ impl super::PlanNormalizer {
/// - 2 PHIs: in header (loop_var, carrier)
/// - merge join (carrier_next) is expressed via `Frag.block_params + EdgeArgs`
/// - If-else branching with PHI merge (no Select instruction)
pub(super) fn normalize_pattern3_if_phi(
pub(in crate::mir::builder) fn normalize_pattern3_if_phi(
builder: &mut MirBuilder,
parts: Pattern3IfPhiPlan,
ctx: &LoopPatternContext,