compiler: only parenthesise non-atom

Author: mloubout

devito/ir/cgen/printer.py

@@ -370,7 +370,7 @@ def _print_UnaryOp(self, expr, op=None, parenthesize=False):
 
     def _print_Cast(self, expr):
         cast = f'({self._print(expr._C_ctype)}{self._print(expr.stars)})'
-        return self._print_UnaryOp(expr, op=cast, parenthesize=True)
+        return self._print_UnaryOp(expr, op=cast, parenthesize=not expr.base.is_Atom)
 
     def _print_ComponentAccess(self, expr):
         return f"{self._print(expr.base)}.{expr.sindex}"

devito/passes/iet/languages/CXX.py

@@ -127,7 +127,7 @@ def _print_Cast(self, expr):
             return super()._print_Cast(expr)
         caster = 'reinterpret_cast' if expr.reinterpret else 'static_cast'
         cast = f'{caster}<{tstr}{self._print(expr.stars)}>'
-        return self._print_UnaryOp(expr, op=cast, parenthesize=True)
+        return self._print_UnaryOp(expr, op=cast, parenthesize=not expr.base.is_Atom)
 
     def _print_ListInitializer(self, expr):
         li = super()._print_ListInitializer(expr)

devito/symbolics/manipulation.py

@@ -10,7 +10,8 @@
 from devito.finite_differences.differentiable import (
     EvalDerivative, IndexDerivative
 )
-from devito.symbolics.extended_sympy import DefFunction, rfunc, LONG
+from devito.symbolics.extended_sympy import DefFunction, rfunc
+from devito.symbolics.extended_dtypes import LONG
 from devito.symbolics.queries import q_leaf
 from devito.symbolics.search import (
     retrieve_indexed, retrieve_functions, retrieve_symbols

examples/mpi/overview.ipynb

@@ -486,9 +486,9 @@
        "  MPI_Request rsend;\n",
        "\n",
        "  float *restrict bufg_vec __attribute__ ((aligned (64)));\n",
-       "  posix_memalign((void**)(&bufg_vec),64,sizeof(float)*(long)(y_size)*(long)(x_size));\n",
+       "  posix_memalign((void**)(&bufg_vec),64,sizeof(float)*(long)y_size*(long)x_size);\n",
        "  float *restrict bufs_vec __attribute__ ((aligned (64)));\n",
-       "  posix_memalign((void**)(&bufs_vec),64,sizeof(float)*(long)(y_size)*(long)(x_size));\n",
+       "  posix_memalign((void**)(&bufs_vec),64,sizeof(float)*(long)y_size*(long)x_size);\n",
        "\n",
        "  MPI_Irecv(bufs_vec,x_size*y_size,MPI_FLOAT,fromrank,13,comm,&(rrecv));\n",
        "  if (torank != MPI_PROC_NULL)\n",

examples/performance/00_overview.ipynb

@@ -725,8 +725,7 @@
       "    }\n",
       "  }\n",
       "  STOP(section0,timers)\n",
-      "}\n",
-      "\n"
+      "}\n"
      ]
     }
    ],
@@ -1193,13 +1192,13 @@
       "int Kernel(struct dataobj *restrict f_vec, struct dataobj *restrict u_vec, const float h_y, const int time_M, const int time_m, const int x0_blk0_size, const int x_M, const int x_m, const int y0_blk0_size, const int y_M, const int y_m, const int z_M, const int z_m, const int nthreads, const int z_size, const int x_size, const int y_size, struct profiler * timers)\n",
       "{\n",
       "  float **restrict pr2_vec __attribute__ ((aligned (64)));\n",
-      "  posix_memalign((void**)(&pr2_vec),64,sizeof(float*)*(long)(nthreads));\n",
+      "  posix_memalign((void**)(&pr2_vec),64,sizeof(float*)*(long)nthreads);\n",
       "  float *restrict r0_vec __attribute__ ((aligned (64)));\n",
-      "  posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)(z_size)*(long)(y_size)*(long)(x_size));\n",
+      "  posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)z_size*(long)y_size*(long)x_size);\n",
       "  #pragma omp parallel num_threads(nthreads)\n",
       "  {\n",
       "    const int tid = omp_get_thread_num();\n",
-      "    posix_memalign((void**)(&(pr2_vec[tid])),64,sizeof(float)*(long)(z_size)*(4 + (long)(y0_blk0_size)));\n",
+      "    posix_memalign((void**)(&(pr2_vec[tid])),64,sizeof(float)*(long)z_size*(4 + (long)y0_blk0_size));\n",
       "  }\n",
       "\n",
       "  float (*restrict f)[f_vec->size[1]][f_vec->size[2]] __attribute__ ((aligned (64))) = (float (*)[f_vec->size[1]][f_vec->size[2]]) f_vec->data;\n",
@@ -1413,7 +1412,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)(z_size)*(long)(y_size)*(long)(x_size));\n"
+      "posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)z_size*(long)y_size*(long)x_size);\n"
      ]
     }
    ],
@@ -1484,13 +1483,13 @@
       "int Kernel(struct dataobj *restrict f_vec, struct dataobj *restrict u_vec, const float h_y, const int time_M, const int time_m, const int x_M, const int x_m, const int y_M, const int y_m, const int z_M, const int z_m, const int nthreads, const int z_size, const int x_size, const int y_size, struct profiler * timers)\n",
       "{\n",
       "  float **restrict pr2_vec __attribute__ ((aligned (64)));\n",
