rename public headers (#17)

* rename multi_tracer_t to simple_log_tracer_t

* new include :: <tracer/simple_log>

* new include :: <tracer/simple_thread>

* new include :: <tracer/thread_log>

* fix include

* #include <mutex>

* #include <tracer/simple>

* remove old headers

* mv

* stdtracer_macros.hpp

* config

* cleanup example

* cleanup

* #include <tracer/cuda>

* fix benchmarks

* #include <tracer/disable>

* #define DEFINE_TRACE_CONTEXTS

* snprintf

* rename

Author: lgarithm

CMakeLists.txt

@@ -5,16 +5,12 @@ SET(CMAKE_CXX_STANDARD 14)
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
-# Targets
-ADD_LIBRARY(stdtracer src/tracer.cpp)
-TARGET_INCLUDE_DIRECTORIES(stdtracer PRIVATE ${CMAKE_SOURCE_DIR}/include)
-
-INSTALL(TARGETS stdtracer ARCHIVE DESTINATION lib)
 INSTALL(DIRECTORY include DESTINATION .)
 
-OPTION(BUILD_TESTS "Build tests." OFF)
 OPTION(BUILD_BENCHMARKS "Build benchmarks." OFF)
+OPTION(BUILD_CUDA_EXAMPLES "Build cuda examples." OFF)
 OPTION(BUILD_EXAMPLES "Build examples." OFF)
+OPTION(BUILD_TESTS "Build tests." OFF)
 
 IF(BUILD_TESTS)
     ENABLE_TESTING()
@@ -28,5 +24,8 @@ ENDIF()
 IF(BUILD_EXAMPLES)
     INCLUDE(cmake/examples.cmake)
 ENDIF()
+IF(BUILD_CUDA_EXAMPLES)
+    INCLUDE(cmake/cuda_examples.cmake)
+ENDIF()
 
 INCLUDE(cmake/package.cmake)

INSTALL

@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if [ -z $PREFIX ]; then
+    PREFIX=$HOME/local
+fi
+
+./configure --prefix=$PREFIX
+
+make install

cmake/benchmarks.cmake

@@ -1,20 +1,17 @@
 INCLUDE(ExternalProject)
 
-SET(GBENCH_GIT_URL https://github.com/google/benchmark.git
+SET(GBENCH_GIT_URL
+    https://github.com/google/benchmark.git
     CACHE STRING "URL for clone google benchmark")
 
 SET(PREFIX ${CMAKE_SOURCE_DIR}/3rdparty)
 
-EXTERNALPROJECT_ADD(gbench-repo
-                    GIT_REPOSITORY
-                    ${GBENCH_GIT_URL}
-                    PREFIX
-                    ${PREFIX}
-                    CMAKE_ARGS
-                    -DCMAKE_INSTALL_PREFIX=${PREFIX}
-                    -DCMAKE_BUILD_TYPE=Release
-                    -DCMAKE_CXX_FLAGS=-std=c++11
-                    -DBENCHMARK_ENABLE_TESTING=0)
+EXTERNALPROJECT_ADD(
+    gbench-repo
+    GIT_REPOSITORY ${GBENCH_GIT_URL}
+    PREFIX ${PREFIX}
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_BUILD_TYPE=Release
+               -DCMAKE_CXX_FLAGS=-std=c++11 -DBENCHMARK_ENABLE_TESTING=0)
 
 LINK_DIRECTORIES(${PREFIX}/lib)
 
@@ -26,16 +23,13 @@ FUNCTION(ADD_BENCH target)
     TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${PREFIX}/include)
     TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${CMAKE_SOURCE_DIR}/include)
     TARGET_LINK_LIBRARIES(${target} benchmark benchmark_main Threads::Threads)
-    ADD_DEPENDENCIES(${target} gbench-repo stdtracer)
+    ADD_DEPENDENCIES(${target} gbench-repo)
     ADD_DEPENDENCIES(benchmarks ${target})
 ENDFUNCTION()
 
 FILE(GLOB benches tests/bench_*.cpp)
 FOREACH(b ${benches})
     GET_FILENAME_COMPONENT(name ${b} NAME_WE)
