compiler: Avoid generating parentheses when not needed

Author: FabioLuporini

devito/ir/cgen/printer.py

@@ -16,6 +16,7 @@
 from devito import configuration
 from devito.arch.compiler import AOMPCompiler
 from devito.symbolics.inspection import has_integer_args, sympy_dtype
+from devito.symbolics.queries import q_leaf
 from devito.types.basic import AbstractFunction
 from devito.tools import ctypes_to_cstr, dtype_to_ctype, ctypes_vector_mapper
 
@@ -364,7 +365,7 @@ def _print_InlineIf(self, expr):
     def _print_UnaryOp(self, expr, op=None, parenthesize=False):
         op = op or expr._op
         base = self._print(expr.base)
-        if not expr.base.is_Symbol or parenthesize:
+        if not q_leaf(expr.function) or parenthesize:
             base = f'({base})'
         return f'{op}{base}'
 

devito/symbolics/extended_sympy.py

@@ -135,7 +135,11 @@ def function(self):
         """
         The underlying function.
         """
-        return self.base.function
+        try:
+            return self.base.function
+        except AttributeError:
+            # Fallback, mostly for legacy tests, when wrapping SymPy types
+            return self.base
 
     @property
     def dtype(self):

devito/symbolics/queries.py

@@ -37,9 +37,12 @@ def q_comp_acc(expr):
 
 
 def q_leaf(expr):
-    return (expr.is_Atom or
-            expr.is_Indexed or
-            isinstance(expr, extra_leaves))
+    try:
+        return (expr.is_Atom or
+                expr.is_Indexed or
+                isinstance(expr, extra_leaves))
+    except AttributeError:
+        return False
 
 
 def q_indexed(expr):

tests/test_iet.py

@@ -288,7 +288,7 @@ def _C_free(self):
 static void foo()
 {
   cudaStream_t stream;
-  cudaStreamCreate(&(stream));
+  cudaStreamCreate(&stream);
 
   foo(stream);