phase29aj(p3): planner-first pattern3 if-phi facts subset
This commit is contained in:
@ -2,7 +2,12 @@
|
||||
|
||||
## Current Focus: Phase 29aj(PlannerOutcome SSOT)
|
||||
|
||||
Next: Phase 29aj P3(TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
|
||||
Next: Phase 29aj P4(TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
|
||||
|
||||
**2025-12-29: Phase 29aj P3 完了** ✅
|
||||
- 目的: Pattern3(If-Phi)を Facts→Planner-first に移行(仕様不変)
|
||||
- 実装: `src/mir/builder/control_flow/plan/facts/pattern3_ifphi_facts.rs` / `src/mir/builder/control_flow/plan/planner/build.rs` / `src/mir/builder/control_flow/plan/single_planner/rules.rs`
|
||||
- 検証: `cargo build --release` / `./tools/smokes/v2/run.sh --profile quick` / `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh` PASS
|
||||
|
||||
**2025-12-29: Phase 29aj P2 完了** ✅
|
||||
- 目的: chosen_rule を撤去し、Pattern1 を Facts→Planner-first に移行(仕様不変)
|
||||
|
||||
@ -19,8 +19,8 @@ Related:
|
||||
|
||||
- **Phase 29aj(candidate): PlannerOutcome observability SSOT**
|
||||
- 入口: `docs/development/current/main/phases/phase-29aj/README.md`
|
||||
- 状況: P0/P1/P2 ✅ 完了
|
||||
- Next: Phase 29aj P3(TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
|
||||
- 状況: P0/P1/P2/P3 ✅ 完了
|
||||
- Next: Phase 29aj P4(TBD: promotion hint を JoinIR 側の orchestrator へ配線、挙動不変)
|
||||
|
||||
- **Phase 29ai(candidate): Plan/Frag single-planner(Facts SSOT)**
|
||||
- 入口: `docs/development/current/main/phases/phase-29ai/README.md`
|
||||
|
||||
@ -0,0 +1,87 @@
|
||||
# Phase 29aj P3: Pattern3 (If-Phi) planner-first via Facts (subset)
|
||||
|
||||
Date: 2025-12-29
|
||||
Status: Ready for execution
|
||||
Scope: Pattern3 facts → planner candidate → single_planner planner-first(仕様不変)
|
||||
Goal: Pattern3 を Facts→Planner に乗せ、extractor 依存を 1 本減らす
|
||||
|
||||
## Objective
|
||||
|
||||
- Pattern3(Loop with If-Else PHI)を Facts→Planner 経路に追加
|
||||
- single_planner は Pattern3 の型一致時のみ planner-first 採用
|
||||
- 既定挙動・観測・エラー文字列は不変
|
||||
|
||||
## Non-goals
|
||||
|
||||
- Pattern4/5/8/9 の planner-first 化
|
||||
- ルール順序 SSOT の CandidateSet 移管
|
||||
- Freeze/Fail-Fast の新規導入
|
||||
|
||||
## Implementation Steps
|
||||
|
||||
### Step 1: Facts SSOT 追加(Pattern3)
|
||||
|
||||
Files:
|
||||
- `src/mir/builder/control_flow/plan/facts/pattern3_ifphi_facts.rs` (new)
|
||||
|
||||
Facts:
|
||||
- `Pattern3IfPhiFacts { loop_var, carrier_var, condition, if_condition, then_update, else_update, loop_increment }`
|
||||
|
||||
Extraction rules (Ok(None) fallback only):
|
||||
- condition は比較演算(left が Variable)
|
||||
- if-else が存在し、then/else 両方で同一変数に代入
|
||||
- return / break / continue / nested-if は Ok(None)
|
||||
- loop_increment は `extract_loop_increment_plan` で取れるときのみ
|
||||
|
||||
### Step 2: LoopFacts に接続
|
||||
|
||||
Files:
|
||||
- `src/mir/builder/control_flow/plan/facts/mod.rs`
|
||||
- `src/mir/builder/control_flow/plan/facts/loop_facts.rs`
|
||||
|
||||
Changes:
|
||||
- LoopFacts に `pattern3_ifphi` を追加
|
||||
- `try_build_loop_facts()` に抽出を追加
|
||||
- all-none 判定に `pattern3_ifphi` を含める
|
||||
|
||||
### Step 3: Planner candidate 追加
|
||||
|
||||
File:
|
||||
- `src/mir/builder/control_flow/plan/planner/build.rs`
|
||||
|
||||
Changes:
|
||||
- facts が Some のとき `DomainPlan::Pattern3IfPhi` を候補に追加
|
||||
- rule 名は `loop/pattern3_ifphi`
|
||||
- unit test 追加
|
||||
|
||||
### Step 4: single_planner を Pattern3 planner-first に
|
||||
|
||||
File:
|
||||
- `src/mir/builder/control_flow/plan/single_planner/rules.rs`
|
||||
|
||||
Changes:
|
||||
- RuleKind::Pattern3 を追加
|
||||
- planner_opt が `Pattern3IfPhi` のとき採用
|
||||
- それ以外は extractor へフォールバック
|
||||
|
||||
### Step 5: docs / CURRENT_TASK 更新
|
||||
|
||||
Files:
|
||||
- `docs/development/current/main/phases/phase-29aj/README.md`
|
||||
- `docs/development/current/main/10-Now.md`
|
||||
- `docs/development/current/main/30-Backlog.md`
|
||||
- `CURRENT_TASK.md`
|
||||
|
||||
## Acceptance Criteria
|
||||
|
||||
- `cargo build --release`
|
||||
- `./tools/smokes/v2/run.sh --profile quick`
|
||||
- `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh`
|
||||
|
||||
## Commit
|
||||
|
||||
- `git add -A && git commit -m "phase29aj(p3): planner-first pattern3 if-phi facts subset"`
|
||||
|
||||
## Next (P4 candidate)
|
||||
|
||||
- Pattern4(Continue)を Facts→Planner-first に寄せる(subset)
|
||||
@ -23,6 +23,13 @@ Goal: planner の facts/plan を 1 本の outcome に集約し、観測の SSOT
|
||||
- 完了: chosen_rule を削除し、Pattern1 facts→planner を single_planner に接続
|
||||
- 検証: `cargo build --release` / `./tools/smokes/v2/run.sh --profile quick` / `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh`
|
||||
|
||||
## P3: Pattern3 (If-Phi) planner-first(subset)
|
||||
|
||||
- 指示書: `docs/development/current/main/phases/phase-29aj/P3-PATTERN3-IFPHI-PLANNER-FIRST-INSTRUCTIONS.md`
|
||||
- ねらい: Pattern3 を Facts→Planner-first に接続し、extractor 依存を削減
|
||||
- 完了: Pattern3 facts/planner/single_planner を接続
|
||||
- 検証: `cargo build --release` / `./tools/smokes/v2/run.sh --profile quick` / `./tools/smokes/v2/profiles/integration/joinir/phase29ae_regression_pack_vm.sh`
|
||||
|
||||
## Verification (SSOT)
|
||||
|
||||
- `cargo build --release`
|
||||
|
||||
Reference in New Issue
Block a user