Merged tictoc.hpp into util.hpp

ddemidov · Jun 5, 2014 · 291c935 · 291c935
1 parent a5800b8
commit 291c935
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 58 deletions.
diff --git a/amgcl/amgcl.hpp b/amgcl/amgcl.hpp
@@ -44,7 +44,7 @@ THE SOFTWARE.
 
 #include <amgcl/backend/builtin.hpp>
 #include <amgcl/relaxation/interface.hpp>
-#include <amgcl/tictoc.hpp>
+#include <amgcl/util.hpp>
 
 namespace amgcl {
 

diff --git a/amgcl/coarsening/aggregation.hpp b/amgcl/coarsening/aggregation.hpp
@@ -38,7 +38,7 @@ THE SOFTWARE.
 
 #include <amgcl/backend/builtin.hpp>
 #include <amgcl/coarsening/detail/scaled_galerkin.hpp>
-#include <amgcl/tictoc.hpp>
+#include <amgcl/util.hpp>
 
 namespace amgcl {
 namespace coarsening {

diff --git a/amgcl/coarsening/smoothed_aggregation.hpp b/amgcl/coarsening/smoothed_aggregation.hpp
@@ -40,7 +40,7 @@ THE SOFTWARE.
 
 #include <amgcl/backend/builtin.hpp>
 #include <amgcl/coarsening/detail/galerkin.hpp>
-#include <amgcl/tictoc.hpp>
+#include <amgcl/util.hpp>
 
 namespace amgcl {
 namespace coarsening {

diff --git a/amgcl/tictoc.hpp b/amgcl/tictoc.hpp
diff --git a/amgcl/util.hpp b/amgcl/util.hpp
@@ -33,6 +33,30 @@ THE SOFTWARE.
 
 #include <stdexcept>
 
+
+/* Performance measurement macros
+ *
+ * If AMGCL_PROFILING macro is defined at compilation, then TIC(name) and
+ * TOC(name) macros correspond to prof.tic(name) and prof.toc(name).
+ * amgcl::prof should be an instance of amgcl::profiler<> defined in a user
+ * code similar to:
+ * \code
+ * namespace amgcl { profiler<> prof; }
+ * \endcode
+ * If AMGCL_PROFILING is undefined, then TIC and TOC are noop macros.
+ */
+#ifdef AMGCL_PROFILING
+#  include <amgcl/profiler.hpp>
+#  define TIC(name) amgcl::prof.tic(name);
+#  define TOC(name) amgcl::prof.toc(name);
+namespace amgcl {
+extern profiler<> prof;
+}
+#else
+#  define TIC(name)
+#  define TOC(name)
+#endif
+
 #define AMGCL_DEBUG_SHOW(x)                                                    \
     std::cout << std::setw(20) << #x << ": "                                   \
               << std::setw(15) << std::setprecision(8) << std::scientific      \