Make simplification optional, instead of deactivated

python/dune/perftool/options.py

@@ -63,6 +63,7 @@ class PerftoolOptionsArray(ImmutableRecord):
     turn_off_diagonal_jacobian = PerftoolOption(default=False, helpstr="Do not use diagonal_jacobian transformation on the ufl tree and cast result of jacobianInverseTransposed into a FieldMatrix.")
     architecture = PerftoolOption(default="haswell", helpstr="The architecture to optimize for. Possible values: haswell|knl")
     grid_offset = PerftoolOption(default=False, helpstr="Set to true if you want a yasp grid where the lower left corner is not in the origin.")
+    simplify = PerftoolOption(default=True, helpstr="Whether to simplify expressions using sympy")
 
     # Arguments that are mainly to be set by logic depending on other options
     max_vector_width = PerftoolOption(default=256, helpstr=None)

python/dune/perftool/ufl/visitor.py

@@ -61,8 +61,9 @@ class UFL2LoopyVisitor(ModifiedTerminalTracker):
             self.current_info = info
             expr = self._call(o, False)
             if expr != 0:
-                # from dune.perftool.sympy import simplify_pymbolic_expression
-                # expr = simplify_pymbolic_expression(expr)
+                if get_option("simplify"):
+                    from dune.perftool.sympy import simplify_pymbolic_expression
+                    expr = simplify_pymbolic_expression(expr)
                 self.interface.generate_accumulation_instruction(expr, self)
 
     def _call(self, o, do_predicates):