bloqade-circuit 0.7.2__py3-none-any.whl → 0.7.4__py3-none-any.whl

bloqade/qasm2/rewrite/register.py

@@ -2,7 +2,7 @@ from kirin import ir
 from kirin.dialects import py
 from kirin.rewrite.abc import RewriteRule, RewriteResult
 
-from bloqade.qasm2.dialects import core
+from bloqade.qasm2.dialects import core, expr
 
 
 class RaiseRegisterRule(RewriteRule):
@@ -26,7 +26,7 @@ class RaiseRegisterRule(RewriteRule):
         n_qubits_ref = node.n_qubits
 
         n_qubits = n_qubits_ref.owner
-        if isinstance(n_qubits, py.Constant):
+        if isinstance(n_qubits, py.Constant | expr.ConstInt):
             # case where the n_qubits comes from a constant
             new_n_qubits = n_qubits.from_stmt(n_qubits)
             new_n_qubits.insert_before(first_stmt)

bloqade/qasm2/rewrite/uop_to_parallel.py

@@ -8,7 +8,7 @@ from kirin.rewrite.abc import RewriteRule, RewriteResult
 from kirin.analysis.const import lattice
 
 from bloqade.analysis import address
-from bloqade.qasm2.dialects import uop, core, parallel
+from bloqade.qasm2.dialects import uop, core, expr, parallel
 from bloqade.squin.analysis.schedule import StmtDag
 
 
@@ -194,6 +194,8 @@ class SimpleMergePolicy(MergePolicyABC):
                     new_qubits.append(new_qubit.result)
                 case core.QRegGet(
                     reg=reg, idx=ir.ResultValue(stmt=py.Constant() as idx)
+                ) | core.QRegGet(
+                    reg=reg, idx=ir.ResultValue(stmt=expr.ConstInt() as idx)
                 ):
                     (new_idx := idx.from_stmt(idx)).insert_before(node)
                     (

bloqade/stim/passes/__init__.py

@@ -1,5 +1,4 @@
 from .squin_to_stim import (
     SquinToStimPass as SquinToStimPass,
     StimSimplifyIfs as StimSimplifyIfs,
-    AggressiveForLoopUnroll as AggressiveForLoopUnroll,
 )

bloqade/stim/passes/squin_to_stim.py

@@ -1,23 +1,21 @@
 from dataclasses import dataclass
 
-from kirin.passes import Fold, HintConst, TypeInfer
+from kirin.passes import Fold, TypeInfer
 from kirin.rewrite import (
     Walk,
     Chain,
     Fixpoint,
     CFGCompactify,
-    InlineGetItem,
-    InlineGetField,
     DeadCodeElimination,
     CommonSubexpressionElimination,
 )
-from kirin.dialects import scf, ilist
+from kirin.dialects import ilist
 from kirin.ir.method import Method
 from kirin.passes.abc import Pass
 from kirin.rewrite.abc import RewriteResult
 from kirin.passes.inline import InlinePass
 from kirin.rewrite.alias import InlineAlias
-from kirin.dialects.scf.unroll import PickIfElse
+from kirin.passes.aggressive import UnrollScf
 
 from bloqade.stim.rewrite import (
     SquinWireToStim,
@@ -41,37 +39,6 @@ from .simplify_ifs import StimSimplifyIfs
 from ..rewrite.ifs_to_stim import IfToStim
 
 
-@dataclass
-class AggressiveForLoopUnroll(Pass):
-    """
-    Aggressive unrolling of for loops, addresses cases where unroll
-    does not successfully handle nested loops because of a lack of constprop.
-
-    This should be invoked via fixpoint to let this be repeatedly applied until
-    no further rewrites are possible.
-    """
-
-    def unsafe_run(self, mt: Method) -> RewriteResult:
-        rule = Chain(
-            InlineGetField(),
-            InlineGetItem(),
-            scf.unroll.ForLoop(),
-            scf.trim.UnusedYield(),
-        )
-
-        # Intentionally only walk ONCE, let fixpoint happen with the WHOLE pass
-        # so that HintConst gets run right after, allowing subsequent unrolls to happen
-        rewrite_result = Walk(rule).rewrite(mt.code)
-
-        rewrite_result = (
-            HintConst(dialects=mt.dialects, no_raise=self.no_raise)
-            .unsafe_run(mt)
-            .join(rewrite_result)
-        )
-
-        return rewrite_result
-
-
 @dataclass
 class SquinToStimPass(Pass):
 
@@ -82,8 +49,11 @@ class SquinToStimPass(Pass):
             dialects=mt.dialects, no_raise=self.no_raise
         ).unsafe_run(mt)
 
+        rewrite_result = Walk(ilist.rewrite.HintLen()).rewrite(mt.code)
+        rewrite_result = Fold(self.dialects).unsafe_run(mt).join(rewrite_result)
+
         rewrite_result = (
-            AggressiveForLoopUnroll(dialects=mt.dialects, no_raise=self.no_raise)
+            UnrollScf(dialects=mt.dialects, no_raise=self.no_raise)
             .fixpoint(mt)
             .join(rewrite_result)
         )
@@ -92,11 +62,7 @@ class SquinToStimPass(Pass):
             Walk(Fixpoint(CFGCompactify())).rewrite(mt.code).join(rewrite_result)
         )
 
