Files
hakorune/src/mir/builder/control_flow/joinir/merge/mod.rs

205 lines
7.1 KiB
Rust
Raw Normal View History

refactor: Break down merge_joinir_mir_blocks into 6 modules (Phase 4) Phase 4 Implementation Complete: Successfully modularized the 714-line merge_joinir_mir_blocks() function into 6 focused, maintainable modules. ## Changes Made ### 1. Created Module Structure - `src/mir/builder/control_flow/joinir/merge/` directory - 5 sub-modules + 1 coordinator (6 files total) ### 2. Module Breakdown (848 lines total) - **mod.rs** (223 lines) - Coordinator function - Orchestrates all 6 phases - Handles boundary reconnection - Manages entry/exit block jumps - **block_allocator.rs** (70 lines) - Block ID allocation - Allocates new BlockIds for all JoinIR functions - Maintains determinism via sorted iteration - **value_collector.rs** (90 lines) - Value collection - Collects all ValueIds from JoinIR functions - Builds auxiliary maps for Call→Jump conversion - **instruction_rewriter.rs** (405 lines) - Instruction rewriting - Rewrites instructions with remapped IDs - Handles tail call optimization - Converts Return → Jump to exit block - **exit_phi_builder.rs** (60 lines) - Exit PHI construction - Builds PHI node merging return values - Creates exit block ### 3. Updated control_flow/mod.rs - Replaced 714-line function with 18-line delegation - Reduced from 904 lines → 312 lines (65% reduction) - Added documentation explaining Phase 4 refactoring ## Verification Results ✅ **Build**: `cargo build --release` - SUCCESS (23.36s) ✅ **Smoke Test**: loop_min_while.hako - PASS (correct output: 0,1,2) ✅ **Determinism**: 3 consecutive runs - IDENTICAL OUTPUT ✅ **Debug Traces**: NYASH_OPTION_C_DEBUG=1 traces work correctly ✅ **No Regressions**: Behavior preserved 100% ## Benefits 1. **Maintainability**: 714 lines → 6 focused modules (100-150 lines each) 2. **Readability**: Each phase isolated in its own file 3. **Testability**: Individual modules can be tested separately 4. **Future Development**: Easy to modify individual phases 5. **Zero Breaking Changes**: Backward compatible, no API changes ## Technical Notes - Uses JoinIrIdRemapper (already existed) for ID translation - Preserves all debug output and trace functionality - Maintains determinism via BTreeSet/BTreeMap - All Phase 189 features intact (multi-function support, etc.) Generated with Claude Code (https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 21:00:55 +09:00
//! JoinIR MIR Block Merging Coordinator
//!
//! This module coordinates the merging of JoinIR-generated MIR functions
//! into the host MIR builder. The process is broken into 6 phases:
//!
//! 1. Block ID allocation (block_allocator.rs)
//! 2. Value collection (value_collector.rs)
//! 3. ValueId remapping (uses JoinIrIdRemapper)
//! 4. Instruction rewriting (instruction_rewriter.rs)
//! 5. Exit PHI construction (exit_phi_builder.rs)
//! 6. Boundary reconnection (inline in this file)
//!
//! Phase 4 Refactoring: Breaking down 714-line merge_joinir_mir_blocks() into focused modules
mod block_allocator;
mod value_collector;
mod instruction_rewriter;
mod exit_phi_builder;
mod exit_line;
refactor: Break down merge_joinir_mir_blocks into 6 modules (Phase 4) Phase 4 Implementation Complete: Successfully modularized the 714-line merge_joinir_mir_blocks() function into 6 focused, maintainable modules. ## Changes Made ### 1. Created Module Structure - `src/mir/builder/control_flow/joinir/merge/` directory - 5 sub-modules + 1 coordinator (6 files total) ### 2. Module Breakdown (848 lines total) - **mod.rs** (223 lines) - Coordinator function - Orchestrates all 6 phases - Handles boundary reconnection - Manages entry/exit block jumps - **block_allocator.rs** (70 lines) - Block ID allocation - Allocates new BlockIds for all JoinIR functions - Maintains determinism via sorted iteration - **value_collector.rs** (90 lines) - Value collection - Collects all ValueIds from JoinIR functions - Builds auxiliary maps for Call→Jump conversion - **instruction_rewriter.rs** (405 lines) - Instruction rewriting - Rewrites instructions with remapped IDs - Handles tail call optimization - Converts Return → Jump to exit block - **exit_phi_builder.rs** (60 lines) - Exit PHI construction - Builds PHI node merging return values - Creates exit block ### 3. Updated control_flow/mod.rs - Replaced 714-line function with 18-line delegation - Reduced from 904 lines → 312 lines (65% reduction) - Added documentation explaining Phase 4 refactoring ## Verification Results ✅ **Build**: `cargo build --release` - SUCCESS (23.36s) ✅ **Smoke Test**: loop_min_while.hako - PASS (correct output: 0,1,2) ✅ **Determinism**: 3 consecutive runs - IDENTICAL OUTPUT ✅ **Debug Traces**: NYASH_OPTION_C_DEBUG=1 traces work correctly ✅ **No Regressions**: Behavior preserved 100% ## Benefits 1. **Maintainability**: 714 lines → 6 focused modules (100-150 lines each) 2. **Readability**: Each phase isolated in its own file 3. **Testability**: Individual modules can be tested separately 4. **Future Development**: Easy to modify individual phases 5. **Zero Breaking Changes**: Backward compatible, no API changes ## Technical Notes - Uses JoinIrIdRemapper (already existed) for ID translation - Preserves all debug output and trace functionality - Maintains determinism via BTreeSet/BTreeMap - All Phase 189 features intact (multi-function support, etc.) Generated with Claude Code (https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 21:00:55 +09:00
use crate::mir::{MirModule, ValueId};
use crate::mir::join_ir::lowering::inline_boundary::JoinInlineBoundary;
/// Phase 49-3.2: Merge JoinIR-generated MIR blocks into current_function
///
/// # Phase 189: Multi-Function MIR Merge
///
/// This merges JoinIR-generated blocks by:
/// 1. Remapping all block IDs across ALL functions to avoid conflicts
/// 2. Remapping all value IDs across ALL functions to avoid conflicts
/// 3. Adding all blocks from all functions to current_function
/// 4. Jumping from current_block to the entry block
/// 5. Converting Return → Jump to exit block for all functions
///
/// **Multi-Function Support** (Phase 189):
/// - Pattern 1 (Simple While) generates 3 functions: entry + loop_step + k_exit
/// - All functions are flattened into current_function with global ID remapping
/// - Single exit block receives all Return instructions from all functions
///
/// # Phase 188-Impl-3: JoinInlineBoundary Support
///
/// When `boundary` is provided, injects Copy instructions at the entry block
/// to connect host ValueIds to JoinIR local ValueIds:
///
/// ```text
/// entry_block:
/// // Injected by boundary
/// ValueId(100) = Copy ValueId(4) // join_input → host_input
/// // Original JoinIR instructions follow...
/// ```
///
/// This enables clean separation: JoinIR uses local IDs (0,1,2...),
/// host uses its own IDs, and Copy instructions bridge the gap.
///
/// # Returns
///
/// Returns `Ok(Some(exit_phi_id))` if the merged JoinIR functions have return values
/// that were collected into an exit block PHI. さらに、`boundary` に
/// host_outputs が指定されている場合は、exit PHI の結果をホスト側の
/// SSA スロットへ再接続するvariable_map 内の ValueId を更新する)。
pub(in crate::mir::builder) fn merge_joinir_mir_blocks(
builder: &mut crate::mir::builder::MirBuilder,
mir_module: &MirModule,
boundary: Option<&JoinInlineBoundary>,
debug: bool,
) -> Result<Option<ValueId>, String> {
if debug {
eprintln!(
"[cf_loop/joinir] merge_joinir_mir_blocks called with {} functions",
mir_module.functions.len()
);
}
// Phase 1: Allocate block IDs for all functions
let mut remapper = block_allocator::allocate_blocks(builder, mir_module, debug)?;
// Phase 2: Collect values from all functions
let (mut used_values, value_to_func_name, function_params) =
refactor: Break down merge_joinir_mir_blocks into 6 modules (Phase 4) Phase 4 Implementation Complete: Successfully modularized the 714-line merge_joinir_mir_blocks() function into 6 focused, maintainable modules. ## Changes Made ### 1. Created Module Structure - `src/mir/builder/control_flow/joinir/merge/` directory - 5 sub-modules + 1 coordinator (6 files total) ### 2. Module Breakdown (848 lines total) - **mod.rs** (223 lines) - Coordinator function - Orchestrates all 6 phases - Handles boundary reconnection - Manages entry/exit block jumps - **block_allocator.rs** (70 lines) - Block ID allocation - Allocates new BlockIds for all JoinIR functions - Maintains determinism via sorted iteration - **value_collector.rs** (90 lines) - Value collection - Collects all ValueIds from JoinIR functions - Builds auxiliary maps for Call→Jump conversion - **instruction_rewriter.rs** (405 lines) - Instruction rewriting - Rewrites instructions with remapped IDs - Handles tail call optimization - Converts Return → Jump to exit block - **exit_phi_builder.rs** (60 lines) - Exit PHI construction - Builds PHI node merging return values - Creates exit block ### 3. Updated control_flow/mod.rs - Replaced 714-line function with 18-line delegation - Reduced from 904 lines → 312 lines (65% reduction) - Added documentation explaining Phase 4 refactoring ## Verification Results ✅ **Build**: `cargo build --release` - SUCCESS (23.36s) ✅ **Smoke Test**: loop_min_while.hako - PASS (correct output: 0,1,2) ✅ **Determinism**: 3 consecutive runs - IDENTICAL OUTPUT ✅ **Debug Traces**: NYASH_OPTION_C_DEBUG=1 traces work correctly ✅ **No Regressions**: Behavior preserved 100% ## Benefits 1. **Maintainability**: 714 lines → 6 focused modules (100-150 lines each) 2. **Readability**: Each phase isolated in its own file 3. **Testability**: Individual modules can be tested separately 4. **Future Development**: Easy to modify individual phases 5. **Zero Breaking Changes**: Backward compatible, no API changes ## Technical Notes - Uses JoinIrIdRemapper (already existed) for ID translation - Preserves all debug output and trace functionality - Maintains determinism via BTreeSet/BTreeMap - All Phase 189 features intact (multi-function support, etc.) Generated with Claude Code (https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 21:00:55 +09:00
value_collector::collect_values(mir_module, &remapper, debug)?;
// Phase 171-fix: Add condition_bindings' join_values to used_values for remapping
if let Some(boundary) = boundary {
for binding in &boundary.condition_bindings {
if debug {
eprintln!(
"[cf_loop/joinir] Phase 171-fix: Adding condition binding '{}' JoinIR {:?} to used_values",
binding.name, binding.join_value
);
}
used_values.insert(binding.join_value);
}
// Phase 172-3: Add exit_bindings' join_exit_values to used_values for remapping
for binding in &boundary.exit_bindings {
if debug {
eprintln!(
"[cf_loop/joinir] Phase 172-3: Adding exit binding '{}' JoinIR {:?} to used_values",
binding.carrier_name, binding.join_exit_value
);
}
used_values.insert(binding.join_exit_value);
}
}
refactor: Break down merge_joinir_mir_blocks into 6 modules (Phase 4) Phase 4 Implementation Complete: Successfully modularized the 714-line merge_joinir_mir_blocks() function into 6 focused, maintainable modules. ## Changes Made ### 1. Created Module Structure - `src/mir/builder/control_flow/joinir/merge/` directory - 5 sub-modules + 1 coordinator (6 files total) ### 2. Module Breakdown (848 lines total) - **mod.rs** (223 lines) - Coordinator function - Orchestrates all 6 phases - Handles boundary reconnection - Manages entry/exit block jumps - **block_allocator.rs** (70 lines) - Block ID allocation - Allocates new BlockIds for all JoinIR functions - Maintains determinism via sorted iteration - **value_collector.rs** (90 lines) - Value collection - Collects all ValueIds from JoinIR functions - Builds auxiliary maps for Call→Jump conversion - **instruction_rewriter.rs** (405 lines) - Instruction rewriting - Rewrites instructions with remapped IDs - Handles tail call optimization - Converts Return → Jump to exit block - **exit_phi_builder.rs** (60 lines) - Exit PHI construction - Builds PHI node merging return values - Creates exit block ### 3. Updated control_flow/mod.rs - Replaced 714-line function with 18-line delegation - Reduced from 904 lines → 312 lines (65% reduction) - Added documentation explaining Phase 4 refactoring ## Verification Results ✅ **Build**: `cargo build --release` - SUCCESS (23.36s) ✅ **Smoke Test**: loop_min_while.hako - PASS (correct output: 0,1,2) ✅ **Determinism**: 3 consecutive runs - IDENTICAL OUTPUT ✅ **Debug Traces**: NYASH_OPTION_C_DEBUG=1 traces work correctly ✅ **No Regressions**: Behavior preserved 100% ## Benefits 1. **Maintainability**: 714 lines → 6 focused modules (100-150 lines each) 2. **Readability**: Each phase isolated in its own file 3. **Testability**: Individual modules can be tested separately 4. **Future Development**: Easy to modify individual phases 5. **Zero Breaking Changes**: Backward compatible, no API changes ## Technical Notes - Uses JoinIrIdRemapper (already existed) for ID translation - Preserves all debug output and trace functionality - Maintains determinism via BTreeSet/BTreeMap - All Phase 189 features intact (multi-function support, etc.) Generated with Claude Code (https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 21:00:55 +09:00
// Phase 3: Remap ValueIds
remap_values(builder, &used_values, &mut remapper, debug)?;
// Phase 4: Merge blocks and rewrite instructions
let (exit_block_id, exit_phi_inputs) = instruction_rewriter::merge_and_rewrite(
builder,
mir_module,
&mut remapper,
&value_to_func_name,
&function_params,
boundary,
debug,
)?;
// Phase 5: Build exit PHI
let exit_phi_result_id = exit_phi_builder::build_exit_phi(
builder,
exit_block_id,
&exit_phi_inputs,
debug,
)?;
// Phase 6: Reconnect boundary (if specified)
// Phase 197-B: Pass remapper to enable per-carrier exit value lookup
// Phase 33-10-Refactor-P3: Delegate to ExitLineOrchestrator
refactor: Break down merge_joinir_mir_blocks into 6 modules (Phase 4) Phase 4 Implementation Complete: Successfully modularized the 714-line merge_joinir_mir_blocks() function into 6 focused, maintainable modules. ## Changes Made ### 1. Created Module Structure - `src/mir/builder/control_flow/joinir/merge/` directory - 5 sub-modules + 1 coordinator (6 files total) ### 2. Module Breakdown (848 lines total) - **mod.rs** (223 lines) - Coordinator function - Orchestrates all 6 phases - Handles boundary reconnection - Manages entry/exit block jumps - **block_allocator.rs** (70 lines) - Block ID allocation - Allocates new BlockIds for all JoinIR functions - Maintains determinism via sorted iteration - **value_collector.rs** (90 lines) - Value collection - Collects all ValueIds from JoinIR functions - Builds auxiliary maps for Call→Jump conversion - **instruction_rewriter.rs** (405 lines) - Instruction rewriting - Rewrites instructions with remapped IDs - Handles tail call optimization - Converts Return → Jump to exit block - **exit_phi_builder.rs** (60 lines) - Exit PHI construction - Builds PHI node merging return values - Creates exit block ### 3. Updated control_flow/mod.rs - Replaced 714-line function with 18-line delegation - Reduced from 904 lines → 312 lines (65% reduction) - Added documentation explaining Phase 4 refactoring ## Verification Results ✅ **Build**: `cargo build --release` - SUCCESS (23.36s) ✅ **Smoke Test**: loop_min_while.hako - PASS (correct output: 0,1,2) ✅ **Determinism**: 3 consecutive runs - IDENTICAL OUTPUT ✅ **Debug Traces**: NYASH_OPTION_C_DEBUG=1 traces work correctly ✅ **No Regressions**: Behavior preserved 100% ## Benefits 1. **Maintainability**: 714 lines → 6 focused modules (100-150 lines each) 2. **Readability**: Each phase isolated in its own file 3. **Testability**: Individual modules can be tested separately 4. **Future Development**: Easy to modify individual phases 5. **Zero Breaking Changes**: Backward compatible, no API changes ## Technical Notes - Uses JoinIrIdRemapper (already existed) for ID translation - Preserves all debug output and trace functionality - Maintains determinism via BTreeSet/BTreeMap - All Phase 189 features intact (multi-function support, etc.) Generated with Claude Code (https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 21:00:55 +09:00
if let Some(boundary) = boundary {
exit_line::ExitLineOrchestrator::execute(builder, boundary, &remapper, debug)?;
refactor: Break down merge_joinir_mir_blocks into 6 modules (Phase 4) Phase 4 Implementation Complete: Successfully modularized the 714-line merge_joinir_mir_blocks() function into 6 focused, maintainable modules. ## Changes Made ### 1. Created Module Structure - `src/mir/builder/control_flow/joinir/merge/` directory - 5 sub-modules + 1 coordinator (6 files total) ### 2. Module Breakdown (848 lines total) - **mod.rs** (223 lines) - Coordinator function - Orchestrates all 6 phases - Handles boundary reconnection - Manages entry/exit block jumps - **block_allocator.rs** (70 lines) - Block ID allocation - Allocates new BlockIds for all JoinIR functions - Maintains determinism via sorted iteration - **value_collector.rs** (90 lines) - Value collection - Collects all ValueIds from JoinIR functions - Builds auxiliary maps for Call→Jump conversion - **instruction_rewriter.rs** (405 lines) - Instruction rewriting - Rewrites instructions with remapped IDs - Handles tail call optimization - Converts Return → Jump to exit block - **exit_phi_builder.rs** (60 lines) - Exit PHI construction - Builds PHI node merging return values - Creates exit block ### 3. Updated control_flow/mod.rs - Replaced 714-line function with 18-line delegation - Reduced from 904 lines → 312 lines (65% reduction) - Added documentation explaining Phase 4 refactoring ## Verification Results ✅ **Build**: `cargo build --release` - SUCCESS (23.36s) ✅ **Smoke Test**: loop_min_while.hako - PASS (correct output: 0,1,2) ✅ **Determinism**: 3 consecutive runs - IDENTICAL OUTPUT ✅ **Debug Traces**: NYASH_OPTION_C_DEBUG=1 traces work correctly ✅ **No Regressions**: Behavior preserved 100% ## Benefits 1. **Maintainability**: 714 lines → 6 focused modules (100-150 lines each) 2. **Readability**: Each phase isolated in its own file 3. **Testability**: Individual modules can be tested separately 4. **Future Development**: Easy to modify individual phases 5. **Zero Breaking Changes**: Backward compatible, no API changes ## Technical Notes - Uses JoinIrIdRemapper (already existed) for ID translation - Preserves all debug output and trace functionality - Maintains determinism via BTreeSet/BTreeMap - All Phase 189 features intact (multi-function support, etc.) Generated with Claude Code (https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 21:00:55 +09:00
}
// Jump from current block to entry function's entry block
let (entry_func_name, entry_func) = mir_module
.functions
.iter()
.next()
.ok_or("JoinIR module has no functions")?;
let entry_block = remapper
.get_block(entry_func_name, entry_func.entry_block)
.ok_or_else(|| format!("Entry block not found for {}", entry_func_name))?;
if debug {
eprintln!("[cf_loop/joinir] Entry function name: {}", entry_func_name);
eprintln!(
"[cf_loop/joinir] Entry function's entry_block (JoinIR local): {:?}",
entry_func.entry_block
);
eprintln!("[cf_loop/joinir] Entry block (remapped): {:?}", entry_block);
eprintln!(
"[cf_loop/joinir] Current block before emit_jump: {:?}",
builder.current_block
);
eprintln!("[cf_loop/joinir] Jumping to entry block: {:?}", entry_block);
}
crate::mir::builder::emission::branch::emit_jump(builder, entry_block)?;
if debug {
eprintln!(
"[cf_loop/joinir] After emit_jump, current_block: {:?}",
builder.current_block
);
}
// Switch to exit block for subsequent code
builder.start_new_block(exit_block_id)?;
if debug {
eprintln!(
"[cf_loop/joinir] Phase 189: Merge complete: {} functions merged, continuing from {:?}",
mir_module.functions.len(),
exit_block_id
);
}
Ok(exit_phi_result_id)
}
/// Phase 3: Allocate new ValueIds for all collected values
fn remap_values(
builder: &mut crate::mir::builder::MirBuilder,
used_values: &std::collections::BTreeSet<ValueId>,
remapper: &mut crate::mir::builder::joinir_id_remapper::JoinIrIdRemapper,
debug: bool,
) -> Result<(), String> {
if debug {
eprintln!("[cf_loop/joinir] Phase 3: Remapping {} ValueIds", used_values.len());
}
for old_value in used_values {
let new_value = builder.next_value_id();
remapper.set_value(*old_value, new_value);
if debug {
eprintln!(
"[cf_loop/joinir] Value remap: {:?} → {:?}",
old_value, new_value
);
}
}
Ok(())
}