Fixup and two more low hanging fruits

python/dune/perftool/generation/hooks.py

@@ -38,17 +38,16 @@ def run_hook(name=None, args=[], kwargs={}):
     if occ.count(True):
         index = occ.index(True)
     args = list(args)
+    ret = None
     if index is not None:
-        args[index] = args[index].arg
+        ret = args[index].arg
 
     # Run the actual hooks
-    ret = None
-
     for hook in _hooks.get(name, ()):
-        ret = hook(*args, **kwargs)
-
-        # And modify the args for chained hooks
+        # Modify the args for chained hooks
         if index is not None:
             args[index] = ret
 
+        ret = hook(*args, **kwargs)
+
     return ret

python/dune/perftool/pdelab/localoperator.py

@@ -28,6 +28,7 @@ from dune.perftool.generation import (backend,
                                       post_include,
                                       retrieve_cache_functions,
                                       retrieve_cache_items,
+                                      ReturnArg,
                                       run_hook,
                                       template_parameter,
                                       )
@@ -492,6 +493,11 @@ def generate_kernel(integrals):
     # Clean the cache from any data collected after the dry run
     delete_cache_items("dryrundata")
 
+    # Run preprocessing from custom user code
+    knl = run_hook(name="loopy_kernel",
+                   args=(ReturnArg(knl),),
+                   )
+
     return knl
 
 

python/dune/perftool/ufl/preprocess.py

 """ Preprocessing algorithms for UFL forms """
 
+from dune.perftool.generation import run_hook, ReturnArg
 import ufl.classes as uc
 import ufl.algorithms.apply_function_pullbacks as afp
 
@@ -39,6 +40,10 @@ def preprocess_form(form):
 
     formdata.preprocessed_form = apply_default_transformations(formdata.preprocessed_form)
 
+    # Run preprocessing from custom user code
+    formdata.preprocessed_form = run_hook(name="preprocess",
+                                          args=(ReturnArg(formdata.preprocessed_form),))
+
     return formdata