-        rewrite_result = (
-            Walk(Chain(InlineAlias(), PickIfElse()))
-            .rewrite(mt.code)
-            .join(rewrite_result)
-        )
+        rewrite_result = Walk(InlineAlias()).rewrite(mt.code).join(rewrite_result)
 
         rewrite_result = (
             StimSimplifyIfs(mt.dialects, no_raise=self.no_raise)
@@ -111,6 +77,12 @@ class SquinToStimPass(Pass):
         )
         rewrite_result = Fold(mt.dialects, no_raise=self.no_raise)(mt)
 
+        rewrite_result = (
+            UnrollScf(mt.dialects, no_raise=self.no_raise)
+            .fixpoint(mt)
+            .join(rewrite_result)
+        )
+
         rewrite_result = (
             CanonicalizeIList(dialects=mt.dialects, no_raise=self.no_raise)
             .unsafe_run(mt)

{bloqade_circuit-0.7.2.dist-info → bloqade_circuit-0.7.4.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: bloqade-circuit
-Version: 0.7.2
+Version: 0.7.4
 Summary: The software development toolkit for neutral atom arrays.
 Author-email: Roger-luo <rluo@quera.com>, kaihsin <khwu@quera.com>, weinbe58 <pweinberg@quera.com>, johnzl-777 <jlong@quera.com>
 License-File: LICENSE
 Requires-Python: >=3.10
-Requires-Dist: kirin-toolchain~=0.17.17
+Requires-Dist: kirin-toolchain~=0.17.23
 Requires-Dist: numpy>=1.22.0
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: pydantic<2.11.0,>=1.3.0

{bloqade_circuit-0.7.2.dist-info → bloqade_circuit-0.7.4.dist-info}/RECORD

@@ -108,8 +108,8 @@ bloqade/qasm2/rewrite/insert_qubits.py,sha256=PpYNlJAl-TVtC1MJxIzOQWDetgW8OPXe6c
 bloqade/qasm2/rewrite/native_gates.py,sha256=GVutT1jf_gv9qaR5fLqjcmxcqCfMZTiQyg4Fq-TlmFM,18684
 bloqade/qasm2/rewrite/parallel_to_glob.py,sha256=TQ5EAYIx7pLpydSeeF2Ta0h5evaHHXaRtvtgz1X3Kfo,2750
 bloqade/qasm2/rewrite/parallel_to_uop.py,sha256=_banEox20L_qU1GTvKjSSDBkFg49UlSE-POuTCKnrzY,2351
-bloqade/qasm2/rewrite/register.py,sha256=sghKMBlsls9YLO6baXZ_m692aNpWgMdxZhinNznQDks,1541
-bloqade/qasm2/rewrite/uop_to_parallel.py,sha256=E3nME3UFaJjFQvU-xtK_BKRMfFK2kAJ3U1zwtT4PUJk,13014
+bloqade/qasm2/rewrite/register.py,sha256=0q-zkSdZih3BbRUDGnig8fFVQA9y2fhn3wdsu4Kbdm4,1563
+bloqade/qasm2/rewrite/uop_to_parallel.py,sha256=2_7SQh1SRQaCk6v0HbV0G2rSlUGscIHmmDQcaMIpTwE,13131
 bloqade/qasm2/rewrite/noise/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bloqade/qasm2/rewrite/noise/heuristic_noise.py,sha256=7C7yYC66HLZPlTynXwfZ5lKnJkLnDGLT7lVWxREozuc,7851
 bloqade/qasm2/rewrite/noise/remove_noise.py,sha256=rnalZ1igiTpCFJ9Z3PRdzcx-qnkkALv6iQO-_yz39kM,1097
@@ -207,9 +207,9 @@ bloqade/stim/emit/__init__.py,sha256=N2dPQY7OyqPwHAStDeOgYg2yfxqxMOz-N7pD5Z4JwlI
 bloqade/stim/emit/stim_str.py,sha256=JyEBoIhLQASogZcUWHI9tMD4JoXYrEqUr2qaZ30gZdc,1491
 bloqade/stim/parse/__init__.py,sha256=l2DjReB2KkgrDjP_4nP6RnoziiOewoSeZfTno1sVYTw,59
 bloqade/stim/parse/lowering.py,sha256=L-IcR_exlxsTVv4SQ0bhzIF4_L82P-GEdK6qRd6B86Y,23723
-bloqade/stim/passes/__init__.py,sha256=aysjOZyn0IrJQCQBEqiz8pwZ5u5t2s9TmEzA9Y9KG9w,167
+bloqade/stim/passes/__init__.py,sha256=hemzgyl_pwZi34secp1GqStAW0d09CEeKvLD0fXhbb8,111
 bloqade/stim/passes/simplify_ifs.py,sha256=zicqggWu_yzfrf2a7uUCt-ZenbYSEnFsyGxDfKw72qQ,1084
-bloqade/stim/passes/squin_to_stim.py,sha256=cDn4W9TEsCZQT5YhEMEId87LtLv4iqwaurwgTqtE1qQ,6421
+bloqade/stim/passes/squin_to_stim.py,sha256=mqCspofBJ60YUU5dl7AdxmctmHygk1yeRr4ucgD9TbU,5620
 bloqade/stim/rewrite/__init__.py,sha256=zL5G73JEsXkehN7gCtUgGnmC2BJ3vKihOd1ohVwM68E,480
 bloqade/stim/rewrite/ifs_to_stim.py,sha256=A3SndoGinZHLul17zXWyQrK_1Hy5I4qvuOskLIeDRMU,6942
 bloqade/stim/rewrite/py_constant_to_stim.py,sha256=PV8bHvn759-d_0JW4akaGSORW_oxigrlUBhAC51PJAU,1354
@@ -232,7 +232,7 @@ bloqade/visual/animation/runtime/atoms.py,sha256=EmjxhujLiHHPS_HtH_B-7TiqeHgvW5u
 bloqade/visual/animation/runtime/ppoly.py,sha256=JB9IP53N1w6adBJEue6J5Nmj818Id9JvrlgrmiQTU1I,1385
 bloqade/visual/animation/runtime/qpustate.py,sha256=rlmxQeJSvaohXrTpXQL5y-NJcpvfW33xPaYM1slv7cc,4270
 bloqade/visual/animation/runtime/utils.py,sha256=ju9IzOWX-vKwfpqUjlUKu3Ssr_UFPFFq-tzH_Nqyo_c,1212
-bloqade_circuit-0.7.2.dist-info/METADATA,sha256=KbeXmKGSQGhwyFXcGNCRRWoy4sX4-tovOlIh4t8UMQk,3850
-bloqade_circuit-0.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bloqade_circuit-0.7.2.dist-info/licenses/LICENSE,sha256=S5GIJwR6QCixPA9wryYb44ZEek0Nz4rt_zLUqP05UbU,13160
-bloqade_circuit-0.7.2.dist-info/RECORD,,
+bloqade_circuit-0.7.4.dist-info/METADATA,sha256=pvbmLzuKl7jWDD9tjP6Z5VckwUv4sqUb00ArREsgXwo,3850
+bloqade_circuit-0.7.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bloqade_circuit-0.7.4.dist-info/licenses/LICENSE,sha256=S5GIJwR6QCixPA9wryYb44ZEek0Nz4rt_zLUqP05UbU,13160
+bloqade_circuit-0.7.4.dist-info/RECORD,,