dialects: (stream) simplify constr helper on stream attributes

docs/Toy/toy/interpreter.py

@@ -14,8 +14,8 @@
     impl_terminator,
     register_impls,
 )
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 
 from .dialects import toy as toy
 

docs/marimo/linalg_snitch.py

@@ -47,7 +47,7 @@ def __():
     from xdsl.dialects import arith, func, linalg
     from xdsl.dialects.builtin import AffineMap, AffineMapAttr, MemRefType, ModuleOp, f64
     from xdsl.dialects.riscv import riscv_code
-    from xdsl.interpreters.ptr import TypedPtr
+    from xdsl.interpreters.utils.ptr import TypedPtr
     from xdsl.ir import Attribute, Block, Region, SSAValue
     from xdsl.passes import PipelinePass
     from xdsl.tools.command_line_tool import get_all_dialects

tests/interpreters/test_affine_interpreter.py

@@ -8,8 +8,8 @@
 from xdsl.interpreters.arith import ArithFunctions
 from xdsl.interpreters.func import FuncFunctions
 from xdsl.interpreters.memref import MemrefFunctions
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 from xdsl.ir.affine import AffineMap
 from xdsl.utils.test_value import TestSSAValue
 

tests/interpreters/test_builtin_interpreter.py

@@ -10,9 +10,9 @@
     i64,
 )
 from xdsl.interpreter import Interpreter
-from xdsl.interpreters import ptr
 from xdsl.interpreters.builtin import BuiltinFunctions
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils import ptr
 
 interpreter = Interpreter(ModuleOp([]))
 interpreter.register_implementations(BuiltinFunctions())

tests/interpreters/test_linalg_interpreter.py

@@ -18,8 +18,8 @@
 from xdsl.interpreter import Interpreter
 from xdsl.interpreters.arith import ArithFunctions
 from xdsl.interpreters.linalg import LinalgFunctions
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 from xdsl.ir import Block, Region
 from xdsl.ir.affine import AffineExpr, AffineMap
 from xdsl.utils.test_value import TestSSAValue

tests/interpreters/test_memref_interpreter.py

@@ -11,8 +11,8 @@
 from xdsl.interpreter import Interpreter
 from xdsl.interpreters.arith import ArithFunctions
 from xdsl.interpreters.memref import MemrefFunctions
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 
 interpreter = Interpreter(ModuleOp([]), index_bitwidth=32)
 interpreter.register_implementations(ArithFunctions())

tests/interpreters/test_memref_stream_interpreter.py

@@ -16,8 +16,8 @@
 from xdsl.interpreter import Interpreter
 from xdsl.interpreters.arith import ArithFunctions
 from xdsl.interpreters.memref_stream import MemrefStreamFunctions
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 from xdsl.ir import Block, Region
 from xdsl.ir.affine import AffineExpr, AffineMap
 from xdsl.utils.test_value import TestSSAValue

tests/interpreters/test_ml_program_interpreter.py

@@ -11,8 +11,8 @@
 )
 from xdsl.interpreter import Interpreter
 from xdsl.interpreters.ml_program import MLProgramFunctions
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 
 
 def test_ml_program_global_load_constant():

tests/interpreters/test_onnx_interpreter.py

@@ -15,8 +15,8 @@
 )
 from xdsl.interpreter import Interpreter
 from xdsl.interpreters.builtin import BuiltinFunctions
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 from xdsl.utils.exceptions import InterpretationError
 from xdsl.utils.test_value import TestSSAValue
 

tests/interpreters/test_ptr.py

@@ -1,4 +1,4 @@
-from xdsl.interpreters import ptr
+from xdsl.interpreters.utils import ptr
 
 
 def test_ptr():

tests/interpreters/test_riscv_interpreter.py

@@ -14,8 +14,8 @@
     i32,
 )
 from xdsl.interpreter import Interpreter, PythonValues
-from xdsl.interpreters.ptr import RawPtr, TypedPtr
 from xdsl.interpreters.riscv import RiscvFunctions
