fix more bugs for bloqade qft (#245)

Author: Roger-luo

src/kirin/dialects/py/binop/typeinfer.py

@@ -27,9 +27,9 @@ def subf(self, *_):
     def subi(self, *_):
         return (types.Int,)
 
-    @interp.impl(stmts.Sub, types.Float, types.Float)
-    @interp.impl(stmts.Sub, types.Float, types.Int)
-    @interp.impl(stmts.Sub, types.Int, types.Float)
+    @interp.impl(stmts.Mult, types.Float, types.Float)
+    @interp.impl(stmts.Mult, types.Float, types.Int)
+    @interp.impl(stmts.Mult, types.Int, types.Float)
     def multf(self, *_):
         return (types.Float,)
 

src/kirin/dialects/scf/absint.py

@@ -1,4 +1,4 @@
-from kirin import ir, types, interp
+from kirin import ir, interp
 from kirin.analysis import const
 from kirin.dialects import func
 
@@ -53,10 +53,10 @@ def _infer_if_else_cond(
         body_block = body.blocks[0]
         body_term = body_block.last_stmt
         if isinstance(body_term, func.Return):
-            frame.worklist.append(interp.Successor(body_block, types.Bool))
+            frame.worklist.append(interp.Successor(body_block, frame.get(stmt.cond)))
             return
 
         with interp_.state.new_frame(interp_.new_frame(stmt)) as body_frame:
             body_frame.entries.update(frame.entries)
-            body_frame.set(body_block.args[0], types.Bool)
-            return interp_.run_ssacfg_region(body_frame, stmt.then_body)
+            body_frame.set(body_block.args[0], frame.get(stmt.cond))
+            return interp_.run_ssacfg_region(body_frame, body)

src/kirin/dialects/scf/typeinfer.py

@@ -37,15 +37,19 @@ def for_loop(
 
         eltype = interp_.run_stmt(ElType(ir.TestValue()), (iterable,))
         if not isinstance(eltype, tuple):  # error
-            return (interp_.lattice.bottom(),)
+            return
         item = eltype[0]
         frame.set_values(block_args, (item,) + loop_vars)
 
         if isinstance(body_block.last_stmt, func.Return):
             frame.worklist.append(interp.Successor(body_block, item, *loop_vars))
             return  # if terminate is Return, there is no result
 
-        loop_vars_ = interp_.run_ssacfg_region(frame, stmt.body)
+        with interp_.state.new_frame(interp_.new_frame(stmt)) as body_frame:
+            body_frame.entries.update(frame.entries)
+            loop_vars_ = interp_.run_ssacfg_region(body_frame, stmt.body)
+
+        frame.entries.update(body_frame.entries)
         if isinstance(loop_vars_, interp.ReturnValue):
             return loop_vars_
         elif isinstance(loop_vars_, tuple):

src/kirin/dialects/scf/unroll.py

@@ -62,7 +62,7 @@ def rewrite_Statement(self, node: ir.Statement) -> RewriteResult:
         # TODO: support for PartialTuple and IList with known length
         if not isinstance(hint := node.iterable.hints.get("const"), const.Value):
             return RewriteResult()
-
+        print(hint)
         loop_vars = node.initializers
         for item in hint.data:
             body = node.body.clone()

src/kirin/passes/abc.py

@@ -33,7 +33,8 @@ def __call__(self, mt: Method) -> RewriteResult:
     def fixpoint(self, mt: Method, max_iter: int = 32) -> RewriteResult:
         result = RewriteResult()
         for _ in range(max_iter):
-            result = self.unsafe_run(mt).join(result)
+            result_ = self.unsafe_run(mt)
+            result = result_.join(result)
             if not result.has_done_something:
                 break
         mt.code.verify()

src/kirin/rewrite/wrap_const.py

@@ -27,6 +27,8 @@ def wrap(self, value: ir.SSAValue) -> bool:
         const_hint = value.hints.get("const")
         if const_hint and isinstance(const_hint, const.Result):
             const_result = result.join(const_hint)
+            if const_result.is_equal(const_hint):
+                return False
         else:
             const_result = result
         value.hints["const"] = const_result