2025-12-05 22:11:39 +09:00
|
|
|
//! Pattern Router - Table-driven dispatch for loop patterns
|
|
|
|
|
//!
|
|
|
|
|
//! Phase 194: Replace if/else chain with table-driven routing
|
2025-12-06 03:30:03 +09:00
|
|
|
//! Phase 193: Modularized feature extraction using ast_feature_extractor module
|
2025-12-05 22:11:39 +09:00
|
|
|
//!
|
|
|
|
|
//! # Architecture
|
|
|
|
|
//!
|
|
|
|
|
//! - Each pattern registers a detect function and a lower function
|
|
|
|
|
//! - Patterns are tried in priority order (lower = tried first)
|
|
|
|
|
//! - First matching pattern wins
|
2025-12-06 03:30:03 +09:00
|
|
|
//! - Feature extraction delegated to ast_feature_extractor module
|
2025-12-05 22:11:39 +09:00
|
|
|
//!
|
|
|
|
|
//! # Adding New Patterns
|
|
|
|
|
//!
|
|
|
|
|
//! 1. Create a new module in `patterns/` (e.g., `pattern4_your_name.rs`)
|
|
|
|
|
//! 2. Implement `pub fn can_lower(ctx: &LoopPatternContext) -> bool`
|
|
|
|
|
//! 3. Implement `pub fn lower(builder: &mut MirBuilder, ctx: &LoopPatternContext) -> Result<Option<ValueId>, String>`
|
|
|
|
|
//! 4. Add entry to `LOOP_PATTERNS` table below
|
|
|
|
|
//!
|
|
|
|
|
//! That's it! No need to modify routing logic.
|
|
|
|
|
|
|
|
|
|
use crate::ast::ASTNode;
|
|
|
|
|
use crate::mir::builder::MirBuilder;
|
|
|
|
|
use crate::mir::ValueId;
|
|
|
|
|
|
2025-12-06 03:30:03 +09:00
|
|
|
use crate::mir::loop_pattern_detection::{LoopFeatures, LoopPatternKind};
|
|
|
|
|
|
|
|
|
|
/// Phase 193: Import AST Feature Extractor Box
|
|
|
|
|
/// (declared in mod.rs as pub module, import from parent)
|
|
|
|
|
use super::ast_feature_extractor as ast_features;
|
|
|
|
|
|
2025-12-05 22:11:39 +09:00
|
|
|
/// Context passed to pattern detect/lower functions
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) struct LoopPatternContext<'a> {
|
2025-12-05 22:11:39 +09:00
|
|
|
/// Loop condition AST node
|
|
|
|
|
pub condition: &'a ASTNode,
|
|
|
|
|
|
|
|
|
|
/// Loop body statements
|
|
|
|
|
pub body: &'a [ASTNode],
|
|
|
|
|
|
|
|
|
|
/// Current function name (for routing)
|
|
|
|
|
pub func_name: &'a str,
|
|
|
|
|
|
|
|
|
|
/// Debug logging enabled
|
|
|
|
|
pub debug: bool,
|
2025-12-06 00:10:27 +09:00
|
|
|
|
|
|
|
|
/// Has continue statement(s) in body? (Phase 194+)
|
2025-12-10 00:01:53 +09:00
|
|
|
#[allow(dead_code)]
|
2025-12-06 00:10:27 +09:00
|
|
|
pub has_continue: bool,
|
|
|
|
|
|
|
|
|
|
/// Has break statement(s) in body? (Phase 194+)
|
2025-12-10 00:01:53 +09:00
|
|
|
#[allow(dead_code)]
|
2025-12-06 00:10:27 +09:00
|
|
|
pub has_break: bool,
|
2025-12-06 03:30:03 +09:00
|
|
|
|
|
|
|
|
/// Phase 192: Loop features extracted from AST
|
2025-12-10 00:01:53 +09:00
|
|
|
#[allow(dead_code)]
|
2025-12-06 03:30:03 +09:00
|
|
|
pub features: LoopFeatures,
|
|
|
|
|
|
|
|
|
|
/// Phase 192: Pattern classification based on features
|
|
|
|
|
pub pattern_kind: LoopPatternKind,
|
2025-12-09 18:32:03 +09:00
|
|
|
|
|
|
|
|
/// Phase 200-C: Optional function body AST for capture analysis
|
|
|
|
|
/// None if not available, Some(&[ASTNode]) if function body is accessible
|
|
|
|
|
pub fn_body: Option<&'a [ASTNode]>,
|
2025-12-05 22:11:39 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<'a> LoopPatternContext<'a> {
|
|
|
|
|
/// Create new context from routing parameters
|
2025-12-06 00:10:27 +09:00
|
|
|
///
|
|
|
|
|
/// Phase 194+: Automatically detects continue/break statements in body
|
2025-12-06 03:30:03 +09:00
|
|
|
/// Phase 192: Extract features and classify pattern from AST
|
|
|
|
|
/// Phase 193: Feature extraction delegated to ast_feature_extractor module
|
2025-12-14 09:59:34 +09:00
|
|
|
/// Phase 131-11: Detects infinite loop condition
|
2025-12-16 07:37:23 +09:00
|
|
|
/// Phase 137-6-S1: Use choose_pattern_kind() SSOT entry point
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) fn new(
|
2025-12-05 22:11:39 +09:00
|
|
|
condition: &'a ASTNode,
|
|
|
|
|
body: &'a [ASTNode],
|
|
|
|
|
func_name: &'a str,
|
|
|
|
|
debug: bool,
|
|
|
|
|
) -> Self {
|
2025-12-06 03:30:03 +09:00
|
|
|
// Phase 193: Use AST Feature Extractor Box for break/continue detection
|
|
|
|
|
let has_continue = ast_features::detect_continue_in_body(body);
|
|
|
|
|
let has_break = ast_features::detect_break_in_body(body);
|
|
|
|
|
|
|
|
|
|
// Phase 193: Extract features using modularized extractor
|
2025-12-14 09:59:34 +09:00
|
|
|
// Phase 131-11: Pass condition for infinite loop detection
|
|
|
|
|
let features = ast_features::extract_features(condition, body, has_continue, has_break);
|
2025-12-06 03:30:03 +09:00
|
|
|
|
2025-12-16 07:37:23 +09:00
|
|
|
// Phase 137-6-S1: Use SSOT pattern selection entry point
|
|
|
|
|
use crate::mir::builder::control_flow::joinir::routing::choose_pattern_kind;
|
|
|
|
|
let pattern_kind = choose_pattern_kind(condition, body);
|
2025-12-06 00:10:27 +09:00
|
|
|
|
2025-12-05 22:11:39 +09:00
|
|
|
Self {
|
|
|
|
|
condition,
|
|
|
|
|
body,
|
|
|
|
|
func_name,
|
|
|
|
|
debug,
|
2025-12-06 00:10:27 +09:00
|
|
|
has_continue,
|
|
|
|
|
has_break,
|
2025-12-06 03:30:03 +09:00
|
|
|
features,
|
|
|
|
|
pattern_kind,
|
2025-12-09 18:32:03 +09:00
|
|
|
fn_body: None, // Phase 200-C: Default to None
|
2025-12-06 00:10:27 +09:00
|
|
|
}
|
|
|
|
|
}
|
2025-12-09 18:32:03 +09:00
|
|
|
|
|
|
|
|
/// Phase 200-C: Create context with fn_body for capture analysis
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) fn with_fn_body(
|
2025-12-09 18:32:03 +09:00
|
|
|
condition: &'a ASTNode,
|
|
|
|
|
body: &'a [ASTNode],
|
|
|
|
|
func_name: &'a str,
|
|
|
|
|
debug: bool,
|
|
|
|
|
fn_body: &'a [ASTNode],
|
|
|
|
|
) -> Self {
|
|
|
|
|
let mut ctx = Self::new(condition, body, func_name, debug);
|
|
|
|
|
ctx.fn_body = Some(fn_body);
|
|
|
|
|
ctx
|
|
|
|
|
}
|
2025-12-06 00:10:27 +09:00
|
|
|
}
|
|
|
|
|
|
2025-12-06 03:30:03 +09:00
|
|
|
/// Phase 193: Feature extraction moved to ast_feature_extractor module
|
|
|
|
|
/// See: src/mir/builder/control_flow/joinir/patterns/ast_feature_extractor.rs
|
2025-12-05 22:11:39 +09:00
|
|
|
|
|
|
|
|
/// Entry in the loop pattern router table.
|
|
|
|
|
/// Each pattern registers a detect function and a lower function.
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) struct LoopPatternEntry {
|
2025-12-05 22:11:39 +09:00
|
|
|
/// Human-readable pattern name for debugging
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) name: &'static str,
|
2025-12-05 22:11:39 +09:00
|
|
|
|
|
|
|
|
/// Detection function: returns true if this pattern matches
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) detect: fn(&MirBuilder, &LoopPatternContext) -> bool,
|
2025-12-05 22:11:39 +09:00
|
|
|
|
|
|
|
|
/// Lowering function: performs the actual JoinIR generation
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) lower: fn(&mut MirBuilder, &LoopPatternContext) -> Result<Option<ValueId>, String>,
|
2025-12-05 22:11:39 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Static table of all registered loop patterns.
|
2025-12-15 03:27:47 +09:00
|
|
|
///
|
|
|
|
|
/// **IMPORTANT**: Patterns are tried in array order (SSOT).
|
|
|
|
|
/// Array order defines priority - earlier entries are tried first.
|
|
|
|
|
/// Pattern5 (most specific) → Pattern4 → Pattern3 → Pattern1 → Pattern2
|
2025-12-05 22:11:39 +09:00
|
|
|
///
|
2025-12-14 09:59:34 +09:00
|
|
|
/// # Current Patterns (Phase 131-11: Pattern 5 added)
|
2025-12-06 03:30:03 +09:00
|
|
|
///
|
|
|
|
|
/// All patterns now use structure-based detection via LoopFeatures and classify():
|
2025-12-05 22:11:39 +09:00
|
|
|
///
|
2025-12-15 03:27:47 +09:00
|
|
|
/// - Pattern 5: Infinite Loop with Early Exit (llvm_stage3_loop_only.hako) [Phase 131-11]
|
2025-12-14 09:59:34 +09:00
|
|
|
/// - Detection: pattern_kind == InfiniteEarlyExit
|
|
|
|
|
/// - Structure: is_infinite_loop && has_break && has_continue
|
|
|
|
|
///
|
2025-12-15 03:27:47 +09:00
|
|
|
/// - Pattern 4: Loop with Continue (loop_continue_pattern4.hako)
|
2025-12-06 03:30:03 +09:00
|
|
|
/// - Detection: pattern_kind == Pattern4Continue
|
|
|
|
|
/// - Structure: has_continue && !has_break
|
|
|
|
|
///
|
2025-12-15 03:27:47 +09:00
|
|
|
/// - Pattern 3: Loop with If-Else PHI (loop_if_phi.hako)
|
2025-12-06 03:30:03 +09:00
|
|
|
/// - Detection: pattern_kind == Pattern3IfPhi
|
|
|
|
|
/// - Structure: has_if_else_phi && !has_break && !has_continue
|
2025-12-06 00:10:27 +09:00
|
|
|
///
|
2025-12-15 03:27:47 +09:00
|
|
|
/// - Pattern 1: Simple While Loop (loop_min_while.hako)
|
2025-12-06 03:30:03 +09:00
|
|
|
/// - Detection: pattern_kind == Pattern1SimpleWhile
|
|
|
|
|
/// - Structure: !has_break && !has_continue && !has_if_else_phi
|
2025-12-05 22:11:39 +09:00
|
|
|
///
|
2025-12-15 03:27:47 +09:00
|
|
|
/// - Pattern 2: Loop with Conditional Break (joinir_min_loop.hako)
|
2025-12-06 03:30:03 +09:00
|
|
|
/// - Detection: pattern_kind == Pattern2Break
|
|
|
|
|
/// - Structure: has_break && !has_continue
|
2025-12-05 22:11:39 +09:00
|
|
|
///
|
2025-12-06 03:30:03 +09:00
|
|
|
/// Note: func_name is now only used for debug logging, not pattern detection
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) static LOOP_PATTERNS: &[LoopPatternEntry] = &[
|
2025-12-14 09:59:34 +09:00
|
|
|
LoopPatternEntry {
|
|
|
|
|
name: "Pattern5_InfiniteEarlyExit",
|
|
|
|
|
detect: super::pattern5_infinite_early_exit::can_lower,
|
|
|
|
|
lower: super::pattern5_infinite_early_exit::lower,
|
|
|
|
|
},
|
2025-12-06 00:10:27 +09:00
|
|
|
LoopPatternEntry {
|
|
|
|
|
name: "Pattern4_WithContinue",
|
|
|
|
|
detect: super::pattern4_with_continue::can_lower,
|
|
|
|
|
lower: super::pattern4_with_continue::lower,
|
|
|
|
|
},
|
2025-12-05 22:11:39 +09:00
|
|
|
LoopPatternEntry {
|
|
|
|
|
name: "Pattern3_WithIfPhi",
|
|
|
|
|
detect: super::pattern3_with_if_phi::can_lower,
|
|
|
|
|
lower: super::pattern3_with_if_phi::lower,
|
|
|
|
|
},
|
|
|
|
|
LoopPatternEntry {
|
|
|
|
|
name: "Pattern1_Minimal",
|
|
|
|
|
detect: super::pattern1_minimal::can_lower,
|
|
|
|
|
lower: super::pattern1_minimal::lower,
|
|
|
|
|
},
|
|
|
|
|
LoopPatternEntry {
|
|
|
|
|
name: "Pattern2_WithBreak",
|
|
|
|
|
detect: super::pattern2_with_break::can_lower,
|
|
|
|
|
lower: super::pattern2_with_break::lower,
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
/// Try all registered patterns in priority order.
|
|
|
|
|
///
|
|
|
|
|
/// Returns Ok(Some(value_id)) if a pattern matched and lowered successfully.
|
|
|
|
|
/// Returns Ok(None) if no pattern matched.
|
|
|
|
|
/// Returns Err if a pattern matched but lowering failed.
|
2025-12-08 22:17:06 +09:00
|
|
|
///
|
|
|
|
|
/// # Phase 183: Structure-based routing
|
|
|
|
|
///
|
|
|
|
|
/// This router uses the centralized pattern classification system:
|
|
|
|
|
/// - Pattern detection: `ctx.pattern_kind` (from `loop_pattern_detection::classify`)
|
|
|
|
|
/// - No redundant pattern detection in detect functions
|
|
|
|
|
/// - All patterns use structure-based classification
|
2025-12-11 19:11:26 +09:00
|
|
|
pub(crate) fn route_loop_pattern(
|
2025-12-05 22:11:39 +09:00
|
|
|
builder: &mut MirBuilder,
|
|
|
|
|
ctx: &LoopPatternContext,
|
|
|
|
|
) -> Result<Option<ValueId>, String> {
|
feat(joinir): Phase 195 - Unified JoinLoopTrace for all JoinIR debug output
Created centralized tracing module for JoinIR loop lowering operations,
consolidating scattered eprintln! calls into a single SSOT interface.
# Implementation
1. **Created trace.rs module** (~233 lines)
- JoinLoopTrace struct with env var controls
- Unified API: pattern(), varmap(), joinir_stats(), phi(), merge(), etc.
- Global singleton via trace() function
- Supports 5 env vars: NYASH_TRACE_VARMAP, NYASH_JOINIR_DEBUG,
NYASH_OPTION_C_DEBUG, NYASH_JOINIR_MAINLINE_DEBUG, NYASH_LOOPFORM_DEBUG
2. **Updated debug.rs** - Delegates trace_varmap() to JoinLoopTrace
3. **Updated routing.rs** - All eprintln! replaced with trace calls (10 instances)
4. **Updated pattern routers** - All 3 patterns now use unified trace
- pattern1_minimal.rs: 6 replacements
- pattern2_with_break.rs: 6 replacements
- pattern3_with_if_phi.rs: 6 replacements
- router.rs: 2 replacements
5. **Updated merge/block_allocator.rs** - 6 eprintln! → trace calls
# Benefits
- **Single Source of Truth**: All trace control through environment variables
- **Consistent Format**: Unified [trace:*] prefix for easy filtering
- **Zero Overhead**: No output when env vars unset
- **Easy Extension**: Add new trace points via existing API
- **Better Debug Experience**: Structured output with clear categories
# Testing
✅ cargo build --release - Success
✅ NYASH_TRACE_VARMAP=1 - Shows varmap traces only
✅ NYASH_JOINIR_DEBUG=1 - Shows joinir + blocks + routing traces
✅ No env vars - No debug output
✅ apps/tests/loop_min_while.hako - All tests pass
# Related
- Phase 191-194 groundwork (modular merge structure)
- NYASH_TRACE_VARMAP added today for variable_map debugging
- Consolidates ~80 scattered eprintln! calls across JoinIR
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 22:23:51 +09:00
|
|
|
use super::super::trace;
|
|
|
|
|
|
2025-12-08 22:17:06 +09:00
|
|
|
// Phase 183: Route based on pre-classified pattern kind
|
|
|
|
|
// Pattern kind was already determined by ctx.pattern_kind in LoopPatternContext::new()
|
|
|
|
|
// This eliminates duplicate detection logic across routers.
|
2025-12-05 22:11:39 +09:00
|
|
|
|
2025-12-08 22:17:06 +09:00
|
|
|
// Find matching pattern entry based on pattern_kind
|
2025-12-05 22:11:39 +09:00
|
|
|
for entry in LOOP_PATTERNS {
|
|
|
|
|
if (entry.detect)(builder, ctx) {
|
feat(joinir): Phase 195 - Unified JoinLoopTrace for all JoinIR debug output
Created centralized tracing module for JoinIR loop lowering operations,
consolidating scattered eprintln! calls into a single SSOT interface.
# Implementation
1. **Created trace.rs module** (~233 lines)
- JoinLoopTrace struct with env var controls
- Unified API: pattern(), varmap(), joinir_stats(), phi(), merge(), etc.
- Global singleton via trace() function
- Supports 5 env vars: NYASH_TRACE_VARMAP, NYASH_JOINIR_DEBUG,
NYASH_OPTION_C_DEBUG, NYASH_JOINIR_MAINLINE_DEBUG, NYASH_LOOPFORM_DEBUG
2. **Updated debug.rs** - Delegates trace_varmap() to JoinLoopTrace
3. **Updated routing.rs** - All eprintln! replaced with trace calls (10 instances)
4. **Updated pattern routers** - All 3 patterns now use unified trace
- pattern1_minimal.rs: 6 replacements
- pattern2_with_break.rs: 6 replacements
- pattern3_with_if_phi.rs: 6 replacements
- router.rs: 2 replacements
5. **Updated merge/block_allocator.rs** - 6 eprintln! → trace calls
# Benefits
- **Single Source of Truth**: All trace control through environment variables
- **Consistent Format**: Unified [trace:*] prefix for easy filtering
- **Zero Overhead**: No output when env vars unset
- **Easy Extension**: Add new trace points via existing API
- **Better Debug Experience**: Structured output with clear categories
# Testing
✅ cargo build --release - Success
✅ NYASH_TRACE_VARMAP=1 - Shows varmap traces only
✅ NYASH_JOINIR_DEBUG=1 - Shows joinir + blocks + routing traces
✅ No env vars - No debug output
✅ apps/tests/loop_min_while.hako - All tests pass
# Related
- Phase 191-194 groundwork (modular merge structure)
- NYASH_TRACE_VARMAP added today for variable_map debugging
- Consolidates ~80 scattered eprintln! calls across JoinIR
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 22:23:51 +09:00
|
|
|
// Phase 195: Use unified trace for pattern matching
|
|
|
|
|
trace::trace().pattern("route", entry.name, true);
|
2025-12-05 22:11:39 +09:00
|
|
|
return (entry.lower)(builder, ctx);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-08 18:36:13 +09:00
|
|
|
// No pattern matched - return None (caller will handle error)
|
|
|
|
|
// Phase 187-2: Legacy LoopBuilder removed, all loops must use JoinIR
|
2025-12-05 22:11:39 +09:00
|
|
|
if ctx.debug {
|
2025-12-11 19:11:26 +09:00
|
|
|
trace::trace().debug(
|
|
|
|
|
"route",
|
|
|
|
|
&format!(
|
|
|
|
|
"No pattern matched for function '{}' (pattern_kind={:?})",
|
|
|
|
|
ctx.func_name, ctx.pattern_kind
|
|
|
|
|
),
|
|
|
|
|
);
|
2025-12-05 22:11:39 +09:00
|
|
|
}
|
|
|
|
|
Ok(None)
|
|
|
|
|
}
|