Move MLContext out of ir, move get_all_dialects to dialects.

bench/parser/bench_parser.py

@@ -15,7 +15,7 @@
 import timeit
 from collections.abc import Iterable
 
-from xdsl.ir import MLContext
+from xdsl.context import MLContext
 from xdsl.parser import Parser
 
 

docs/Toy/toy/compiler.py

@@ -13,6 +13,7 @@
     ConvertRiscvScfToRiscvCfPass,
 )
 from xdsl.backend.riscv.lowering.convert_scf_to_riscv_scf import ConvertScfToRiscvPass
+from xdsl.context import MLContext
 from xdsl.dialects import (
     affine,
     arith,
@@ -24,7 +25,6 @@
     scf,
 )
 from xdsl.dialects.builtin import Builtin, ModuleOp
-from xdsl.ir import MLContext
 from xdsl.transforms.canonicalize import CanonicalizePass
 from xdsl.transforms.dead_code_elimination import DeadCodeElimination
 from xdsl.transforms.lower_affine import LowerAffinePass

docs/Toy/toy/rewrites/inline_toy.py

@@ -1,5 +1,5 @@
+from xdsl.context import MLContext
 from xdsl.dialects.builtin import ModuleOp, StringAttr
-from xdsl.ir import MLContext
 from xdsl.passes import ModulePass
 from xdsl.pattern_rewriter import (
     PatternRewriter,

docs/Toy/toy/rewrites/lower_memref_riscv.py

@@ -1,9 +1,9 @@
 from math import prod
 from typing import Any, cast
 
+from xdsl.context import MLContext
 from xdsl.dialects import memref, riscv
 from xdsl.dialects.builtin import ModuleOp, UnrealizedConversionCastOp
-from xdsl.ir import MLContext
 from xdsl.passes import ModulePass
 from xdsl.pattern_rewriter import (
     PatternRewriter,

docs/Toy/toy/rewrites/lower_toy_affine.py

@@ -9,6 +9,7 @@
 from typing import TypeAlias, TypeVar, cast
 
 from xdsl.builder import Builder
+from xdsl.context import MLContext
 from xdsl.dialects import affine, arith, func, memref, printf
 from xdsl.dialects.builtin import (
     AffineMapAttr,
@@ -20,7 +21,7 @@
     ShapedType,
     f64,
 )
-from xdsl.ir import Block, MLContext, Operation, Region, SSAValue
+from xdsl.ir import Block, Operation, Region, SSAValue
 from xdsl.ir.affine import AffineMap
 from xdsl.passes import ModulePass
 from xdsl.pattern_rewriter import (

docs/Toy/toy/rewrites/setup_riscv_pass.py

@@ -1,6 +1,7 @@
+from xdsl.context import MLContext
 from xdsl.dialects import riscv
 from xdsl.dialects.builtin import ModuleOp
-from xdsl.ir import Block, MLContext, Region
+from xdsl.ir import Block, Region
 from xdsl.passes import ModulePass
 from xdsl.pattern_rewriter import (
     PatternRewriter,

docs/Toy/toy/rewrites/shape_inference.py

@@ -1,5 +1,6 @@
+from xdsl.context import MLContext
 from xdsl.dialects.builtin import ModuleOp
-from xdsl.ir import MLContext, Operation
+from xdsl.ir import Operation
 from xdsl.passes import ModulePass
 from xdsl.pattern_rewriter import (
     PatternRewriter,

docs/Toy/toy/tests/test_add_sections.py

@@ -1,8 +1,9 @@
 from xdsl.builder import ImplicitBuilder
+from xdsl.context import MLContext
 from xdsl.dialects.builtin import ModuleOp
 from xdsl.dialects.func import FuncOp
 from xdsl.dialects.riscv import AssemblySectionOp, DirectiveOp, LabelOp
-from xdsl.ir import Block, MLContext, Region
+from xdsl.ir import Block, Region
 
 from ..rewrites.setup_riscv_pass import SetupRiscvPass
 

docs/Toy/toy/tests/test_lower_memref_riscv.py

@@ -1,8 +1,8 @@
 from xdsl.backend.riscv.lowering.convert_memref_to_riscv import memref_shape_ops
 from xdsl.builder import Builder, ImplicitBuilder
+from xdsl.context import MLContext
 from xdsl.dialects import func, memref, riscv
 from xdsl.dialects.builtin import ModuleOp, UnrealizedConversionCastOp, f32
-from xdsl.ir import MLContext
 from xdsl.pattern_rewriter import PatternRewriter
 from xdsl.utils.test_value import TestSSAValue
 

docs/irdl.ipynb

@@ -32,7 +32,7 @@
     "\n",
     "from xdsl.dialects.arith import Arith\n",
     "from xdsl.dialects.builtin import Builtin\n",
-    "from xdsl.ir import MLContext\n",
+    "from xdsl.context import MLContext\n",
     "from xdsl.printer import Printer\n",
     "\n",
     "# MLContext, containing information about the registered dialects\n",

docs/tutorial.ipynb

@@ -27,7 +27,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from xdsl.ir import MLContext\n",
+    "from xdsl.context import MLContext\n",
     "from xdsl.dialects.arith import Arith\n",
     "from xdsl.dialects.func import Func\n",
     "from xdsl.dialects.builtin import Builtin\n",

tests/backend/riscv/test_func_to_riscv_func.py

@@ -4,10 +4,10 @@
     ConvertFuncToRiscvFuncPass,
 )
 from xdsl.builder import Builder, ImplicitBuilder
+from xdsl.context import MLContext
 from xdsl.dialects import func
 from xdsl.dialects.builtin import ModuleOp
 from xdsl.dialects.test import TestType
-from xdsl.ir import MLContext
 from xdsl.utils.test_value import TestSSAValue
 
 NINE_TYPES = [TestType("misc")] * 9

tests/dialects/test_hw.py

@@ -6,6 +6,7 @@
 
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects.builtin import ArrayAttr, StringAttr, SymbolRefAttr, i32, i64
 from xdsl.dialects.hw import (
     HW,
@@ -26,7 +27,7 @@
     ModuleType,
 )
 from xdsl.dialects.test import TestOp
-from xdsl.ir import Block, MLContext
+from xdsl.ir import Block
 from xdsl.irdl import (
     IRDLOperation,
     Region,

tests/dialects/test_riscv.py

@@ -1,5 +1,6 @@
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects import riscv
 from xdsl.dialects.builtin import (
     IntAttr,
@@ -9,7 +10,6 @@
     Signedness,
     i32,
 )
-from xdsl.ir import MLContext
 from xdsl.parser import Parser
 from xdsl.transforms.canonicalization_patterns.riscv import get_constant_value
 from xdsl.utils.exceptions import ParseError, VerifyException

tests/filecheck/dialects/irdl/cmath_irdl_loading.py

@@ -1,10 +1,10 @@
 # RUN: python %s | filecheck %s
 
+from xdsl.context import MLContext
+from xdsl.dialects import get_all_dialects
 from xdsl.dialects.irdl.irdl import DialectOp
 from xdsl.interpreters.irdl import make_dialect
-from xdsl.ir import MLContext
 from xdsl.parser import Parser
-from xdsl.tools.command_line_tool import get_all_dialects
 from xdsl.traits import SymbolTable
 
 # Test dynamically registering a dialect from an IRDL file

tests/filecheck/dialects/irdl/cmath_irdl_stub.py

@@ -1,10 +1,10 @@
 # RUN: python %s | filecheck %s
 
+from xdsl.context import MLContext
+from xdsl.dialects import get_all_dialects
 from xdsl.dialects.irdl.irdl import DialectOp
 from xdsl.interpreters.irdl import make_dialect
-from xdsl.ir import MLContext
 from xdsl.parser import Parser
-from xdsl.tools.command_line_tool import get_all_dialects
 from xdsl.traits import SymbolTable
 from xdsl.utils.dialect_stub import DialectStubGenerator
 

tests/interactive/test_pass_metrics.py

@@ -1,5 +1,6 @@
 from xdsl.builder import ImplicitBuilder
-from xdsl.dialects import arith, func
+from xdsl.context import MLContext
+from xdsl.dialects import arith, func, get_all_dialects
 from xdsl.dialects.builtin import (
     IndexType,
     IntegerAttr,
@@ -9,9 +10,8 @@
     count_number_of_operations,
     get_diff_operation_count,
 )
-from xdsl.ir import Block, MLContext, Region
+from xdsl.ir import Block, Region
 from xdsl.parser import Parser
-from xdsl.tools.command_line_tool import get_all_dialects
 
 
 def test_operation_counter():

tests/interactive/test_rewrites.py

@@ -1,3 +1,5 @@
+from xdsl.context import MLContext
+from xdsl.dialects import get_all_dialects
 from xdsl.dialects.builtin import (
     StringAttr,
 )
@@ -9,14 +11,12 @@
     convert_indexed_individual_rewrites_to_available_pass,
     get_all_possible_rewrites,
 )
-from xdsl.ir import MLContext
 from xdsl.parser import Parser
 from xdsl.pattern_rewriter import (
     PatternRewriter,
     RewritePattern,
     op_type_rewrite_pattern,
 )
-from xdsl.tools.command_line_tool import get_all_dialects
 from xdsl.transforms import individual_rewrite
 from xdsl.utils.parse_pipeline import parse_pipeline
 

tests/interpreters/test_pdl_interpreter.py

@@ -1,6 +1,7 @@
 from io import StringIO
 
 from xdsl.builder import Builder, ImplicitBuilder
+from xdsl.context import MLContext
 from xdsl.dialects import arith, func, pdl, test
 from xdsl.dialects.builtin import (
     ArrayAttr,
@@ -17,7 +18,7 @@
     PDLRewriteFunctions,
     PDLRewritePattern,
 )
-from xdsl.ir import Attribute, MLContext, OpResult
+from xdsl.ir import Attribute, OpResult
 from xdsl.irdl import IRDLOperation, irdl_op_definition, prop_def
 from xdsl.pattern_rewriter import (
     PatternRewriter,

tests/interpreters/test_riscv_emulator.py

@@ -4,9 +4,10 @@
 import pytest
 
 from xdsl.builder import Builder
+from xdsl.context import MLContext
 from xdsl.dialects import riscv, riscv_debug, riscv_func
 from xdsl.dialects.builtin import ModuleOp
-from xdsl.ir import BlockArgument, MLContext
+from xdsl.ir import BlockArgument
 from xdsl.transforms.riscv_register_allocation import RISCVRegisterAllocation
 
 pytest.importorskip("riscemu", reason="riscemu is an optional dependency")

tests/interpreters/test_wgpu.py

@@ -2,12 +2,12 @@
 
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects import arith, builtin, func, gpu, memref, printf
 from xdsl.interpreter import Interpreter
 from xdsl.interpreters.arith import ArithFunctions
 from xdsl.interpreters.memref import MemrefFunctions
 from xdsl.interpreters.printf import PrintfFunctions
-from xdsl.ir import MLContext
 from xdsl.parser import Parser
 
 pytest.importorskip("wgpu", reason="wgpu is an optional dependency")

tests/interpreters/test_wgsl_printer.py

@@ -1,9 +1,9 @@
 from io import StringIO
 
+from xdsl.context import MLContext
 from xdsl.dialects import arith, builtin, gpu, memref, test
 from xdsl.dialects.builtin import IndexType, IntegerAttr, IntegerType, i32
 from xdsl.interpreters.experimental.wgsl_printer import WGSLPrinter
-from xdsl.ir import MLContext
 from xdsl.parser import Parser
 from xdsl.utils.test_value import TestSSAValue
 

tests/irdl/test_declarative_assembly_format.py

@@ -7,11 +7,11 @@
 
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects.builtin import IntegerAttr, IntegerType, ModuleOp, i32
 from xdsl.dialects.test import Test, TestType
 from xdsl.ir import (
     Attribute,
-    MLContext,
     Operation,
     ParametrizedAttribute,
     TypeAttribute,

tests/pattern_rewriter/test_pattern_rewriter.py

@@ -4,6 +4,7 @@
 import pytest
 from conftest import assert_print_op
 
+from xdsl.context import MLContext
 from xdsl.dialects import test
 from xdsl.dialects.arith import Addi, Arith, Constant, Muli
 from xdsl.dialects.builtin import (
@@ -16,7 +17,7 @@
     i32,
     i64,
 )
-from xdsl.ir import Block, MLContext, Operation, SSAValue
+from xdsl.ir import Block, Operation, SSAValue
 from xdsl.parser import Parser
 from xdsl.pattern_rewriter import (
     GreedyRewritePatternApplier,

tests/rewriting/composable_rewriting/immutable_ir/test_immutable_ir.py

@@ -1,11 +1,12 @@
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects.arith import Arith
 from xdsl.dialects.builtin import Builtin
 from xdsl.dialects.cf import Cf
 from xdsl.dialects.func import Func
 from xdsl.dialects.test import Test
-from xdsl.ir import MLContext, Operation
+from xdsl.ir import Operation
 from xdsl.parser import Parser
 from xdsl.rewriting.composable_rewriting.immutable_ir.immutable_ir import (  # noqa
     get_immutable_copy,

tests/test_cli.py

@@ -1,4 +1,5 @@
-from xdsl.tools.command_line_tool import get_all_dialects, get_all_passes
+from xdsl.dialects import get_all_dialects
+from xdsl.tools.command_line_tool import get_all_passes
 
 
 def test_get_all_passes_names():

tests/test_ir.py

@@ -1,5 +1,6 @@
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects import test
 from xdsl.dialects.arith import Addi, Arith, Constant, Subi
 from xdsl.dialects.builtin import Builtin, IntegerAttr, ModuleOp, StringAttr, i32, i64
@@ -9,7 +10,6 @@
     Attribute,
     Block,
     ErasedSSAValue,
-    MLContext,
     Operation,
     Region,
     SSAValue,

tests/test_mlcontext.py

@@ -1,7 +1,12 @@
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects.builtin import UnregisteredAttr, UnregisteredOp
-from xdsl.ir import Dialect, MLContext, ParametrizedAttribute, TypeAttribute
+from xdsl.ir import (
+    Dialect,
+    ParametrizedAttribute,
+    TypeAttribute,
+)
 from xdsl.irdl import IRDLOperation, irdl_attr_definition, irdl_op_definition
 
 

tests/test_parser.py

@@ -3,6 +3,7 @@
 
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects.builtin import (
     ArrayAttr,
     Builtin,
@@ -16,7 +17,7 @@
     i32,
 )
 from xdsl.dialects.test import Test
-from xdsl.ir import Attribute, MLContext, ParametrizedAttribute, Region
+from xdsl.ir import Attribute, ParametrizedAttribute, Region
 from xdsl.irdl import (
     IRDLOperation,
     irdl_attr_definition,

tests/test_parser_error.py

@@ -1,6 +1,6 @@
 import pytest
 
-from xdsl.ir import MLContext
+from xdsl.context import MLContext
 from xdsl.irdl import (
     AnyAttr,
     IRDLOperation,

tests/test_pass_from_spec.py

@@ -4,8 +4,8 @@
 
 import pytest
 
+from xdsl.context import MLContext
 from xdsl.dialects import builtin
-from xdsl.ir import MLContext
 from xdsl.passes import ModulePass
 from xdsl.utils.parse_pipeline import PipelinePassSpec