Unmark & fix a bunch of qasm2 tests

Author: david-pl

src/bloqade/qasm2/parse/lowering.py

@@ -450,7 +450,6 @@ def visit_Instruction(self, state: lowering.State[ast.Node], node: ast.Instructi
                 func.Invoke(
                     callee=value,
                     inputs=tuple(params + qargs),
-                    kwargs=tuple(),
                 )
             )
 

src/bloqade/qasm2/rewrite/uop_to_parallel.py

@@ -66,7 +66,7 @@ def same_id_checker(ssa1: ir.SSAValue, ssa2: ir.SSAValue):
             assert isinstance(hint1, lattice.Result) and isinstance(
                 hint2, lattice.Result
             )
-            return hint1.is_equal(hint2)
+            return hint1.is_structurally_equal(hint2)
         else:
             return False
 

src/bloqade/squin/analysis/schedule.py

@@ -185,18 +185,17 @@ def push_current_dag(self, block: ir.Block):
         self.stmt_dag = StmtDag()
         self.use_def = {}
 
-    def run_method(self, method: ir.Method, args: tuple[GateSchedule, ...]):
-        # NOTE: we do not support dynamic calls here, thus no need to propagate method object
-        return self.run_callable(method.code, (self.lattice.bottom(),) + args)
+    def method_self(self, method: ir.Method) -> GateSchedule:
+        return self.lattice.bottom()
 
-    def eval_stmt_fallback(self, frame: ForwardFrame, stmt: ir.Statement):
-        if stmt.has_trait(ir.IsTerminator):
+    def eval_fallback(self, frame: ForwardFrame, node: ir.Statement):
+        if node.has_trait(ir.IsTerminator):
             assert (
-                stmt.parent_block is not None
+                node.parent_block is not None
             ), "Terminator statement has no parent block"
-            self.push_current_dag(stmt.parent_block)
+            self.push_current_dag(node.parent_block)
 
-        return tuple(self.lattice.top() for _ in stmt.results)
+        return tuple(self.lattice.top() for _ in node.results)
 
     def _update_dag(self, stmt: ir.Statement, addr: address.Address):
         if isinstance(addr, address.AddressQubit):

test/qasm2/passes/test_global_to_parallel.py

@@ -1,6 +1,5 @@
 from typing import List
 
-import pytest
 from kirin import ir, types
 from kirin.rewrite import Walk, Fixpoint, CommonSubexpressionElimination
 from kirin.dialects import py, func, ilist
@@ -18,7 +17,6 @@ def as_float(value: float):
     return py.constant.Constant(value=value)
 
 
-@pytest.mark.xfail
 def test_global2para_rewrite():
 
     @qasm2.extended
@@ -79,7 +77,6 @@ def main():
     assert_methods(expected_method, main)
 
 
-@pytest.mark.xfail
 def test_global2para_rewrite2():
 
     @qasm2.extended

test/qasm2/passes/test_global_to_uop.py

@@ -1,6 +1,5 @@
 from typing import List
 
-import pytest
 from kirin import ir, types
 from kirin.rewrite import Walk, Fixpoint, CommonSubexpressionElimination
 from kirin.dialects import py, func
@@ -18,7 +17,6 @@ def as_float(value: float):
     return py.constant.Constant(value=value)
 
 
-@pytest.mark.xfail
 def test_global_rewrite():
 
     @qasm2.extended

test/qasm2/passes/test_heuristic_noise.py

@@ -1,4 +1,3 @@
-import pytest
 from kirin import ir, types
 from kirin.dialects import func, ilist
 from kirin.dialects.py import constant
@@ -256,7 +255,6 @@ def test_parallel_cz_gate_noise():
     assert_nodes(block, expected_block)
 
 
-@pytest.mark.xfail
 def test_global_noise():
 
     @qasm2.extended

test/qasm2/passes/test_parallel_to_global.py

@@ -1,10 +1,7 @@
-import pytest
-
 from bloqade import qasm2
 from bloqade.qasm2.passes.parallel import ParallelToGlobal
 
 
-@pytest.mark.xfail
 def test_basic_rewrite():
 
     @qasm2.extended
@@ -32,7 +29,6 @@ def main():
     )
 
 
-@pytest.mark.xfail
 def test_if_rewrite():
     @qasm2.extended
     def main():
@@ -67,7 +63,6 @@ def main():
     )
 
 
-@pytest.mark.xfail
 def test_should_not_be_rewritten():
 
     @qasm2.extended
@@ -93,7 +88,6 @@ def main():
     )
 
 