-    STRING(REPLACE "_"
-                   "-"
-                   name
-                   ${name})
+    STRING(REPLACE "_" "-" name ${name})
     ADD_BENCH(${name} ${b})
 ENDFOREACH()

cmake/cuda_examples.cmake

@@ -0,0 +1,8 @@
+ENABLE_LANGUAGE(CUDA)
+
+FUNCTION(ADD_CUDA_EXAMPLE target)
+    ADD_EXECUTABLE(${target} ${ARGN})
+    TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${CMAKE_SOURCE_DIR}/include)
+ENDFUNCTION()
+
+ADD_CUDA_EXAMPLE(example-cuda examples/example_cuda.cu)

cmake/examples.cmake

@@ -3,14 +3,6 @@ FIND_PACKAGE(Threads)
 FUNCTION(ADD_TRACE_EXAMPLE target)
     ADD_EXECUTABLE(${target} ${ARGN})
     TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${CMAKE_SOURCE_DIR}/include)
-    TARGET_LINK_LIBRARIES(${target} stdtracer)
-    TARGET_LINK_LIBRARIES(${target} Threads::Threads)
-ENDFUNCTION()
-
-FUNCTION(ADD_TRACE_DISABLED_EXAMPLE target)
-    ADD_EXECUTABLE(${target} ${ARGN})
-    TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${CMAKE_SOURCE_DIR}/include)
-    TARGET_COMPILE_DEFINITIONS(${target} PRIVATE -DSTD_TRACER_DISABLE)
     TARGET_LINK_LIBRARIES(${target} Threads::Threads)
 ENDFUNCTION()
 
@@ -19,7 +11,6 @@ FOREACH(src ${examples})
     GET_FILENAME_COMPONENT(name ${src} NAME_WE)
     STRING(REPLACE "_" "-" name ${name})
     ADD_TRACE_EXAMPLE(${name} ${src})
-    ADD_TRACE_DISABLED_EXAMPLE(${name}-disabled ${src})
 ENDFOREACH()
 
 FUNCTION(ADD_ADVANCED_TRACE_EXAMPLE target)

cmake/tests.cmake

@@ -1,20 +1,18 @@
 INCLUDE(ExternalProject)
 
-SET(GTEST_GIT_URL https://github.com/google/googletest.git
+SET(GTEST_GIT_URL
+    https://github.com/google/googletest.git
     CACHE STRING "URL for clone gtest")
 
 SET(PREFIX ${CMAKE_SOURCE_DIR}/3rdparty)
 
-EXTERNALPROJECT_ADD(libgtest-dev
-                    GIT_REPOSITORY
-                    ${GTEST_GIT_URL}
-                    PREFIX
-                    ${PREFIX}
-                    CMAKE_ARGS
-                    -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/3rdparty
-                    -DCMAKE_CXX_FLAGS=-std=c++11
-                    -Dgtest_disable_pthreads=1
-                    -DBUILD_GMOCK=0)
+EXTERNALPROJECT_ADD(
+    libgtest-dev
+    GIT_REPOSITORY ${GTEST_GIT_URL}
+    PREFIX ${PREFIX}
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/3rdparty
+               -DCMAKE_CXX_FLAGS=-std=c++11 -Dgtest_disable_pthreads=1
+               -DBUILD_GMOCK=0)
 
 LINK_DIRECTORIES(${PREFIX}/lib)
 
@@ -23,16 +21,13 @@ FUNCTION(ADD_GTEST target)
     ADD_DEPENDENCIES(${target} libgtest-dev)
     TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${PREFIX}/include)
     TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${CMAKE_SOURCE_DIR}/include)
-    TARGET_LINK_LIBRARIES(${target} gtest stdtracer)
+    TARGET_LINK_LIBRARIES(${target} gtest)
     ADD_TEST(NAME ${target} COMMAND ${target})
 ENDFUNCTION()
 
 FILE(GLOB tests tests/test_*.cpp)
 FOREACH(t ${tests})
     GET_FILENAME_COMPONENT(name ${t} NAME_WE)
-    STRING(REPLACE "_"
-                   "-"
-                   name
-                   ${name})
+    STRING(REPLACE "_" "-" name ${name})
     ADD_GTEST(${name} ${t})
 ENDFOREACH()

configure

