Some more fixes to instrumentation_level 3, 4

applications/convection_diffusion/conv_diff_dg.mini

@@ -2,6 +2,7 @@ __name = app_conv_diff_{__exec_suffix}
 __exec_suffix = deg{formcompiler.ufl_variants.degree}_{opcount_suffix}_level{formcompiler.instrumentation_level}
 
 opcount_suffix = opcount, nonopcount | expand opcount
+{opcount_suffix} == opcount and {formcompiler.instrumentation_level} != 2 | exclude
 
 # Calculate the size of the grid to equlibritate it to 100 MB/rank
 # Input parameters

applications/poisson_dg/poisson_dg.mini

@@ -2,6 +2,7 @@ __name = app_poisson_dg_{__exec_suffix}
 __exec_suffix = deg{formcompiler.ufl_variants.degree}_{opcount_suffix}_level{formcompiler.instrumentation_level}
 
 opcount_suffix = opcount, nonopcount | expand opcount
+{opcount_suffix} == opcount and {formcompiler.instrumentation_level} != 2 | exclude
 
 # Calculate the size of the grid to equlibritate it to 100 MB/rank
 # Input parameters

python/dune/perftool/generation/cpp.py

@@ -42,9 +42,7 @@ def constructor_parameter(_type, name):
 
 @generator_factory(item_tags=("dump_timers",))
 def dump_accumulate_timer(name):
-    from dune.perftool.pdelab.localoperator import (name_time_dumper_os,
-                                                    name_time_dumper_reset,
-                                                    name_time_dumper_exec,)
+    from dune.perftool.pdelab.localoperator import name_time_dumper_os
     os = name_time_dumper_os()
     # reset = name_time_dumper_reset()
     reset = 'false'

python/dune/perftool/pdelab/driver.py

@@ -1427,7 +1427,7 @@ def setup_timer():
 @preamble
 def define_timing_identifier(name):
     ini = name_initree()
-    return "auto {} = {}.get<std::string>(\"identifier\", argv[0]);".format(name, ini)
+    return "auto {} = {}.get<char*>(\"identifier\", argv[0]);".format(name, ini)
 
 
 def name_timing_identifier():

python/dune/perftool/pdelab/localoperator.py

@@ -530,8 +530,8 @@ def name_time_dumper_reset():
     return "reset"
 
 
-def name_time_dumper_exec():
-    return "exec"
+def name_time_dumper_ident():
+    return "ident"
 
 
 @generator_factory(item_tags=("cached",), cache_key_generator=lambda **kw: None)
@@ -543,12 +543,12 @@ class TimerMethod(ClassMember):
     def __init__(self):
         os = name_time_dumper_os()
         reset = name_time_dumper_reset()
-        ex = name_time_dumper_exec()
+        ident = name_time_dumper_ident()
         knl = name_example_kernel()
         assert(knl is not None)
 
         content = ["template <typename Stream>",
-                   "void dump_timers(Stream& {}, char* {}, bool {})".format(os, ex, reset),
+                   "void dump_timers(Stream& {}, char* {}, bool {})".format(os, ident, reset),
                    "{"]
         dump_timers = [i for i in retrieve_cache_items(condition='dump_timers')]
         content.extend(map(lambda x: '  ' + x, dump_timers))