From 46ed5c9ff80e199a97752256ea62bf06bf41a374 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Mon, 29 Jan 2018 10:13:15 +0100
Subject: [PATCH] time_opcounter -> performance_measuring
The previous name was *really* confusing.
---
applications/knl/poisson_dg/knl_poisson_dg.mini | 2 +-
applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini | 2 +-
applications/poisson_dg/poisson_dg.mini | 2 +-
applications/poisson_dg_tensor/poisson_dg_tensor.mini | 2 +-
applications/stokes_dg/stokes_dg.mini | 2 +-
python/dune/perftool/options.py | 4 ++--
python/dune/perftool/pdelab/driver/__init__.py | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/applications/knl/poisson_dg/knl_poisson_dg.mini b/applications/knl/poisson_dg/knl_poisson_dg.mini
index bf478e85..90bf1eb6 100644
--- a/applications/knl/poisson_dg/knl_poisson_dg.mini
+++ b/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
diff --git a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
index 8b746a3d..9e9f5734 100644
--- a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini
+++ b/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
diff --git a/applications/poisson_dg/poisson_dg.mini b/applications/poisson_dg/poisson_dg.mini
index e99c2020..7534d170 100644
--- a/applications/poisson_dg/poisson_dg.mini
+++ b/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
diff --git a/applications/poisson_dg_tensor/poisson_dg_tensor.mini b/applications/poisson_dg_tensor/poisson_dg_tensor.mini
index 720b8957..d3f37cb0 100644
--- a/applications/poisson_dg_tensor/poisson_dg_tensor.mini
+++ b/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
diff --git a/applications/stokes_dg/stokes_dg.mini b/applications/stokes_dg/stokes_dg.mini
index 9cf5f0ba..f28446bf 100644
--- a/applications/stokes_dg/stokes_dg.mini
+++ b/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
diff --git a/python/dune/perftool/options.py b/python/dune/perftool/options.py
index 7cc16ca9..6c7da068 100644
--- a/python/dune/perftool/options.py
+++ b/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.")
diff --git a/python/dune/perftool/pdelab/driver/__init__.py b/python/dune/perftool/pdelab/driver/__init__.py
index acab1a5e..e4744653 100644
--- a/python/dune/perftool/pdelab/driver/__init__.py
+++ b/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"]))
--
GitLab