@@ -1,9 +1,11 @@
 #!/bin/bash
 set -e
 
-PREFIX=$(pwd)/local
+PREFIX=$PWD/local
+CUDA_HOME=/usr/local/cuda
 
 BUILD_EXAMPLES=0
+BUILD_CUDA_EXAMPLES=0
 BUILD_TESTS=0
 BUILD_BENCHMARKS=0
 VERBOSE=0
@@ -17,6 +19,9 @@ parse_args() {
         --examples)
             BUILD_EXAMPLES=1
             ;;
+        --cuda-examples)
+            BUILD_CUDA_EXAMPLES=1
+            ;;
         --tests)
             BUILD_TESTS=1
             ;;
@@ -47,10 +52,15 @@ add_cmake_flags() {
     add_cmake_flag CMAKE_EXPORT_COMPILE_COMMANDS ${VERBOSE}
     add_cmake_flag CMAKE_VERBOSE_MAKEFILE ${VERBOSE}
 
+    add_cmake_flag BUILD_BENCHMARKS ${BUILD_BENCHMARKS}
+    add_cmake_flag BUILD_CUDA_EXAMPLES ${BUILD_CUDA_EXAMPLES}
     add_cmake_flag BUILD_EXAMPLES ${BUILD_EXAMPLES}
     add_cmake_flag BUILD_TESTS ${BUILD_TESTS}
-    add_cmake_flag BUILD_BENCHMARKS ${BUILD_BENCHMARKS}
 
+    if [ ${BUILD_CUDA_EXAMPLES} -eq 1 ]; then
+        add_cmake_flag CMAKE_CUDA_COMPILER $CUDA_HOME/bin/nvcc
+        add_cmake_flag CUDA_TOOLKIT_ROOT_DIR $CUDA_HOME
+    fi
     if [ ! -z ${GTEST_GIT_URL} ]; then
         add_cmake_flag GTEST_GIT_URL ${GTEST_GIT_URL}
     fi

examples/example_cuda.cu

@@ -0,0 +1,38 @@
+#include <iostream>
+#include <numeric>
+#include <vector>
+
+#include <cuda_runtime.h>
+
+#include <tracer/cuda>
+
+DEFINE_TRACE_CONTEXTS;
+
+template <typename R>
+__global__ void kern(R *x, int n)
+{
+    for (int i = 0; i < n; ++i) { x[i] = i; }
+}
+
+template <typename R = int>
+void f(int n)
+{
+    TRACE_SCOPE(__func__);
+    void *data;
+    cudaMalloc(&data, n * sizeof(R));
+    R *x = (R *)data;
+    kern<R><<<1, 1>>>(x, n);
+    std::vector<R> y(n);
+    cudaMemcpy(y.data(), data, n * sizeof(R), cudaMemcpyDeviceToHost);
+    cudaFree(data);
+
+    const R sum = std::accumulate(y.begin(), y.end(), 0);
+    std::cout << sum << std::endl;
+}
+
+int main()
+{
+    TRACE_SCOPE(__func__);
+    for (int i = 0; i < 10; ++i) { f((i + 1) * 1024); }
+    return 0;
+}

examples/example_simple.cpp

@@ -1,6 +1,8 @@
 #include <cstdio>
 
-#include <stdtracer>
+#include <tracer/simple>
+
+DEFINE_TRACE_CONTEXTS;
 
 int fibo(int n)
 {

examples/example_simple_log.cpp

@@ -0,0 +1,30 @@
+#include <tracer/simple_log>
+
+DEFINE_TRACE_CONTEXTS;  // must be defined exactly once in one executable
+
+int fibo(int n)
+{
+    // don't use in deep recursive function!
+    if (n < 2) { return 1; }
+    return fibo(n - 1) + fibo(n - 2);
+}
+
+void f(int n)
+{
+    TRACE_SCOPE(__func__);
+    int x = TRACE_EXPR(fibo(n));
+    printf("fibo(%d) = %d\n", n, x);
+}
+
+void g()
+{
+    TRACE_SCOPE(__func__);
+    for (int i = 0; i < 43; ++i) { TRACE_STMT(f(i)); }
+}
+
+int main()
+{
+    TRACE_SCOPE(__func__);
+    g();
+    return 0;
+}