time_opcounter -> performance_measuring

The previous name was *really* confusing.

applications/knl/poisson_dg/knl_poisson_dg.mini

@@ -44,7 +44,7 @@ vectorization_horizontal = 4
 vectorization_vertical = 2
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
-time_opcounter = 0, 1 | expand opcount
+performance_measuring = 0, 1 | expand opcount
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
 architecture = knl
 assure_statement_ordering = 1

applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini

@@ -44,7 +44,7 @@ vectorization_horizontal = 4
 vectorization_vertical = 2
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
-time_opcounter = 0, 1 | expand opcount
+performance_measuring = 0, 1 | expand opcount
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
 architecture = knl
 assure_statement_ordering = 1

applications/poisson_dg/poisson_dg.mini

@@ -42,7 +42,7 @@ vectorization_quadloop = 1
 vectorization_strategy = explicit
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
-time_opcounter = 0, 1 | expand opcount
+performance_measuring = 0, 1 | expand opcount
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
 assure_statement_ordering = 1
 

applications/poisson_dg_tensor/poisson_dg_tensor.mini

@@ -42,7 +42,7 @@ vectorization_quadloop = 1
 vectorization_strategy = explicit
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
-time_opcounter = 0, 1 | expand opcount
+performance_measuring = 0, 1 | expand opcount
 quadrature_order = {formcompiler.ufl_variants.degree} * 2 | eval
 assure_statement_ordering = 1
 

applications/stokes_dg/stokes_dg.mini

@@ -44,7 +44,7 @@ vectorization_strategy = model
 vectorization_allow_quadrature_changes = 1
 instrumentation_level = 2, 3, 4 | expand
 opcounter = 1, 0 | expand opcount
-time_opcounter = 0, 1 | expand opcount
+performance_measuring = 0, 1 | expand opcount
 quadrature_order = {formcompiler.ufl_variants.v_degree} * 2 | eval
 assure_statement_ordering = 1
 

python/dune/perftool/options.py

@@ -49,8 +49,8 @@ class PerftoolOptionsArray(ImmutableRecord):
     diagonal_transformation_matrix = PerftoolOption(default=False, helpstr="set option if the jacobian of the transformation is diagonal (axiparallel grids)")
     constant_transformation_matrix = PerftoolOption(default=False, helpstr="set option if the jacobian of the transformation is constant on a cell")
     ini_file = PerftoolOption(helpstr="An inifile to use. A generated driver will be hard-coded to it, a [formcompiler] section will be used as default values to form compiler arguments (use snake case)")
-    opcounter = PerftoolOption(default=False, helpstr="Count operations. Note: In this case only oparor applications are generated since solving and operator counting does not work. You probably want to set instrumentation level>0.")
-    time_opcounter = PerftoolOption(default=False, helpstr="Generate opcounter codepath. Can be used for timing opcounter programs without setting the opcounter option.")
+    opcounter = PerftoolOption(default=False, helpstr="Count operations. Note: In this case only operator applications are generated since solving and operator counting does not work. You probably want to set instrumentation level>0.")
+    performance_measuring = PerftoolOption(default=False, helpstr="Generate opcounter codepath, but only measure times!")
     instrumentation_level = PerftoolOption(default=0, helpstr="Control time/opcounter measurements. 0-do nothing, 1-measure program as a whole, 2-operator applications, 3-measure kernel (eg. alpha-volume, ...), 4-parts of kernel (eg. stage 1-3 of SF)")
     project_basedir = PerftoolOption(helpstr="The base (build) directory of the dune-perftool project")
     fastdg = PerftoolOption(default=False, helpstr="Use FastDGGridOperator from PDELab.")

python/dune/perftool/pdelab/driver/__init__.py

@@ -268,8 +268,8 @@ def generate_driver(formdatas, data):
         check_parallel_execution()
 
     # Entrypoint for driver generation
-    if get_option("opcounter") or get_option("time_opcounter"):
-        if get_option("time_opcounter"):
+    if get_option("opcounter") or get_option("performance_measuring"):
+        if get_option("performance_measuring"):
             assert(not get_option("opcounter"))
         assert(any(_driver_data['form'].ufl_cell().cellname() in x for x in
                    ["vertex", "interval", "quadrilateral", "hexahedron"]))