-@pytest.mark.xfail
 def test_multiple_registers():
     @qasm2.extended
     def main():
@@ -126,7 +120,6 @@ def main():
     )
 
 
-@pytest.mark.xfail
 def test_reverse_order():
     @qasm2.extended
     def main():

test/qasm2/passes/test_parallel_to_uop.py

@@ -1,6 +1,5 @@
 from typing import List
 
-import pytest
 from kirin import ir, types
 from kirin.dialects import py, func
 
@@ -17,7 +16,6 @@ def as_float(value: float):
     return py.constant.Constant(value=value)
 
 
-@pytest.mark.xfail
 def test_cz_rewrite():
 
     @qasm2.extended

test/qasm2/passes/test_uop_to_parallel.py

@@ -1,13 +1,10 @@
-import pytest
-
 from bloqade import qasm2
 from bloqade.qasm2 import glob
 from bloqade.analysis import address
 from bloqade.qasm2.passes import parallel
 from bloqade.qasm2.rewrite import SimpleOptimalMergePolicy
 
 
-@pytest.mark.xfail
 def test_one():
 
     @qasm2.gate
@@ -50,7 +47,6 @@ def test():
     )
 
 
-@pytest.mark.xfail
 def test_two():
 
     @qasm2.extended
@@ -89,7 +85,6 @@ def test():
     _, _ = address.AddressAnalysis(test.dialects).run(test)
 
 
-@pytest.mark.xfail
 def test_three():
 
     @qasm2.extended

test/qasm2/test_count.py

@@ -1,4 +1,3 @@
-import pytest
 from kirin import passes
 from kirin.dialects import py, ilist
 
@@ -16,7 +15,6 @@
 fold = passes.Fold(qasm2.main.add(py.tuple).add(ilist))
 
 
-@pytest.mark.xfail
 def test_fixed_count():
     @qasm2.main
     def fixed_count():
@@ -36,7 +34,6 @@ def fixed_count():
     assert address.qubit_count == 7
 
 
-@pytest.mark.xfail
 def test_multiple_return_only_reg():
 
     @qasm2.main.add(py.tuple)
@@ -54,7 +51,6 @@ def tuple_count():
     assert isinstance(ret.data[1], AddressReg) and ret.data[1].data == range(3, 7)
 
 
-@pytest.mark.xfail
 def test_dynamic_address():
     @qasm2.main
     def dynamic_address():
@@ -64,14 +60,16 @@ def dynamic_address():
         qasm2.measure(ra[0], ca[0])
         qasm2.measure(rb[1], ca[1])
         if ca[0] == ca[1]:
-            return ra
+            ret = ra
         else:
-            return rb
+            ret = rb
+
+        return ret
 
     # dynamic_address.code.print()
     dynamic_address.print()
     fold(dynamic_address)
-    frame, result = address.run_analysis(dynamic_address)
+    frame, result = address.run(dynamic_address)
     dynamic_address.print(analysis=frame.entries)
     assert isinstance(result, Unknown)
 
@@ -92,7 +90,6 @@ def dynamic_address():
 #     assert isinstance(result, ConstResult)
 
 
-@pytest.mark.xfail
 def test_multi_return():
     @qasm2.main.add(py.tuple)
     def multi_return_cnt():
@@ -110,7 +107,6 @@ def multi_return_cnt():
     assert isinstance(result.data[2], AddressReg)
 
 
-@pytest.mark.xfail
 def test_list():
     @qasm2.main.add(ilist)
     def list_count_analy():
@@ -120,12 +116,11 @@ def list_count_analy():
         return f
 
     list_count_analy.code.print()
-    _, ret = address.run_analysis(list_count_analy)
+    _, ret = address.run(list_count_analy)
 
     assert ret == AddressReg(data=(0, 1, 3))
 
 
-@pytest.mark.xfail
 def test_tuple_qubits():
     @qasm2.main.add(py.tuple)
     def list_count_analy2():
@@ -136,7 +131,7 @@ def list_count_analy2():
         return f
 
     list_count_analy2.code.print()
-    _, ret = address.run_analysis(list_count_analy2)
+    _, ret = address.run(list_count_analy2)
     assert isinstance(ret, PartialTuple)
     assert isinstance(ret.data[0], AddressQubit) and ret.data[0].data == 0
     assert isinstance(ret.data[1], AddressQubit) and ret.data[1].data == 1
@@ -166,7 +161,6 @@ def list_count_analy2():
 #     assert isinstance(result.data[5], AddressQubit) and result.data[5].data == 6
 
 
-@pytest.mark.xfail
 def test_alias():
 
     @qasm2.main