Adapt to using dune-opcounter

Simple test passes already

dune.module

@@ -8,3 +8,4 @@ Version: 0.0
 Maintainer: dominic.kempf@iwr.uni-heidelberg.de
 #depending on
 Depends: dune-testtools dune-pdelab dune-alugrid
+Suggests: dune-opcounter

dune/perftool/common/CMakeLists.txt

 install(FILES muladd_workarounds.hh
-              opcounter.hh
               timer.hh
+              timer_tsc.hh
+              timer_chrono.hh
               tsc.hh
               vectorclass.hh
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/perftool/common

dune/perftool/common/timer_chrono.hh

@@ -7,7 +7,7 @@
 
 #include <chrono>
 
-#include <dune/perftool/common/opcounter.hh>
+#include <dune/opcounter/opcounter.hh>
 
 #define HP_TIMER_OPCOUNTER oc::OpCounter<double>
 

dune/perftool/common/timer_tsc.hh

@@ -6,7 +6,7 @@
 #endif
 
 #include <dune/perftool/common/tsc.hh>
-#include <dune/perftool/common/opcounter.hh>
+#include <dune/opcounter/opcounter.hh>
 
 #define HP_TIMER_DURATION(name) __hp_timer_##name##_duration
 #define HP_TIMER_STARTTIME(name) __hp_timer_##name##_start
@@ -76,16 +76,22 @@
 #ifdef ENABLE_COUNTER
 
 #define DUMP_TIMER(level,name,os,reset)\
-  if (HP_TIMER_DURATION(name) > 1e-12) \
-    os << #level << " " << ident << " " << #name << " time " << Dune::PDELab::TSC::seconds(HP_TIMER_DURATION(name)) << std::endl; \
-  HP_TIMER_OPCOUNTERS(name).reportOperations(os,#level,ident,#name,reset);
+  { \
+    std::string prefix = std::string(#level) + " " + ident + " " + std::string(#name); \
+    if (HP_TIMER_DURATION(name) > 1e-12) \
+      os << prefix << " time " << Dune::PDELab::TSC::seconds(HP_TIMER_DURATION(name)) << std::endl; \
+    HP_TIMER_OPCOUNTERS(name).reportOperations(os,prefix,reset); \
+  }
 
 #define DUMP_AND_ACCUMULATE_TIMER(level,name,os,reset,time,ops)  \
-  if (HP_TIMER_DURATION(name) > 1e-12) \
-    os << #level << " " << ident << " " << #name << " time " << Dune::PDELab::TSC::seconds(HP_TIMER_DURATION(name)) << std::endl; \
-  time += HP_TIMER_DURATION(name); \
-  ops += HP_TIMER_OPCOUNTERS(name); \
-  HP_TIMER_OPCOUNTERS(name).reportOperations(os,#level,ident,#name,reset);
+  { \
+    std::string prefix = std::string(#level) + " " + ident + " " + std::string(#name); \
+    if (HP_TIMER_DURATION(name) > 1e-12) \
+      os << prefix << " time " << Dune::PDELab::TSC::seconds(HP_TIMER_DURATION(name)) << std::endl; \
+    time += HP_TIMER_DURATION(name); \
+    ops += HP_TIMER_OPCOUNTERS(name); \
+    HP_TIMER_OPCOUNTERS(name).reportOperations(os,prefix,reset); \
+  }
 
 #elif defined ENABLE_HP_TIMERS
 

python/dune/perftool/loopy/target.py

@@ -30,7 +30,8 @@ import cgen
 
 
 def _type_to_op_counter_type(name):
-    return "oc::OpCounter<{}>".format(name)
+    include_file("dune/opcounter/opcounter.hh")
+    return "Dune::OpCounter::OpCounter<{}>".format(name)
 
 
 def dtype_floatingpoint():