+from xdsl.interpreters.utils.ptr import RawPtr, TypedPtr
 from xdsl.ir import Block, Region
 from xdsl.utils.bitwise_casts import convert_f32_to_u32
 from xdsl.utils.exceptions import InterpretationError

tests/interpreters/test_riscv_snitch_interpreter.py

@@ -5,11 +5,10 @@
 from xdsl.interpreters.func import FuncFunctions
 from xdsl.interpreters.riscv import RiscvFunctions
 from xdsl.interpreters.riscv_snitch import RiscvSnitchFunctions
+from xdsl.interpreters.utils.stream import Acc, Nats
 from xdsl.ir import BlockArgument
 from xdsl.utils.test_value import TestSSAValue
 
-from .test_stream_interpreter import Acc, Nats
-
 
 def test_read_write():
     interpreter = Interpreter(ModuleOp([]))

tests/interpreters/test_shaped_array.py

@@ -1,5 +1,5 @@
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
+from xdsl.interpreters.utils.ptr import TypedPtr
 
 
 def test_shaped_array_offset():

tests/interpreters/test_snitch_stream_interpreter.py

@@ -4,10 +4,10 @@
 from xdsl.dialects import riscv, riscv_snitch, snitch_stream, stream
 from xdsl.dialects.builtin import ArrayAttr, ModuleOp
 from xdsl.interpreter import Interpreter
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.riscv import RiscvFunctions
 from xdsl.interpreters.riscv_snitch import RiscvSnitchFunctions
 from xdsl.interpreters.snitch_stream import SnitchStreamFunctions
+from xdsl.interpreters.utils.ptr import TypedPtr
 from xdsl.ir import Block, Region
 from xdsl.utils.test_value import TestSSAValue
 

tests/interpreters/test_tensor_interpreter.py

@@ -3,9 +3,9 @@
 from xdsl.dialects import tensor
 from xdsl.dialects.builtin import ModuleOp, TensorType, f32, i32
 from xdsl.interpreter import Interpreter
-from xdsl.interpreters.ptr import TypedPtr
 from xdsl.interpreters.shaped_array import ShapedArray
 from xdsl.interpreters.tensor import TensorFunctions
+from xdsl.interpreters.utils.ptr import TypedPtr
 from xdsl.utils.exceptions import InterpretationError
 from xdsl.utils.test_value import TestSSAValue
 

tests/test_dialect_utils.py

@@ -4,7 +4,7 @@
 
 from xdsl.context import MLContext
 from xdsl.dialects.builtin import DYNAMIC_INDEX, IndexType, IntegerType, i32
