Skip to content

Ixsimpl integration#1130

Open
Hardcode84 wants to merge 28 commits intoiree-org:mainfrom
Hardcode84:ixsimpl
Open

Ixsimpl integration#1130
Hardcode84 wants to merge 28 commits intoiree-org:mainfrom
Hardcode84:ixsimpl

Conversation

@Hardcode84
Copy link
Copy Markdown
Contributor

@Hardcode84 Hardcode84 commented Mar 15, 2026 •
edited
Loading

ftynse
ftynse reviewed Mar 16, 2026
View reviewed changes
Comment thread wave_lang/kernel/wave/utils/symbol_utils.py Outdated
Comment on lines +70 to +71
# Module-level context reused across calls to benefit from hash-consing.
_ixs_ctx = ixsimpl.Context()
Copy link
Copy Markdown
Contributor

@ftynse ftynse Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider thread-safety.

Copy link
Copy Markdown
Contributor Author

@Hardcode84 Hardcode84 Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's an interesting question, the C context itself is not thread safe, but it would be safe if called it under GIL. Otherwise, we can try to create thread-local contexts.

Copy link
Copy Markdown
Contributor

@ftynse ftynse Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GIL is optional since Python 3.13 https://peps.python.org/pep-0703/. Since the context is essentially a cache, making it thread-local sounds reasonable.

Comment thread wave_lang/kernel/wave/utils/symbol_utils.py Outdated
result = ixs_simplify(expr)
if result is not expr:
return result
# Fallback: ixs_simplify returned expr unchanged (conversion error).
Copy link
Copy Markdown
Contributor

@ftynse ftynse Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to differentiate the situation where there was a conversion error from an expression that wasn't simplified without errors.

Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Mar 19, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
7818558 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
Copy link
Copy Markdown
Contributor Author

Hardcode84 commented Mar 19, 2026

(undrafting so tests can actually run)

@Hardcode84 Hardcode84 marked this pull request as ready for review March 19, 2026 10:32
@Hardcode84 Hardcode84 force-pushed the ixsimpl branch 2 times, most recently from f628523 to 7a78aa0 Compare March 20, 2026 14:19
@Hardcode84
Copy link
Copy Markdown
Contributor Author

Hardcode84 commented Mar 20, 2026

extracted waveasm fix #1156

Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Mar 20, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
87b7355 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Mar 24, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
9b7579b 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
Copy link
Copy Markdown
Contributor Author

Hardcode84 commented Mar 24, 2026

@harsh-nod @ftynse added an initial doc with gaps analysis

Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Mar 26, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
277b1d7 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Mar 27, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
0aa99bf 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Mar 30, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
873c1a5 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Apr 7, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
395a984 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Apr 8, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
630311b 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 added a commit to Hardcode84/wave that referenced this pull request Apr 9, 2026
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
6c6219a 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 and others added 6 commits April 10, 2026 00:25
@Hardcode84 @claude
Add ixsimpl roundtrip helper and clean up debug prints
4efd550 
Introduce ixs_simplify() in symbol_utils.py: converts a sympy
expression to ixsimpl, simplifies with assumptions derived from
sympy symbol properties, and converts back. Uses a module-level
ixsimpl.Context for hash-consing reuse across calls. Accepts
optional extra_assumptions for future divisibility plumbing.

Remove the debug print statements and throwaway ixsimpl hack
from the custom simplify() wrapper.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Replace sympy.simplify with ixs_simplify in graph_utils.py
452de1c 
Switch 4 equivalence-check call sites from sympy.simplify to
ixs_simplify roundtrip: _check_expr_equivalent (2 sites) and
_sympy_equiv (2 sites).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Replace sympy.simplify with ixs_simplify in index equality checks
a8ed648 
Switch 3 call sites in _check_index_difference_is_zero() from
sympy.simplify to ixs_simplify roundtrip.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Replace sympy.simplify with ixs_simplify in preshuffle pattern detection
bfeb8c3 
Switch 2 equivalence checks in _is_scale_preshuffle_mapping() from
sympy.simplify to ixs_simplify roundtrip.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Replace sympy.simplify with ixs_simplify in ensure_symbols_positive
750e381 
Switch 3 call sites in ensure_symbols_positive() from sympy.simplify
to ixs_simplify roundtrip. The remapped positive/nonnegative symbol
assumptions are picked up automatically by extract_assumptions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Replace sympy.simplify with ixs_simplify for multicast mask in read_w…
7855a38 
…rite.py

