diff --git a/.github/workflows/ci-mlir-mpi.yml b/.github/workflows/ci-mlir-mpi.yml
new file mode 100644
index 0000000000..b4af19db7b
--- /dev/null
+++ b/.github/workflows/ci-mlir-mpi.yml
@@ -0,0 +1,47 @@
+# This workflow will install MLIR, Python dependencies, run tests and lint with a single version of Python
+# File inherited from https://github.com/xdslproject/xdsl/blob/main/.github/workflows/ci-mlir.yml
+
+name: CI - MLIR-based Testing
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the master branch
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: gbisbas/xdsl-llvm:0.1
+    steps:
+    - name: Checkout Devito
+      uses: actions/checkout@v3
+
+    - name: Install native dependencies
+      run: |
+        apt install -y curl mpich
+
+    - name: Upgrade pip
+      run: |
+        pip install --upgrade pip
+
+    - name: Install requirements and xDSL
+      run: |
+        pip install -e .[tests]
+        pip install mpi4py
+        pip install xdsl==0.14
+
+    - name: Test with MPI
+      run: |
+        # Add mlir-opt to the path
+        export PATH=/xdsl-sc/llvm-project/build/bin/:$PATH
+        pytest -m "parallel" -k "not adjoint" tests/
\ No newline at end of file
diff --git a/.github/workflows/ci-mlir.yml b/.github/workflows/ci-mlir.yml
index e1d6194245..9214475dba 100644
--- a/.github/workflows/ci-mlir.yml
+++ b/.github/workflows/ci-mlir.yml
@@ -40,7 +40,7 @@ jobs:
         pip install mpi4py
         pip install xdsl==0.14
 
-    - name: Test with pytest and generate code coverage
+    - name: Test non-MPI
       run: |
         # Add mlir-opt to the path
         export PATH=/xdsl-sc/llvm-project/build/bin/:$PATH
diff --git a/devito/__init__.py b/devito/__init__.py
index fa380c396a..f77ae0ae08 100644
--- a/devito/__init__.py
+++ b/devito/__init__.py
@@ -44,7 +44,7 @@
 
 
 # Imports from xdsl
-from devito.xdslpasses import *  # noqa
+# from devito.xdslpasses import *  # noqa
 
 from ._version import get_versions  # noqa
 __version__ = get_versions()['version']
diff --git a/devito/ir/iet/visitors.py b/devito/ir/iet/visitors.py
index d7be0d714f..07400e7c7f 100644
--- a/devito/ir/iet/visitors.py
+++ b/devito/ir/iet/visitors.py
@@ -1252,4 +1252,4 @@ def generate(self):
             tip += ";"
         if self.cast:
             tip = '(%s)%s' % (self.cast, tip)