-from xdsl.dialects.utils import (
+from xdsl.dialects.utils.format import (
     parse_dynamic_index_list_with_types,
     parse_dynamic_index_list_without_types,
     parse_dynamic_index_with_type,

xdsl/backend/riscv/lowering/convert_memref_to_riscv.py

@@ -24,7 +24,7 @@
     SymbolRefAttr,
     UnrealizedConversionCastOp,
 )
-from xdsl.interpreters.ptr import TypedPtr
+from xdsl.interpreters.utils.ptr import TypedPtr
 from xdsl.ir import Attribute, Operation, Region, SSAValue
 from xdsl.passes import ModulePass
 from xdsl.pattern_rewriter import (

xdsl/dialects/arith.py

@@ -22,7 +22,7 @@
     UnrankedTensorType,
     VectorType,
 )
-from xdsl.dialects.utils import FastMathAttrBase, FastMathFlag
+from xdsl.dialects.utils.fast_math import FastMathAttrBase, FastMathFlag
 from xdsl.ir import Attribute, BitEnumAttribute, Dialect, Operation, SSAValue
 from xdsl.irdl import (
     AnyOf,

xdsl/dialects/csl/csl.py

@@ -37,7 +37,7 @@
     SymbolRefAttr,
     TensorType,
 )
-from xdsl.dialects.utils import parse_func_op_like, print_func_op_like
+from xdsl.dialects.utils.format import parse_func_op_like, print_func_op_like
 from xdsl.ir import (
     Attribute,
     Block,

xdsl/dialects/csl/csl_stencil.py

@@ -17,7 +17,7 @@
     TensorType,
 )
 from xdsl.dialects.experimental import dmp
-from xdsl.dialects.utils import AbstractYieldOperation
+from xdsl.dialects.utils.format import AbstractYieldOperation
 from xdsl.ir import (
     Attribute,
     Dialect,

xdsl/dialects/experimental/air.py

@@ -20,7 +20,7 @@
     StringAttr,
     SymbolRefAttr,
 )
-from xdsl.dialects.utils import AbstractYieldOperation
+from xdsl.dialects.utils.format import AbstractYieldOperation
 from xdsl.ir import (
     Attribute,
     Dialect,

xdsl/dialects/func.py

@@ -10,7 +10,7 @@
     StringAttr,
     SymbolRefAttr,
 )
-from xdsl.dialects.utils import (
+from xdsl.dialects.utils.format import (
     parse_call_op_like,
     parse_func_op_like,
     print_call_op_like,

xdsl/dialects/linalg.py

@@ -25,7 +25,7 @@
     TensorType,
     i64,
 )
-from xdsl.dialects.utils import (
+from xdsl.dialects.utils.format import (
     AbstractYieldOperation,
 )
 from xdsl.ir import (

xdsl/dialects/llvm.py

@@ -24,7 +24,7 @@
     i32,
     i64,
 )
-from xdsl.dialects.utils import FastMathAttrBase
+from xdsl.dialects.utils.fast_math import FastMathAttrBase
 from xdsl.ir import (
     Attribute,
     BitEnumAttribute,

xdsl/dialects/memref.py

@@ -30,7 +30,7 @@
     i32,
     i64,
 )
-from xdsl.dialects.utils import (
+from xdsl.dialects.utils.format import (
     parse_dynamic_index_list_without_types,
     print_dynamic_index_list,
 )

xdsl/dialects/memref_stream.py

@@ -25,7 +25,7 @@
     IntegerType,
     StringAttr,
 )
-from xdsl.dialects.utils import AbstractYieldOperation
+from xdsl.dialects.utils.format import AbstractYieldOperation
 from xdsl.ir import (
     Attribute,
     Dialect,
@@ -370,7 +370,7 @@ class GenericOp(IRDLOperation):
     Pointers to memory buffers or streams to be operated on. The corresponding stride
     pattern defines the order in which the elements of the input buffers will be read.
     """
-    outputs = var_operand_def(AnyMemRefTypeConstr | stream.WritableStreamType.constr())
+    outputs = var_operand_def(AnyMemRefTypeConstr | stream.AnyWritableStreamTypeConstr)
     """
     Pointers to memory buffers or streams to be operated on. The corresponding stride
     pattern defines the order in which the elements of the input buffers will be written

xdsl/dialects/omp.py

@@ -9,7 +9,7 @@
     UnitAttr,
     i32,
 )
-from xdsl.dialects.utils import AbstractYieldOperation
+from xdsl.dialects.utils.format import AbstractYieldOperation
 from xdsl.ir import (
     Attribute,
     Dialect,

xdsl/dialects/riscv.py

@@ -24,7 +24,7 @@
     UnitAttr,
     i32,
 )
-from xdsl.dialects.utils import FastMathAttrBase, FastMathFlag
+from xdsl.dialects.utils.fast_math import FastMathAttrBase, FastMathFlag
 from xdsl.ir import (
     Attribute,
     Block,

xdsl/dialects/riscv_func.py

@@ -12,7 +12,7 @@
     StringAttr,
     SymbolRefAttr,
 )
-from xdsl.dialects.utils import (
+from xdsl.dialects.utils.format import (
     parse_call_op_like,
     parse_func_op_like,
     print_call_op_like,

xdsl/dialects/riscv_scf.py

@@ -10,7 +10,7 @@
 from typing_extensions import Self
 
 from xdsl.dialects.riscv import IntRegisterType, RISCVRegisterType
-from xdsl.dialects.utils import (
+from xdsl.dialects.utils.format import (
     AbstractYieldOperation,
     parse_assignment,
     print_assignment,