Switch the standalone sympy.simplify call on the multicast mask
expression to ixs_simplify roundtrip.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
Hardcode84 and others added 20 commits April 10, 2026 00:26
@Hardcode84 @claude
Replace sympy.simplify with ixs_simplify in water_emitter.py
811a416 
Switch the sympy.simplify call in convert_sympy_expr_to_affine()
to ixs_simplify roundtrip. The positive symbol assumptions from
the symbol_mapping substitution are captured automatically.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Replace sympy.simplify with ixs_simplify in multicast mask computation
8eedd61 
Switch the Piecewise mask simplification in compute_multicast_mask()
to ixs_simplify roundtrip. This was a known slow path with
sympy.simplify on complex Piecewise expressions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Replace custom simplify() wrapper with ixs_simplify primary path
a3260e5 
Delegate simplify() to ixs_simplify as the primary simplification
engine. Falls back to the old sympy expand + bounds + cancel loop
only when ixs_simplify returns the expression unchanged (indicating
a conversion error). Remove the _simplify_cache dict since ixsimpl
handles structural deduplication via hash-consing.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Update tests for ixsimpl canonical forms
931965b 
- wave_utils_test.py: Update Mod simplification assertion to match
  ixsimpl's canonical form (Mod(4*a, 16) vs 4*Mod(a, 4)).
- mma.py LIT test: Relax cluster mask CHECK lines since ixsimpl
  flattens Piecewise into individual selects rather than a cascaded
  chain. Both forms are algebraically equivalent.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Add ixsimpl as git dependency pinned to specific commit
93f35bc 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Make ixsimpl context thread-local and differentiate conversion errors
1f7abb2 
Address PR iree-org#1130 review feedback:
- Use threading.local() for ixsimpl context instead of a module-level
  global, since the C context is not thread-safe and GIL is optional
  since Python 3.13.
- Extract _ixs_simplify_core that propagates conversion exceptions,
  so simplify() only falls back to the sympy path on actual conversion
  failures, not when ixsimpl processed the expression successfully
  but could not simplify it further.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
update sha
e7d37d6 
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
update sha
4d41327 
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Fix nested _Rational in Pow codegen for negative exponents
190c20b 
When Pow(X, -1) is codegen'd and X contains a division (producing a
_Rational on the stack), the base must be resolved to an MLIR value
before wrapping in a new _Rational. Otherwise a nested _Rational
propagates to floor/floordiv_expr which expects flat numerator and
denominator values.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Add sympy-to-ixsimpl migration plan
3828314 
Documents the incremental strategy for transitioning from sympy to
ixsimpl as the primary expression IR, with API gap analysis and a
6-phase plan where phases 1/2/4 can run in parallel.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Update migration plan for new ixsimpl API (lambdify, has, eval, check)
f754280 
ixsimpl now covers every sympy feature used in Wave: lambdify() and
Expr.eval() replace sympy.lambdify, Expr.has() is native, abs_() is
provided, and ctx.check() replaces the sympy.solve entailment check.
No hard API gaps remain; end state is full sympy removal.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
update sha
82fdcdd 
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
update sha
5d0dce1 
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Remove ixsimpl git dep and update lit tests for new simplification forms
9317a4d 
ixsimpl is now vendored as a subfolder, so the pip git dependency is
no longer needed. Updated affine map CHECK lines in gather_to_shared
and gemm lit tests to match the new canonical form where `mod` is
expanded to `x - (x floordiv N) * N`.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 @claude
Use ixsimpl simplify in annotate_iv_strides tests
6bc4fa1 
sympy.simplify cannot reduce floor/mod identities like
-16*t + 16*(t%16) + 256*floor(t/16). Replace with
ixsimpl-backed simplify from symbol_utils which handles
these natively.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
fix test
0c04e26 
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
Add regression test for shifted Mod simplification gap
c32eb4e 
Document the current ixsimpl regression where floor(Mod(4*x + 3, 16) / 16) fails to fold to zero so the gap stays visible without breaking the suite.

Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
Vendor newer ixsimpl to tighten Mod bounds
024395c 
Bring third_party/ixsimpl forward to upstream commit 0032f44 so scaled Mod bounds fold floor(Mod(4*x + 3, 16) / 16) to zero. Drop the temporary xfail now that the vendored simplifier handles the regression.

Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
Update persistent gemm lit check for ixsimpl simplification
7138f64 
The newer vendored ixsimpl seeds the persistent loop directly from %block_id_x, so drop the stale index_cast roundtrip expectation from the lit test.

Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
pre-commit
099e6ac 
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
Revert "Update persistent gemm lit check for ixsimpl simplification"
22a9ea1 
This reverts commit 7138f64.

Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84
fix test
c1f8d92 
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
@Hardcode84 Hardcode84 changed the title Ixsimpl integration POC Ixsimpl integration Apr 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ftynse ftynse ftynse left review comments

@harsh-nod harsh-nod Awaiting requested review from harsh-nod

@panditsa panditsa Awaiting requested review from panditsa

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Hardcode84 @ftynse