compiler: Remove dangerous updates_args feature

Author: FabioLuporini

devito/passes/iet/asynchrony.py

@@ -38,7 +38,7 @@ def pthreadify(graph, **kwargs):
 AsyncMeta = namedtuple('AsyncMeta', 'sdata threads init shutdown')
 
 
-@iet_pass(updates_args=True)
+@iet_pass
 def lower_async_objs(iet, **kwargs):
     # Different actions depending on the Callable type
     iet, efuncs = _lower_async_objs(iet, **kwargs)

devito/passes/iet/definitions.py

@@ -444,7 +444,7 @@ def _inject_definitions(self, iet, storage):
 
         return processed, flatten(efuncs)
 
-    @iet_pass(updates_args=True)
+    @iet_pass
     def place_definitions(self, iet, globs=None, **kwargs):
         """
         Create a new IET where all symbols have been declared, allocated, and

devito/passes/iet/engine.py

@@ -127,21 +127,14 @@ def sync_mapper(self):
 
         return found
 
-    def apply(self, func, *, updates_args=False, **kwargs):
+    def apply(self, func, **kwargs):
         """
         Apply ``func`` to all nodes in the Graph.
 
-        Parameters
-        ----------
-        updates_args : bool, optional
-            If True, reconcile Callable parameters and Call arguments before
-            the graph walk and after each changed node. This is only needed by
-            passes whose transformation logic depends on already-updated
-            signatures while the pass is still running. Otherwise, argument
-            reconciliation is intentionally deferred to ``finalize_args``.
+        Callable parameters and Call arguments are reconciled before the graph
+        walk, after each changed node, and after the pass has completed.
         """
-        if updates_args:
-            _update_args(self)
+        _update_args(self)
 
         dag = create_call_graph(self.root.name, as_hashable(self.efuncs))
 
@@ -172,8 +165,7 @@ def apply(self, func, *, updates_args=False, **kwargs):
             efuncs[i] = efunc
             efuncs.update(dict([(i.name, i) for i in new_efuncs]))
 
-            if updates_args:
-                efuncs = _update_args_efunc(efunc, efuncs, dag)
+            efuncs = _update_args_efunc(efunc, efuncs, dag)
 
         # Minimize code size
         if len(efuncs) > len(self.efuncs):
@@ -182,6 +174,7 @@ def apply(self, func, *, updates_args=False, **kwargs):
             efuncs = reuse_efuncs(self.root, efuncs, self.sregistry)
 
         self.efuncs = efuncs
+        _update_args(self)
 
         # Uniqueness
         self.includes = filter_ordered(self.includes)
@@ -240,24 +233,19 @@ def _update_args(graph):
     graph.efuncs = efuncs
 
 
-def iet_pass(func=None, *, updates_args=False):
+def iet_pass(func=None):
     """
     Decorate an IET pass.
-
-    ``updates_args=True`` is an opt-in for passes that must observe up-to-date
-    Callable/Call signatures before and during their own graph walk. Most
-    passes should leave it False and rely on ``finalize_args`` at the end of
-    IET lowering.
     """
     if func is None:
-        return partial(iet_pass, updates_args=updates_args)
+        return iet_pass
 
     if isinstance(func, tuple):
         assert len(func) == 2 and func[0] is iet_visit
         call = lambda graph: graph.visit
         func = func[1]
     else:
-        call = lambda graph: partial(graph.apply, updates_args=updates_args)
+        call = lambda graph: graph.apply
 
     @wraps(func)
     def wrapper(*args, **kwargs):

devito/passes/iet/linearization.py

@@ -46,7 +46,7 @@ def linearize(graph, **kwargs):
     linearization(graph, key=key, tracker=tracker, **kwargs)
 
 
-@iet_pass(updates_args=True)
+@iet_pass
 def linearization(iet, key=None, tracker=None, **kwargs):
     """
     Carry out the actual work of `linearize`.

tests/test_iet.py

@@ -14,8 +14,7 @@
     ElementalFunction, FindSymbols, Iteration, KernelLaunch, Lambda, List, Switch,
     Transformer, filter_iterations, make_efunc, retrieve_iteration_tree
 )
-from devito.passes.iet import engine as iet_engine
-from devito.passes.iet.engine import Graph, iet_pass
+from devito.passes.iet.engine import Graph
 from devito.passes.iet.languages.C import CDataManager
 from devito.symbolics import (
     FLOAT, Byref, Class, FieldFromComposite, InlineIf, ListInitializer, Macro, SizeOf,
@@ -540,26 +539,6 @@ def test_complex_array():
         "float _Complex **restrict a_vec __attribute__ ((aligned (64)));"
 
 
-def test_iet_pass_does_not_update_args(monkeypatch):
-    x = Symbol(name='x')
-    y = Symbol(name='y')
-
-    foo = Callable('foo', DummyExpr(x, y), 'void', parameters=(x, y))
-    graph = Graph(foo)
-
-    @iet_pass
-    def inject_expr(iet):
-        body = iet.body._rebuild(body=iet.body.body + (DummyExpr(x, x),))
-        return iet._rebuild(body=body), {}
-
-    monkeypatch.setattr(iet_engine, '_update_args',
-                        lambda *args, **kwargs: pytest.fail("_update_args called"))
-
-    inject_expr(graph)
-
-    assert graph.root.parameters is foo.parameters
-
-
 def test_special_array_definition():
 
     class MyArray(Array):