Skip to content

Commit 53c3024

Browse files
Roger-luoRoger-luo
authored
merge rule into rewrite (#135)
this PR merges the rules module into rewrite because they are just some rewrite rules...
1 parent 576e902 commit 53c3024

26 files changed

+61
-62
lines changed

‎src/kirin/passes/aggressive/fold.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
from dataclasses import dataclass
22

3-
from kirin.rules import aggressive
43
from kirin.passes import Pass
5-
from kirin.rewrite import RewriteResult
4+
from kirin.rewrite import RewriteResult, aggressive
65
from kirin.analysis import CFG, const
76
from kirin.ir.method import Method
87

‎src/kirin/passes/fold.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from kirin.ir import Method, SSACFGRegion
44
from kirin.rewrite import Walk, Chain, Fixpoint, RewriteResult
55
from kirin.analysis import const
6-
from kirin.rules.dce import DeadCodeElimination
76
from kirin.passes.abc import Pass
8-
from kirin.rules.fold import ConstantFold
9-
from kirin.rules.getitem import InlineGetItem
10-
from kirin.rules.call2invoke import Call2Invoke
11-
from kirin.rules.cfg_compactify import CFGCompactify
7+
from kirin.rewrite.dce import DeadCodeElimination
8+
from kirin.rewrite.fold import ConstantFold
9+
from kirin.rewrite.getitem import InlineGetItem
10+
from kirin.rewrite.call2invoke import Call2Invoke
11+
from kirin.rewrite.cfg_compactify import CFGCompactify
1212

1313

1414
@dataclass

‎src/kirin/passes/inline.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from kirin import ir
55
from kirin.passes import Pass
66
from kirin.rewrite import Walk, Fixpoint, RewriteResult
7-
from kirin.rules.dce import DeadCodeElimination
8-
from kirin.rules.inline import Inline
9-
from kirin.rules.cfg_compactify import CFGCompactify
7+
from kirin.rewrite.dce import DeadCodeElimination
8+
from kirin.rewrite.inline import Inline
9+
from kirin.rewrite.cfg_compactify import CFGCompactify
1010

1111

1212
def aggresive(x: ir.IRNode) -> bool:

‎src/kirin/passes/typeinfer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from kirin.ir import Method
44
from kirin.rewrite import Walk, RewriteResult
55
from kirin.passes.abc import Pass
6-
from kirin.rules.apply_type import ApplyType
76
from kirin.analysis.typeinfer import TypeInference
7+
from kirin.rewrite.apply_type import ApplyType
88

99

1010
@dataclass

‎src/kirin/rewrite/__init__.py‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
from kirin.rewrite.abc import RewriteRule as RewriteRule
2-
from kirin.rewrite.walk import Walk as Walk
3-
from kirin.rewrite.chain import Chain as Chain
4-
from kirin.rewrite.result import RewriteResult as RewriteResult
5-
from kirin.rewrite.fixpoint import Fixpoint as Fixpoint
1+
from .abc import RewriteRule as RewriteRule
2+
from .dce import DeadCodeElimination as DeadCodeElimination
3+
from .fold import ConstantFold as ConstantFold
4+
from .walk import Walk as Walk
5+
from .alias import InlineAlias as InlineAlias
6+
from .chain import Chain as Chain
7+
from .inline import Inline as Inline
8+
from .result import RewriteResult as RewriteResult
9+
from .getitem import InlineGetItem as InlineGetItem
10+
from .fixpoint import Fixpoint as Fixpoint
11+
from .getfield import InlineGetField as InlineGetField
12+
from .apply_type import ApplyType as ApplyType
13+
from .call2invoke import Call2Invoke as Call2Invoke
14+
from .cfg_compactify import CFGCompactify as CFGCompactify

src/kirin/rules/aggressive/__init__.py renamed to src/kirin/rewrite/aggressive/__init__.py

File renamed without changes.

src/kirin/rules/aggressive/fold.py renamed to src/kirin/rewrite/aggressive/fold.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
from kirin import ir, analysis
55
from kirin.rewrite import Walk, Chain, Fixpoint, RewriteRule, RewriteResult
6-
from kirin.rules.dce import DeadCodeElimination
7-
from kirin.rules.fold import ConstantFold
8-
from kirin.rules.inline import Inline
6+
from kirin.rewrite.dce import DeadCodeElimination
7+
from kirin.rewrite.fold import ConstantFold
98
from kirin.ir.nodes.base import IRNode
10-
from kirin.rules.getitem import InlineGetItem
11-
from kirin.rules.getfield import InlineGetField
12-
from kirin.rules.call2invoke import Call2Invoke
13-
from kirin.rules.cfg_compactify import CFGCompactify
9+
from kirin.rewrite.inline import Inline
10+
from kirin.rewrite.getitem import InlineGetItem
11+
from kirin.rewrite.getfield import InlineGetField
12+
from kirin.rewrite.call2invoke import Call2Invoke
13+
from kirin.rewrite.cfg_compactify import CFGCompactify
1414

1515

1616
@dataclass

src/kirin/rules/alias.py renamed to src/kirin/rewrite/alias.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from dataclasses import dataclass
22

33
from kirin import ir
4-
from kirin.rewrite import RewriteRule, RewriteResult
54
from kirin.dialects.py import stmts
5+
from kirin.rewrite.abc import RewriteRule, RewriteResult
66

77

88
@dataclass

src/kirin/rules/apply_type.py renamed to src/kirin/rewrite/apply_type.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
CallableStmtInterface,
99
types,
1010
)
11-
from kirin.rewrite import RewriteRule, RewriteResult
11+
from kirin.rewrite.abc import RewriteRule, RewriteResult
1212
from kirin.dialects.func import Signature
1313

1414

src/kirin/rules/call2invoke.py renamed to src/kirin/rewrite/call2invoke.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from dataclasses import dataclass
22

33
from kirin import ir
4-
from kirin.rewrite import RewriteRule, RewriteResult
54
from kirin.analysis import const
5+
from kirin.rewrite.abc import RewriteRule, RewriteResult
66
from kirin.dialects.func import Call, Invoke
77

88

0 commit comments

Comments
 (0)