Merge branch 'main' into roger/scf

Author: Roger-luo

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
         with:
           # Install a specific version of uv.
           version: "0.5.1"
@@ -39,7 +39,7 @@ jobs:
         # For example, using `pytest`
         run: uv run just coverage
       - name: Upload Coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           files: coverage.xml # optional
           fail_ci_if_error: true # optional (default = false)

.github/workflows/devdoc.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
         with:
         # Install a specific version of uv.
           version: "0.5.1"

.github/workflows/doc.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
         with:
           # Install a specific version of uv.
           version: "0.5.1"

.github/workflows/pub_doc.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
         with:
         # Install a specific version of uv.
           version: "0.5.1"

.github/workflows/release.yml

@@ -0,0 +1,27 @@
+name: Release on JFrog
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  documentation:
+    name: Publish package to JFrog
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+        with:
+        # Install a specific version of uv.
+          version: "0.5.1"
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+      - name: Install dependencies
+        run: uv sync
+      - name: Build
+        run: uv build
+      - name: Publish
+        run: uv publish --publish-url ${{secrets.JFROG_KIRIN_URL}} --username ${{secrets.JFROG_KIRIN_USERNAME}} --password ${{secrets.JFROG_KIRIN_PASSWORD}}

docs/def.md

@@ -18,7 +18,7 @@ In this section, we will learn about the terminology used in Kirin IR. This will
 
 ::: kirin.ir.Attribute
 
-::: kirin.ir.TypeAttribute
+::: kirin.ir.types.TypeAttribute
 
 ## Traits
 

example/beer/interp.py

@@ -1,36 +1,36 @@
 from random import randint
 
 from attrs import Beer
+from stmts import Pour, Puke, Drink, NewBeer, RandomBranch
 from dialect import dialect
-from stmts import Drink, NewBeer, Pour, Puke, RandomBranch
 
-from kirin.interp import DialectInterpreter, Interpreter, ResultValue, Successor, impl
+from kirin.interp import Frame, Successor, Interpreter, MethodTable, impl
 
 
 @dialect.register
-class BeerInterpreter(DialectInterpreter):
+class BeerInterpreter(MethodTable):
 
     @impl(NewBeer)
-    def new_beer(self, interp: Interpreter, stmt: NewBeer, values: tuple):
-        return ResultValue(Beer(values[0]))
+    def new_beer(self, interp: Interpreter, frame: Frame, stmt: NewBeer):
+        return (Beer(frame.get(stmt.brand)),)
 
     @impl(Drink)
-    def drink(self, interp: Interpreter, stmt: Drink, values: tuple):
-        print(f"Drinking {values[0].brand}")
-        return ResultValue()
+    def drink(self, interp: Interpreter, frame: Frame, stmt: Drink):
+        print(f"Drinking {frame.get(stmt.beverage).brand}")
+        return ()
 
     @impl(Pour)
-    def pour(self, interp: Interpreter, stmt: Pour, values: tuple):
-        print(f"Pouring {values[0].brand} {values[1]}")
-        return ResultValue()
+    def pour(self, interp: Interpreter, frame: Frame, stmt: Pour):
+        print(f"Pouring {frame.get(stmt.beverage).brand} {frame.get(stmt.amount)}")
+        return ()
 
     @impl(Puke)
-    def puke(self, interp: Interpreter, stmt: Puke, values: tuple):
+    def puke(self, interp: Interpreter, frame: Frame, stmt: Puke):
         print("Puking!!!")
-        return ResultValue()
+        return ()
 
     @impl(RandomBranch)