-      "  posix_memalign((void**)(&pr2_vec),64,sizeof(float*)*(long)(nthreads));\n",
+      "  posix_memalign((void**)(&pr2_vec),64,sizeof(float*)*(long)nthreads);\n",
       "  float *restrict r0_vec __attribute__ ((aligned (64)));\n",
-      "  posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)(z_size)*(long)(y_size)*(long)(x_size));\n",
+      "  posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)z_size*(long)y_size*(long)x_size);\n",
       "  #pragma omp parallel num_threads(nthreads)\n",
       "  {\n",
       "    const int tid = omp_get_thread_num();\n",
-      "    posix_memalign((void**)(&(pr2_vec[tid])),64,sizeof(float)*(long)(z_size)*(4 + (long)(y_size)));\n",
+      "    posix_memalign((void**)(&(pr2_vec[tid])),64,sizeof(float)*(long)z_size*(4 + (long)y_size));\n",
       "  }\n",
       "\n",
       "  float (*restrict f)[f_vec->size[1]][f_vec->size[2]] __attribute__ ((aligned (64))) = (float (*)[f_vec->size[1]][f_vec->size[2]]) f_vec->data;\n",
@@ -1627,11 +1626,11 @@
       "int Kernel(struct dataobj *restrict f_vec, struct dataobj *restrict u_vec, const float h_x, const float h_y, const int time_M, const int time_m, const int x0_blk0_size, const int x1_blk0_size, const int x_M, const int x_m, const int y0_blk0_size, const int y1_blk0_size, const int y_M, const int y_m, const int z_M, const int z_m, const int nthreads, const int x_size, const int y_size, const int z_size, struct profiler * timers)\n",
       "{\n",
       "  float *restrict r0_vec __attribute__ ((aligned (64)));\n",
-      "  posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)(z_size)*(long)(y_size)*(long)(x_size));\n",
+      "  posix_memalign((void**)(&r0_vec),64,sizeof(float)*(long)z_size*(long)y_size*(long)x_size);\n",
       "  float *restrict r3_vec __attribute__ ((aligned (64)));\n",
-      "  posix_memalign((void**)(&r3_vec),64,sizeof(float)*(long)(z_size)*(4 + (long)(y_size))*(4 + (long)(x_size)));\n",
+      "  posix_memalign((void**)(&r3_vec),64,sizeof(float)*(long)z_size*(4 + (long)y_size)*(4 + (long)x_size));\n",
       "  float *restrict r4_vec __attribute__ ((aligned (64)));\n",
-      "  posix_memalign((void**)(&r4_vec),64,sizeof(float)*(long)(z_size)*(4 + (long)(y_size))*(4 + (long)(x_size)));\n",
+      "  posix_memalign((void**)(&r4_vec),64,sizeof(float)*(long)z_size*(4 + (long)y_size)*(4 + (long)x_size));\n",
       "\n",
       "  float (*restrict f)[f_vec->size[1]][f_vec->size[2]] __attribute__ ((aligned (64))) = (float (*)[f_vec->size[1]][f_vec->size[2]]) f_vec->data;\n",
       "  float (*restrict r0)[y_size][z_size] __attribute__ ((aligned (64))) = (float (*)[y_size][z_size]) r0_vec;\n",

tests/test_iet.py

@@ -345,7 +345,7 @@ class SpecialObject2(LocalObject):
     assert 'bar<int,float>& obj2;' in str(iet)
     assert 'dummy obj3 = meh;' in str(iet)
     assert 'dummy obj4(1,2) = meh;' in str(iet)
-    assert 'dummy obj5(ceil(1.0F/(float)(s))) = meh;' in str(iet)
+    assert 'dummy obj5(ceil(1.0F/(float)s)) = meh;' in str(iet)
     assert 'float obj6 = meh;' in str(iet)
 
 

tests/test_symbolics.py

@@ -426,10 +426,10 @@ class BarCast(BaseCast):
         _dtype = 'bar'
 
     v = BarCast(s, '**')
-    assert ccode(v) == '(bar**)(s)'
+    assert ccode(v) == '(bar**)s'
 
     # Reconstruction
-    assert ccode(v.func(*v.args)) == '(bar**)(s)'
+    assert ccode(v.func(*v.args)) == '(bar**)s'
 
     v1 = BarCast(s, '****')
     assert v != v1
@@ -442,19 +442,19 @@ def test_str_cast():
     assert not v.stars
     assert v.dtype == 'foo'
     assert v._op == '(foo)'
-    assert ccode(v) == '(foo)(s)'
+    assert ccode(v) == '(foo)s'
 
     v = Cast(s, 'foo*')
     assert v.stars == '*'
     assert v.dtype == 'foo'
     assert v._op == '(foo*)'
-    assert ccode(v) == '(foo*)(s)'
+    assert ccode(v) == '(foo*)s'
 
     v = Cast(s, 'foo **')
     assert v.stars == '**'
     assert v.dtype == 'foo'
     assert v._op == '(foo**)'
-    assert ccode(v) == '(foo**)(s)'
+    assert ccode(v) == '(foo**)s'
 
 
 def test_findexed():