Merge main into next #2534
Merged
Merge main into next #2534
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix: bypass decorator retrieval in release mode Gate all decorator retrieval calls behind `in_debug_mode` checks, ensuring zero overhead when debugging is disabled. Processor changes: - before_enter/after_exit decorator loops - decorators_for_op in basic block execution FastProcessor changes: - execute_before_enter_decorators early return - execute_after_exit_decorators early return - decorators_for_op in basic block execution Includes spy tests to verify retrieval is bypassed. * fix(core): strip decorators while maintaining valid CSR structure Update strip_decorators() to create an empty but valid CSR structure instead of calling clear(), which removed the structure entirely and caused panics when accessing decorator information after stripping. - Add DebugInfo::empty_for_nodes(num_nodes) to create valid empty CSR - Update from_components to accept empty structures - Add edge case tests for empty forest, idempotency, multiple node types * fix(processor): gate error context decorator access with in_debug_mode This fix resolves a 20x performance degradation in release mode when decorators were present in the MastForest but not being executed. Root Cause: The err_ctx! macro was unconditionally calling node.get_assembly_op(), which traversed the CSR decorator storage on every operation (522,059 times in blake3 benchmark), even when in_debug_mode was false. This caused execution time to increase from 191ms to 3,884ms. Solution: Modified the error context creation pipeline to accept and respect the in_debug_mode flag: - Updated err_ctx! macro to require in_debug_mode parameter - Updated ErrorContextImpl::new() and new_with_op_idx() to accept in_debug_mode - Modified precalc_label_and_source_file() to return early when !in_debug_mode, avoiding expensive decorator traversal - Updated all err_ctx!() call sites in Process and FastProcessor to pass in_debug_mode flag Performance Impact: - Before: Op execution time 3,884ms (7,439ns/op) - After: Op execution time 191ms (366ns/op) - Improvement: 20.3x faster When in_debug_mode is false, decorators (including AsmOp decorators used for error context) are no longer accessed, even if present in the MastForest. * chore: Changelog
huitseeker
force-pushed
the
huitseeker/merge-main-into-next
branch
from
7bdf5b5 to
ae25ef5
Compare
huitseeker
added
the
no changelog
This merge brings the decorator bypass optimization from main (#2529) into next. The changes adapt the decorator bypass optimization to next's architecture: - No changes to legacy Process (removed in next) - All changes apply to FastProcessor only - Decorator retrieval gated behind in_debug_mode checks - Error context creation respects in_debug_mode flag Performance impact: ~10% overall speedup, 99.7% reduction in trace execution time. Conflicts resolved using solutions from huitseeker/decorator-bypass-on-next rebase work.
huitseeker
force-pushed
the
huitseeker/merge-main-into-next
branch
from
ae25ef5 to
2112b5e
Compare
bobbinth
approved these changes
Jan 5, 2026
Contributor
bobbinth
left a comment
bobbinth
left a comment
There was a problem hiding this comment.
Looks good! Thank you!
A couple of comments for the future (which I also mentioned in other places):
- We may want to simplify
execute_op_batch()method to passnode_idinstead ofbasic_blockas a parameter, and more generally, think about how to simplify the parameters passed into this method. - Ideally, with some future refactorings, stripping decorators would result in full removal of the
DebugInfostruct (and we should probably renamestrip_decorators()intoclear_debug_info()or something similar).
Contributor
|
Ah - I should have merged this w/o squashing. Sorry! Will make a commit into |
Contributor
|
This was referenced Jan 5, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges
mainintonext, bringing the decorator bypass optimization from #2529 into the next development branch.What's Being Merged
The decorator bypass optimization that was merged to main via #2529, which includes:
in_debug_modechecks