fixup

python/dune/perftool/sumfact/accumulation.py

@@ -203,7 +203,7 @@ def generate_accumulation_instruction(visitor, accterm, measure, subdomain_id):
         vecinames = ()
         # TODO: evaluate whether the following line would be okay with vsf.vectorized
         if vsf.vec_index(sf) is not None:
-            iname = accum_iname((accterm.argument.restriction, restriction), vsf.vector_width, "vec")
+            iname = accum_iname((accterm.argument.restriction, restriction), vsf.horizontal_width, "vec")
             vecinames = (iname,)
             transform(lp.tag_inames, [(iname, "vec")])
             from dune.perftool.tools import maybe_wrap_subscript

python/dune/perftool/sumfact/realization.py

@@ -96,7 +96,7 @@ def _realize_sum_factorization_kernel(sf):
     if sf.vectorized:
         ftags = ftags + ",vec"
         ctags = ctags + ",vec"
-        vec_shape = (sf.vector_width,)
+        vec_shape = (sf.horizontal_width,)
 
     # Measure times and count operations in c++ code
     if get_option("instrumentation_level") >= 4:
@@ -133,7 +133,7 @@ def _realize_sum_factorization_kernel(sf):
         out_inames = tuple(sumfact_iname(length, "out_inames_" + str(k)) for k, length in enumerate(out_shape))
         vec_iname = ()
         if matrix.vectorized:
-            iname = sumfact_iname(sf.vector_width, "vec")
+            iname = sumfact_iname(sf.horizontal_width, "vec")
             vec_iname = (prim.Variable(iname),)
             transform(lp.tag_inames, [(iname, "vec")])
 
@@ -160,7 +160,7 @@ def _realize_sum_factorization_kernel(sf):
 
             globalarg(direct_input, dtype=np.float64, shape=inp_shape, dim_tags=novec_ftags)
             if matrix.vectorized:
-                input_summand = prim.Call(prim.Variable(get_vcl_typename(np.float64, vector_width=sf.vector_width)),
+                input_summand = prim.Call(prim.Variable(get_vcl_typename(np.float64, vector_width=sf.horizontal_width)),
                                           (prim.Subscript(prim.Variable(direct_input),
                                                           input_inames),))
             else:

python/dune/perftool/sumfact/vectorization.py

@@ -113,7 +113,7 @@ def horizontal_vectorization_strategy(sumfacts):
         for sumf in sumfacts:
             _cache_vectorization_info(sumf,
                                       VectorizedSumfactKernel(kernels=kernels,
-                                                              vector_width=width,
+                                                              horizontal_width=width,
                                                               buffer=buffer,
                                                               input=input,
                                                               )