misc: move Python frontend things to xdsl.frontend.pyast

xdslproject · Feb 1, 2025 · dadef90 · dadef90
1 parent 2abd55b
commit dadef90
Show file tree

Hide file tree

Showing 33 changed files with 104 additions and 98 deletions.
diff --git a/tests/filecheck/frontend/dialects/affine.py b/tests/filecheck/frontend/dialects/affine.py
@@ -1,8 +1,8 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.exception import CodeGenerationException
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.exception import CodeGenerationException
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/tests/filecheck/frontend/dialects/arith.py b/tests/filecheck/frontend/dialects/arith.py
@@ -1,9 +1,9 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.dialects.builtin import f16, f32, f64, i1, i32, i64
-from xdsl.frontend.exception import CodeGenerationException
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.dialects.builtin import f16, f32, f64, i1, i32, i64
+from xdsl.frontend.pyast.exception import CodeGenerationException
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/tests/filecheck/frontend/dialects/builtin.py b/tests/filecheck/frontend/dialects/builtin.py
@@ -1,8 +1,8 @@
 # RUN: python %s | filecheck %s
 
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.dialects.builtin import (
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.dialects.builtin import (
     f16,
     f32,
     f64,
@@ -15,7 +15,7 @@
     ui32,
     ui64,
 )
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/tests/filecheck/frontend/dialects/cf.py b/tests/filecheck/frontend/dialects/cf.py
@@ -1,9 +1,9 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.dialects.builtin import i1, i32
-from xdsl.frontend.exception import CodeGenerationException
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.dialects.builtin import i1, i32
+from xdsl.frontend.pyast.exception import CodeGenerationException
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/tests/filecheck/frontend/dialects/func.py b/tests/filecheck/frontend/dialects/func.py
@@ -1,8 +1,8 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.dialects.builtin import i32
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.dialects.builtin import i32
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/tests/filecheck/frontend/dialects/invalid.py b/tests/filecheck/frontend/dialects/invalid.py
@@ -1,9 +1,12 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.dialects.builtin import i1, i32, i64
-from xdsl.frontend.exception import CodeGenerationException, FrontendProgramException
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.dialects.builtin import i1, i32, i64
+from xdsl.frontend.pyast.exception import (
+    CodeGenerationException,
+    FrontendProgramException,
+)
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 

diff --git a/tests/filecheck/frontend/dialects/scf.py b/tests/filecheck/frontend/dialects/scf.py
@@ -1,9 +1,9 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.dialects.builtin import f32, i1, i32, index
-from xdsl.frontend.exception import CodeGenerationException
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.dialects.builtin import f32, i1, i32, index
+from xdsl.frontend.pyast.exception import CodeGenerationException
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/tests/filecheck/frontend/programs/invalid.py b/tests/filecheck/frontend/programs/invalid.py
@@ -1,11 +1,11 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.block import block
-from xdsl.frontend.const import Const
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.dialects.builtin import i32
-from xdsl.frontend.exception import FrontendProgramException
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.block import block
+from xdsl.frontend.pyast.const import Const
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.dialects.builtin import i32
+from xdsl.frontend.pyast.exception import FrontendProgramException
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 

diff --git a/tests/filecheck/frontend/programs/programs.py b/tests/filecheck/frontend/programs/programs.py
@@ -1,7 +1,7 @@
 # RUN: python %s | filecheck %s
 
-from xdsl.frontend.context import CodeContext
-from xdsl.frontend.program import FrontendProgram
+from xdsl.frontend.pyast.context import CodeContext
+from xdsl.frontend.pyast.program import FrontendProgram
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/tests/test_frontend_op_inserter.py b/tests/test_frontend_op_inserter.py
@@ -3,8 +3,8 @@
 from xdsl.dialects.affine import ForOp
 from xdsl.dialects.arith import AddiOp, ConstantOp
 from xdsl.dialects.builtin import i32
-from xdsl.frontend.exception import FrontendProgramException
-from xdsl.frontend.op_inserter import OpInserter
+from xdsl.frontend.pyast.op_inserter import OpInserter
+from xdsl.frontend.pyast.program import FrontendProgramException
 from xdsl.ir import Block, Region
 
 

diff --git a/tests/test_frontend_op_resolver.py b/tests/test_frontend_op_resolver.py
@@ -1,6 +1,6 @@
 import pytest
 
-import xdsl.frontend.dialects.builtin as builtin
+import xdsl.frontend.pyast.dialects.builtin as builtin
 from xdsl.dialects.arith import AddiOp, ConstantOp, MulfOp
 from xdsl.dialects.builtin import (
     Float32Type,
@@ -12,16 +12,16 @@
     i32,
     i64,
 )
-from xdsl.frontend.exception import FrontendProgramException
-from xdsl.frontend.op_resolver import OpResolver
+from xdsl.frontend.pyast.exception import FrontendProgramException
+from xdsl.frontend.pyast.op_resolver import OpResolver
 
 
 def test_raises_exception_on_unknown_op():
     with pytest.raises(FrontendProgramException) as err:
-        _ = OpResolver.resolve_op("xdsl.frontend.dialects.arith", "unknown")
+        _ = OpResolver.resolve_op("xdsl.frontend.pyast.dialects.arith", "unknown")
     assert (
         err.value.msg
-        == "Internal failure: operation 'unknown' does not exist in module 'xdsl.frontend.dialects.arith'."
+        == "Internal failure: operation 'unknown' does not exist in module 'xdsl.frontend.pyast.dialects.arith'."
     )
 
 
@@ -37,7 +37,7 @@ def test_resolves_ops():
     a = ConstantOp.from_int_and_width(1, i32)
     b = ConstantOp.from_int_and_width(2, i32)
 
-    addi = OpResolver.resolve_op("xdsl.frontend.dialects.arith", "addi")
+    addi = OpResolver.resolve_op("xdsl.frontend.pyast.dialects.arith", "addi")
     addi_op = addi(a, b)
 
     assert isinstance(addi_op, AddiOp)
@@ -47,7 +47,7 @@ def test_resolves_ops():
     assert addi_op.results[0].type.width.data == 32
 
     c = ConstantOp(FloatAttr(5.0, f32))
-    mulf = OpResolver.resolve_op("xdsl.frontend.dialects.arith", "mulf")
+    mulf = OpResolver.resolve_op("xdsl.frontend.pyast.dialects.arith", "mulf")
     mulf_op = mulf(c, c)
 
     assert isinstance(mulf_op, MulfOp)

diff --git a/tests/test_frontend_python_code_check.py b/tests/test_frontend_python_code_check.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from xdsl.frontend.exception import CodeGenerationException
-from xdsl.frontend.python_code_check import CheckAndInlineConstants
+from xdsl.frontend.pyast.exception import CodeGenerationException
+from xdsl.frontend.pyast.python_code_check import CheckAndInlineConstants
 
 
 def test_const_correctly_evaluated_I():

diff --git a/tests/test_frontend_type_conversion.py b/tests/test_frontend_type_conversion.py
@@ -7,11 +7,11 @@
 
 import pytest
 
-from xdsl.frontend.dialects.builtin import (
+from xdsl.frontend.pyast.dialects.builtin import (
     _FrontendType,  # pyright: ignore[reportPrivateUsage]
 )
-from xdsl.frontend.exception import CodeGenerationException
-from xdsl.frontend.type_conversion import TypeConverter
+from xdsl.frontend.pyast.exception import CodeGenerationException
+from xdsl.frontend.pyast.type_conversion import TypeConverter
 from xdsl.ir import ParametrizedAttribute
 from xdsl.irdl import irdl_attr_definition
 

diff --git a/xdsl/dialects/__init__.py b/xdsl/dialects/__init__.py
@@ -279,7 +279,7 @@ def get_stim():
         return Stim
 
     def get_symref():
-        from xdsl.frontend.symref import Symref
+        from xdsl.frontend.pyast.symref import Symref
 
         return Symref
 

diff --git a/xdsl/frontend/README.md → xdsl/frontend/pyast/README.md b/xdsl/frontend/README.md → xdsl/frontend/pyast/README.md
@@ -24,7 +24,7 @@ Pythonic DSL types.
 # toy.py
 
 from xdsl.frontend.program import FrontendProgram
-from xdsl.frontend.context import CodeContext
+from xdsl.frontend.pyast.context import CodeContext
 
 p = FrontendProgram()
 with CodeContext(p):
@@ -38,10 +38,10 @@ Now we are ready to write a first simple program.
 
 ```python
 from xdsl.frontend.program import FrontendProgram
-from xdsl.frontend.context import CodeContext
+from xdsl.frontend.pyast.context import CodeContext
 
 # Pythonic DSL imports
-from xdsl.frontend.dialects.builtin import i1, i32
+from xdsl.frontend.pyast.dialects.builtin import i1, i32
 
 p = FrontendProgram()
 with CodeContext(p):

diff --git a/xdsl/frontend/__init__.py → xdsl/frontend/pyast/__init__.py b/xdsl/frontend/__init__.py → xdsl/frontend/pyast/__init__.py
diff --git a/xdsl/frontend/block.py → xdsl/frontend/pyast/block.py b/xdsl/frontend/block.py → xdsl/frontend/pyast/block.py
diff --git a/xdsl/frontend/code_generation.py → xdsl/frontend/pyast/code_generation.py b/xdsl/frontend/code_generation.py → xdsl/frontend/pyast/code_generation.py
@@ -8,12 +8,15 @@
 import xdsl.dialects.cf as cf
 import xdsl.dialects.func as func
 import xdsl.dialects.scf as scf
-import xdsl.frontend.symref as symref
-from xdsl.frontend.exception import CodeGenerationException, FrontendProgramException
-from xdsl.frontend.op_inserter import OpInserter
-from xdsl.frontend.op_resolver import OpResolver
-from xdsl.frontend.python_code_check import FunctionMap
-from xdsl.frontend.type_conversion import TypeConverter
+import xdsl.frontend.pyast.symref as symref
+from xdsl.frontend.pyast.exception import (
+    CodeGenerationException,
+    FrontendProgramException,
+)
+from xdsl.frontend.pyast.op_inserter import OpInserter
+from xdsl.frontend.pyast.op_resolver import OpResolver
+from xdsl.frontend.pyast.python_code_check import FunctionMap
+from xdsl.frontend.pyast.type_conversion import TypeConverter
 from xdsl.ir import Attribute, Block, Region, SSAValue
 
 

diff --git a/xdsl/frontend/const.py → xdsl/frontend/pyast/const.py b/xdsl/frontend/const.py → xdsl/frontend/pyast/const.py
diff --git a/xdsl/frontend/context.py → xdsl/frontend/pyast/context.py b/xdsl/frontend/context.py → xdsl/frontend/pyast/context.py
@@ -5,8 +5,8 @@
 from sys import _getframe  # pyright: ignore[reportPrivateUsage]
 from typing import Any
 
-from xdsl.frontend.program import FrontendProgram
-from xdsl.frontend.python_code_check import PythonCodeCheck
+from xdsl.frontend.pyast.program import FrontendProgram
+from xdsl.frontend.pyast.python_code_check import PythonCodeCheck
 
 
 @dataclass

diff --git a/xdsl/frontend/dialects/__init__.py → xdsl/frontend/pyast/dialects/__init__.py b/xdsl/frontend/dialects/__init__.py → xdsl/frontend/pyast/dialects/__init__.py
diff --git a/xdsl/frontend/dialects/arith.py → xdsl/frontend/pyast/dialects/arith.py b/xdsl/frontend/dialects/arith.py → xdsl/frontend/pyast/dialects/arith.py
@@ -2,7 +2,7 @@
 from typing import TypeVar
 
 import xdsl.dialects.arith as arith
-from xdsl.frontend.dialects.builtin import f16, f32, f64, i1, i32, i64, index
+from xdsl.frontend.pyast.dialects.builtin import f16, f32, f64, i1, i32, i64, index
 from xdsl.ir import Operation
 
 _Int = TypeVar("_Int", bound=index | i1 | i32 | i64)