-    def random_branch(self, interp: Interpreter, stmt: RandomBranch, values: tuple):
+    def random_branch(self, interp: Interpreter, frame: Frame, stmt: RandomBranch):
         frame = interp.state.current_frame()
         if randint(0, 1):
             return Successor(

example/beer/script.py

@@ -1,11 +1,11 @@
+from stmts import Pour, Puke, Drink, NewBeer
 from dialect import dialect
-from stmts import Drink, NewBeer, Pour, Puke
 
 from interp import BeerInterpreter as BeerInterpreter
+from rewrite import RandomWalkBranch
 from kirin.ir import dialect_group
 from kirin.prelude import basic_no_opt
-from kirin.rewrite import Fixpoint, Walk
-from rewrite import RandomWalkBranch
+from kirin.rewrite import Walk, Fixpoint
 
 
 # create our own beer dialect, it runs a random walk on the branches
@@ -24,14 +24,14 @@ def run_pass(mt):
 # type: ignore
 @beer
 def main(x):
-    beer = NewBeer("budlight")  # type: ignore
-    Drink(beer)  # type: ignore
-    Pour(beer, 12)  # type: ignore
+    beer = NewBeer("budlight")
+    Drink(beer)
+    Pour(beer, 12)
     Puke()
     if x > 1:
-        Drink(NewBeer("heineken"))  # type: ignore
+        Drink(NewBeer("heineken"))
     else:
-        Drink(NewBeer("tsingdao"))  # type: ignore
+        Drink(NewBeer("tsingdao"))
     return x + 1
 
 

example/beer/stmts.py

@@ -1,43 +1,42 @@
 from attrs import Beer
 from dialect import dialect
 
+from kirin import ir, types
 from kirin.decl import info, statement
-from kirin.dialects.py import types
-from kirin.ir import Block, IsTerminator, Pure, ResultValue, SSAValue, Statement
 
 
 @statement(dialect=dialect)
-class NewBeer(Statement):
+class NewBeer(ir.Statement):
     name = "new_beer"
-    traits = frozenset({Pure()})
-    brand: SSAValue = info.argument(types.String)
-    result: ResultValue = info.result(types.PyClass(Beer))
+    traits = frozenset({ir.Pure()})
+    brand: ir.SSAValue = info.argument(types.String)
+    result: ir.ResultValue = info.result(types.PyClass(Beer))
 
 
 @statement(dialect=dialect)
-class Drink(Statement):
+class Drink(ir.Statement):
     name = "drink"
-    beverage: SSAValue = info.argument(types.PyClass(Beer))
+    beverage: ir.SSAValue = info.argument(types.PyClass(Beer))
 
 
 @statement(dialect=dialect)
-class Pour(Statement):
+class Pour(ir.Statement):
     name = "pour"
-    beverage: SSAValue = info.argument(types.PyClass(Beer))
-    amount: SSAValue = info.argument(types.Int)
+    beverage: ir.SSAValue = info.argument(types.PyClass(Beer))
+    amount: ir.SSAValue = info.argument(types.Int)
 
 
 @statement(dialect=dialect)
-class RandomBranch(Statement):
+class RandomBranch(ir.Statement):
     name = "random_br"
-    traits = frozenset({IsTerminator()})
-    cond: SSAValue = info.argument(types.Bool)
-    then_arguments: tuple[SSAValue, ...] = info.argument()
-    else_arguments: tuple[SSAValue, ...] = info.argument()
-    then_successor: Block = info.block()
-    else_successor: Block = info.block()
+    traits = frozenset({ir.IsTerminator()})
+    cond: ir.SSAValue = info.argument(types.Bool)
+    then_arguments: tuple[ir.SSAValue, ...] = info.argument()
+    else_arguments: tuple[ir.SSAValue, ...] = info.argument()
+    then_successor: ir.Block = info.block()
+    else_successor: ir.Block = info.block()
 
 
 @statement(dialect=dialect)
-class Puke(Statement):
+class Puke(ir.Statement):
     name = "puke"

mkdocs.yml

@@ -42,7 +42,7 @@ nav:
       - IR declaration: reference/kirin/decl/
       - Exceptions: reference/kirin/exceptions.md
       - Data Structures:
-          - Lattice: reference/kirin/lattice.md
+          - Lattice: reference/kirin/lattice/abc.md
           - Graph: reference/kirin/graph.md
           - IdTable: reference/kirin/idtable.md
           - Source: reference/kirin/source.md