Merge pull request #2305 from devitocodes/cire_dim_names

compiler: Adjust names used for cire-rotate dimensions
devitocodes · Feb 16, 2024 · 313c980 · 313c980
2 parents 747c0fe + d216ead
commit 313c980
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/devito/passes/clusters/aliases.py b/devito/passes/clusters/aliases.py
@@ -781,7 +781,7 @@ def optimize_schedule_rotations(schedule, sregistry):
         iib = candidate.upper
 
         ii = ModuloDimension('%sii' % d.root.name, ds, iis, incr=iib)
-        cd = CustomDimension(name='%s%s' % (d.root.name, d.root.name), symbolic_min=ii,
+        cd = CustomDimension(name='%sc' % d.root.name, symbolic_min=ii,
                              symbolic_max=iib, symbolic_size=n)
         dsi = ModuloDimension('%si' % ds.root.name, cd, cd + ds - iis, n)
 

diff --git a/examples/performance/00_overview.ipynb b/examples/performance/00_overview.ipynb
@@ -1360,12 +1360,12 @@
       "        {\n",
       "          for (int y = y0_blk0, ys = 0, yr0 = (ys)%(5), yr1 = (ys + 3)%(5), yr2 = (ys + 4)%(5), yr3 = (ys + 1)%(5), yii = -2; y <= MIN(y_M, y0_blk0 + y0_blk0_size - 1); y += 1, ys += 1, yr0 = (ys)%(5), yr1 = (ys + 3)%(5), yr2 = (ys + 4)%(5), yr3 = (ys + 1)%(5), yii = 2)\n",
       "          {\n",
-      "            for (int yy = yii, yi = (yy + ys + 2)%(5); yy <= 2; yy += 1, yi = (yy + ys + 2)%(5))\n",
+      "            for (int yc = yii, yi = (yc + ys + 2)%(5); yc <= 2; yc += 1, yi = (yc + ys + 2)%(5))\n",
       "            {\n",
       "              #pragma omp simd aligned(u:32)\n",
       "              for (int z = z_m; z <= z_M; z += 1)\n",
       "              {\n",
-      "                r2[yi][z] = r1*(8.33333333e-2F*(u[t0][x + 4][y + yy + 2][z + 4] - u[t0][x + 4][y + yy + 6][z + 4]) + 6.66666667e-1F*(-u[t0][x + 4][y + yy + 3][z + 4] + u[t0][x + 4][y + yy + 5][z + 4]));\n",
+      "                r2[yi][z] = r1*(8.33333333e-2F*(u[t0][x + 4][y + yc + 2][z + 4] - u[t0][x + 4][y + yc + 6][z + 4]) + 6.66666667e-1F*(-u[t0][x + 4][y + yc + 3][z + 4] + u[t0][x + 4][y + yc + 5][z + 4]));\n",
       "              }\n",
       "            }\n",
       "            #pragma omp simd aligned(f,u:32)\n",

diff --git a/tests/test_dse.py b/tests/test_dse.py
@@ -2335,10 +2335,10 @@ def test_blocking_options(self, rotate):
         if rotate:
             assert_structure(
                 op1,
-                prefix + ['t,x0_blk0,y0_blk0,x0_blk1,y0_blk1,x,xx,y,z',
-                          't,x0_blk0,y0_blk0,x0_blk1,y0_blk1,x,y,yy,z',
+                prefix + ['t,x0_blk0,y0_blk0,x0_blk1,y0_blk1,x,xc,y,z',
+                          't,x0_blk0,y0_blk0,x0_blk1,y0_blk1,x,y,yc,z',
                           't,x0_blk0,y0_blk0,x0_blk1,y0_blk1,x,y,z'],
-                't,x0_blk0,y0_blk0,x0_blk1,y0_blk1,x,xx,y,z,y,yy,z,z'
+                't,x0_blk0,y0_blk0,x0_blk1,y0_blk1,x,xc,y,z,y,yc,z,z'
             )
         else:
             assert_structure(