compiler: Polish code generation

devitocodes · Jul 26, 2022 · d29d57d · d29d57d
1 parent 0a1f2df
commit d29d57d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/devito/ir/iet/visitors.py b/devito/ir/iet/visitors.py
@@ -357,7 +357,12 @@ def visit_Definition(self, o):
             if o.constructor_args:
                 v = MultilineCall(v, o.constructor_args, True)
 
-            v = c.Value(f._C_typename, v)
+            # Aesthetics: `float * a` -> `float *a`
+            try:
+                t, stars = f._C_typename.split()
+                v = c.Value(t, '%s%s' % (stars, v))
+            except ValueError:
+                v = c.Value(f._C_typename, v)
 
         if o.initvalue is not None:
             v = c.Initializer(v, o.initvalue)

diff --git a/devito/types/parallel.py b/devito/types/parallel.py
@@ -99,6 +99,8 @@ class ThreadID(CustomDimension):
     __rargs__ = ('nthreads',)
     __rkwargs__ = ()
 
+    is_const = True
+
     def __new__(cls, nthreads):
         return CustomDimension.__new__(cls, name='tid', symbolic_size=nthreads)
 

diff --git a/examples/mpi/overview.ipynb b/examples/mpi/overview.ipynb
@@ -1025,9 +1025,9 @@
        "\n",
        "static void sendrecv0(struct dataobj *restrict u_vec, const int x_size, const int y_size, int ogtime, int ogx, int ogy, int ostime, int osx, int osy, int fromrank, int torank, MPI_Comm comm)\n",
        "{\n",
-       "  float * bufg_vec;\n",
+       "  float *bufg_vec;\n",
        "  posix_memalign((void**)(&bufg_vec),64,x_size*y_size*sizeof(float));\n",
-       "  float * bufs_vec;\n",
+       "  float *bufs_vec;\n",
        "  posix_memalign((void**)(&bufs_vec),64,x_size*y_size*sizeof(float));\n",
        "\n",
        "  MPI_Request rrecv;\n",

diff --git a/examples/performance/00_overview.ipynb b/examples/performance/00_overview.ipynb
@@ -1219,7 +1219,7 @@
       "{\n",
       "  float **pr2_vec;\n",
       "  posix_memalign((void**)(&pr2_vec),64,nthreads*sizeof(float*));\n",
-      "  float * r0_vec;\n",
+      "  float *r0_vec;\n",
       "  posix_memalign((void**)(&r0_vec),64,x_size*y_size*z_size*sizeof(float));\n",
       "  #pragma omp parallel num_threads(nthreads)\n",
       "  {\n",
@@ -1510,7 +1510,7 @@
       "{\n",
       "  float **pr2_vec;\n",
       "  posix_memalign((void**)(&pr2_vec),64,nthreads*sizeof(float*));\n",
-      "  float * r0_vec;\n",
+      "  float *r0_vec;\n",
       "  posix_memalign((void**)(&r0_vec),64,x_size*y_size*z_size*sizeof(float));\n",
       "  #pragma omp parallel num_threads(nthreads)\n",
       "  {\n",
@@ -1655,11 +1655,11 @@
       "\n",
       "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 * r0_vec;\n",
+      "  float *r0_vec;\n",
       "  posix_memalign((void**)(&r0_vec),64,x_size*y_size*z_size*sizeof(float));\n",
-      "  float * r3_vec;\n",
+      "  float *r3_vec;\n",
       "  posix_memalign((void**)(&r3_vec),64,z_size*(x_size + 4)*(y_size + 4)*sizeof(float));\n",
-      "  float * r4_vec;\n",
+      "  float *r4_vec;\n",
       "  posix_memalign((void**)(&r4_vec),64,z_size*(x_size + 4)*(y_size + 4)*sizeof(float));\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",