-        yield tip
\ No newline at end of file
+        yield tip
diff --git a/devito/ir/ietxdsl/cgeneration.py b/devito/ir/ietxdsl/cgeneration.py
deleted file mode 100644
index 62f62d30d3..0000000000
--- a/devito/ir/ietxdsl/cgeneration.py
+++ /dev/null
@@ -1,368 +0,0 @@
-import io
-from typing import Dict
-
-from devito.ir.ietxdsl.iet_ssa import (Callable, Modi, StructDecl, Statement,
-                                          Iteration, IterationWithSubIndices,
-                                          PointerCast, Initialise, List,
-                                          Powi, Call)
-from devito.tools import flatten
-
-from xdsl.ir import SSAValue, BlockArgument
-from xdsl.dialects.arith import Muli, Addi, Constant
-from xdsl.dialects import memref
-
-SSAValueNames: Dict[SSAValue, str] = {}
-
-
-class CGeneration:
-
-    def __init__(self):
-        self.output = io.StringIO()
-        self.indentation = 0
-        self.iterator_names = {}
-
-    def str(self):
-        s = self.output.getvalue()
-        self.output.close()
-        return s
-
-    def indent(self):
-        self.indentation += 2
-
-    def dedent(self):
-        self.indentation -= 2
-
-    def print(self, *args, **kwargs):
-
-        if 'indent' in kwargs.keys():
-            indent = kwargs.pop('indent')
-        else:
-            indent = True
-
-        if indent:
-            print(" " * self.indentation, file=self.output, end='')
-
-        print(*args, file=self.output, **kwargs)
-
-    # To translate code such as:
-    #
-    #   cst42 := iet.constant(42)
-    #   cst3 := iet.constant(3)
-    #   iet.addi(cst42, cst3)
-    #
-    # into a single-line expression such as:
-    #
-    #   42 + 3
-    #
-    # we look at the very last operation in the module and then walk and
-    # recursively print the following tree expressed by the def-use chain of
-    # these operations.
-    def printModule(self, module):
-        # Get the last operation in the module
-        self.printOperation(module.ops[-1])
-
-    def printCallable(self, callable_op: Callable):
-        # Assert that we only have one block in the callable_op.body
-
-        assert len(callable_op.body.blocks) == 1
-        arglist = callable_op.body.blocks[0].args
-
-        # Print kernels and arguments
-        self.print('')
-        retval = callable_op.attributes['retval'].data
-        prefix = callable_op.attributes['prefix'].data
-        if prefix != '':
-            prefix = prefix + " "
-        name = callable_op.attributes['callable_name'].data
-
-        self.print(f"{prefix}{retval} {name}(", end='', indent=False)
-        for i, arg in enumerate(arglist):
-            # IMPORTANT TOFIX? Here we print a Function like u[..][..][..]
-            SSAValueNames[arg] = callable_op.attributes['parameters'].data[i].data
-        # TODO: fix this workaround
-        # need separate loop because only header parameters have types
-        for i, (op_type, op_qual) in enumerate(zip(callable_op.attributes['types'].data,
-                callable_op.attributes['qualifiers'].data)): # noqa
-
-            self.print(op_type.data, end='', indent=False)
-            self.print(op_qual.data, end=' ', indent=False)
-            self.print(callable_op.attributes['header_parameters'].data[i].data,
-                       end='',
-                       indent=False)
-            if i < (len(list(callable_op.attributes['types'].data)) - 1):
-                self.print(", ", end='', indent=False)
-
-        self.print(")\n{")
-        self.indent()
-        for each_op in callable_op.body.ops:
-            self.printOperation(each_op)
-        if retval == "int":
-            self.print("return 0;")
-        self.dedent()
-        self.print("}")
-        pass
-
-    def printCall(self, call_op: Call, calldef: bool):
-        # Assert that we only have one block in the callable_op.body
-
-        # if calldef is True we print in metacall style
-        # Can be improved
-        call_name = call_op.attributes['callable_name'].data
-        c_names = call_op.attributes['c_names'].data
-        c_typenames = call_op.attributes['c_typenames'].data
-        c_typeqs = call_op.attributes['c_typeqs'].data
-        prefix = call_op.attributes['prefix'].data
-        retval = call_op.attributes['ret_type'].data
-
-        for i, arg in enumerate(c_names):
-            SSAValueNames[arg] = call_op.attributes['c_names'].data[i].data
-            SSAValueNames[arg] = call_op.attributes['c_typenames'].data[i].data
-            SSAValueNames[arg] = call_op.attributes['c_typeqs'].data[i].data
-
-        if calldef:
-            self.print(prefix, end=' ', indent=False)
-            self.print(retval, end=' ', indent=False)
-            self.print(f"{call_name}(", end='', indent=True)
-            for i, (c_name, c_typename, c_typeq) in enumerate(zip(c_names, c_typenames, c_typeqs)): # noqa
-                self.print(c_typename.data, end='', indent=False)
-                self.print(c_typeq.data, end=' ', indent=False)
-                self.print(c_name.data, end='', indent=False)
-                if i < (len(list(c_names)) - 1):
-                    self.print(", ", end='', indent=False)
-        else:
-            self.print(f"{call_name}(", end='', indent=True)
-            for i, arg in enumerate(c_names): # noqa
-                self.print(arg.data, end='', indent=False)
-                if i < (len(list(c_names)) - 1):
-                    self.print(",", end='', indent=False)
-
-        self.print(");", indent=False)
-        pass
-
-    def printIteration(self, iteration_op: Iteration):
-        # not used?
-        ssa_val = iteration_op.body.blocks[0].args[0]
-        iterator = str(iteration_op.attributes['arg_name'].data)
-        SSAValueNames[ssa_val] = iterator
-
-        self.iterator_names[
-            iteration_op.regions[0].blocks[0].args[0]] = iterator
-
-        lower_bound = iteration_op.attributes['limits'].data[0].data
-        upper_bound = iteration_op.attributes['limits'].data[1].data
-        increment = iteration_op.attributes['limits'].data[2].data
-
-        self.print(f"for (int {iterator} = {lower_bound}; ", end='')
-        self.print(f"{iterator} <= {upper_bound}; ", end='', indent=False)
-        self.print(f"{iterator} += {increment})", indent=False)
-        self.print("{")
-        self.indent()
-        for op in iteration_op.body.ops:
-            if isinstance(op, (Iteration, Initialise, Statement, memref.Store)):
-                self.printOperation(op)
-        self.dedent()
-        self.print("}")
-        pass
-
-    def printIterationWithSubIndices(self,
-                                     iteration_op: IterationWithSubIndices):
-        uindices_names = iteration_op.uindices_names
-        uindices_symbmins_divisors = iteration_op.uindices_symbmins_divisors
-        uindices_symbmins_dividends = iteration_op.uindices_symbmins_dividends
-        ssa_val = iteration_op.body.blocks[0].args[0]
-        iterator = str(iteration_op.arg_name.data)
-        SSAValueNames[ssa_val] = iterator
-        self.iterator_names[
-            iteration_op.regions[0].blocks[0].args[0]] = iterator
-        lower_bound = iteration_op.attributes['limits'].data[0].data
-        upper_bound = iteration_op.attributes['limits'].data[1].data
-        increment = iteration_op.attributes['limits'].data[2].data
-        self.print(f"for (int {iterator} = {lower_bound}, ", end='')
-
-        # Initialise subindices
-        for i, u in enumerate(uindices_names.data):
-            self.print(
-                f"{u.data} = ({uindices_symbmins_dividends.data[i].data})%"
-                f"({uindices_symbmins_divisors.data[i].data})",
-                end='', indent=False)
-            if i < (len(uindices_names.data) - 1):
-                self.print(",", end=' ', indent=False)
-            else:
-                self.print(";", end=' ', indent=False)
-
-        self.print(f"{iterator} <= {upper_bound}; ", end='', indent=False)
-        self.print(f"{iterator} += {increment},", end=' ', indent=False)
-
-        # also increment subindices
-        for i, u in enumerate(uindices_names.data):
-            self.print(
-                f"{u.data} = ({uindices_symbmins_dividends.data[i].data})"
-                f"%({uindices_symbmins_divisors.data[i].data})",
-                end='', indent=False)
-            if i < (len(uindices_names.data) - 1):
-                self.print(",", end=' ', indent=False)
-
-        self.print(")", indent=False)
-        self.print("{")
-        self.indent()
-        self.printOperation(iteration_op.body.ops)
-        self.dedent()
-        self.print("}", indent=True)
-        self.print("")
-        pass
-
-    def printResult(self, result):
-        if isinstance(result, BlockArgument):
-            name = SSAValueNames[result]
-            self.print(name, indent=False, end="")
-            return
-        if isinstance(result, SSAValue):
-            self.printOperation(result.op)
-
-    def printOperation(self, operation):
-        if isinstance(operation, BlockArgument):
-            # Not currently used
-            self.print("uuu", indent=False, end="")
-            return
-        if (isinstance(operation, List)):
-            for op in operation:
-                if isinstance(op, (Constant, Addi, Modi)):
-                    continue
-                self.printOperation(op)
-            return
-
-        if (isinstance(operation, Constant)):
-            self.print(operation.value.parameters[0].data,
-                       indent=False,
-                       end='')
-            return
-
-        if (isinstance(operation, Addi)):
-            self.printResult(operation.lhs)
-            self.print(" + ", end='', indent=False)
-            self.printResult(operation.rhs)
-            return
-
-        if (isinstance(operation, Modi)):
-            self.print("(", end="", indent=False)
-            self.printResult(operation.input1)
-            self.print(")", end="", indent=False)
-            self.print(" % ", end='', indent=False)
-            self.print("(", end="", indent=False)
-            self.printResult(operation.input2)
-            self.print(")", end="", indent=False)
-            return
-
-        if (isinstance(operation, Powi)):
-            self.print("pow(", end="", indent=False)
-            self.print("(", end="", indent=False)
-            self.printResult(operation.base)
-            self.print(")", end="", indent=False)
-            self.print(",", end='', indent=False)
-            self.print("(", end="", indent=False)
-            self.printResult(operation.exponent)
-            self.print(")", end="", indent=False)
-            self.print(")", end="", indent=False)
-            return
-
-        if (isinstance(operation, Muli)):
-            self.printResult(operation.lhs)
-            self.print("*", end='', indent=False)
-            self.printResult(operation.rhs)
-            return
-
-        if (isinstance(operation, Callable)):
-            self.printCallable(operation)
-            return
-
-        if (isinstance(operation, Call)):
-            self.printCall(operation, False)
-            return
-
-        if (isinstance(operation, IterationWithSubIndices)):
-            self.printIterationWithSubIndices(operation)
-            return
-
-        if (isinstance(operation, Iteration)):
-            self.printIteration(operation)
-            return
-
-        if (isinstance(operation, Initialise)):
-            results = flatten(operation.results)
-            assert len(results) == 1
-            type = results[0].typ.name
-            # rename float accordingly if required
-            if type == "f32":
-                type = "float"
-            elif type == "f64":
-                type = "double"
-            # TOFIX: resort to float
-            # elif type == "integer_type":
-            #     type = "const int"
-            else:
-                type = "float"
-            self.print(type, indent=True, end=" ")
-            assignee = operation.attributes['name'].data
-            for i in assignee:
-                self.print(i.data, indent=False, end="")
-            ssa_val = operation.lhs
-            SSAValueNames[ssa_val] = assignee
-
-            self.print(" = ", indent=False, end="")
-            self.printResult(operation.rhs)
-            self.print(";", indent=False)
-            return
-
-        if (isinstance(operation, memref.Load)):
-            self.printResult(operation.memref)
-            for ind in operation.indices:
-                self.print("[", indent=False, end="")
-                self.printResult(ind)
-                self.print("]", indent=False, end="")
-            return
-
-        if (isinstance(operation, memref.Store)):
-
-            self.print("", end="")
-            self.printResult(operation.memref)
-            for ind in operation.indices:
-                self.print("[", indent=False, end="")
-                self.printResult(ind)
-                self.print("]", indent=False, end="")
-
-            self.print(" = ", indent=False, end="")
-            self.printResult(operation.value)
-            self.print(";", indent=False)
-            return
-
-
-            """
-
-            self.print
-            self.printResult(operation.memref)
-            for ind in operation.indices:
-                self.print("[", indent=False, end="")
-                self.printResult(ind)
-                self.print("]", indent=False, end="")
-            return
-            """
-
-        if (isinstance(operation, (Statement))):
-            self.print(operation.attributes['statement'].data)
-            return
-
-        if (isinstance(operation, (PointerCast))):
-            self.print(operation.attributes['statement'].data)
-            return
-
-        if (isinstance(operation, StructDecl)):
-            self.print("struct", indent=False, end=" ")
-            self.print(operation.attributes['id'].data)
-            self.print("{")
-            for field in operation.attributes['fields'].data:
-                self.print(' ', field.data)
-            self.print("} ;")
-            self.print('')
-            return
-
-        self.print(f"// Operation {operation.name} not supported in printer")