From 4a44ad9f6abd1125e207e40fe30b71ab4167f2ec Mon Sep 17 00:00:00 2001
From: FritzFlorian <flo.fritz@t-online.de>
Date: Thu, 30 Jan 2020 14:27:04 +0100
Subject: [PATCH] WIP: temporally fix cmake issues with export tangets.

Older CMAKE versions wont work with export targets in different directories. For now we simply add the context_switcher manually to the export target of pls.
---
 app/benchmark_fft/main.cpp          |  2 +-
 cmake/SetupThreadSanitizer.cmake    |  8 ++++----
 lib/context_switcher/CMakeLists.txt | 18 +++++++++++++++++-
 lib/pls/CMakeLists.txt              | 67 +++++++++++++++++++------------------------------------------------
 4 files changed, 41 insertions(+), 54 deletions(-)

diff --git a/app/benchmark_fft/main.cpp b/app/benchmark_fft/main.cpp
index d6ffd78..73c9a1f 100644
--- a/app/benchmark_fft/main.cpp
+++ b/app/benchmark_fft/main.cpp
@@ -37,7 +37,7 @@ void conquer(fft::complex_vector::iterator data, int n) {
 
 constexpr int MAX_NUM_THREADS = 8;
 constexpr int MAX_NUM_TASKS = 32;
-constexpr int MAX_STACK_SIZE = 1024 * 8;
+constexpr int MAX_STACK_SIZE = 1024 * 1;
 
 static_scheduler_memory<MAX_NUM_THREADS,
                         MAX_NUM_TASKS,
diff --git a/cmake/SetupThreadSanitizer.cmake b/cmake/SetupThreadSanitizer.cmake
index e833aa0..9d9cc92 100644
--- a/cmake/SetupThreadSanitizer.cmake
+++ b/cmake/SetupThreadSanitizer.cmake
@@ -3,8 +3,8 @@
 
 # Add optional sanitizer, off by default
 option(THREAD_SANITIZER "Add thread sanitizer" OFF)
-if(THREAD_SANITIZER)
-    add_compile_options(-fsanitize=thread -g)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
-endif()
+if (THREAD_SANITIZER)
+    add_compile_options(-fsanitize=thread -g -fno-omit-frame-pointer)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
+endif ()
 message("-- Thread Sanitizer: ${THREAD_SANITIZER}")
diff --git a/lib/context_switcher/CMakeLists.txt b/lib/context_switcher/CMakeLists.txt
index b1c6663..0b4ef63 100644
--- a/lib/context_switcher/CMakeLists.txt
+++ b/lib/context_switcher/CMakeLists.txt
@@ -20,7 +20,10 @@ message("-- Context Switcher: ${CMAKE_SYSTEM_PROCESSOR} running ${CMAKE_SYSTEM_N
 
 add_library(context_switcher STATIC
         ${CONTEXT_SWITCH_ASSEMBLY}
-        include/context_switcher/context_switcher.h src/context_switcher.cpp include/context_switcher/assembly_bindings.h include/context_switcher/continuation.h include/context_switcher/lambda_capture.h)
+        include/context_switcher/context_switcher.h src/context_switcher.cpp
+        include/context_switcher/assembly_bindings.h
+        include/context_switcher/continuation.h
+        include/context_switcher/lambda_capture.h)
 
 # Add everything in `./include` to be in the include path of this project
 target_include_directories(context_switcher
@@ -31,3 +34,16 @@ target_include_directories(context_switcher
         ${CMAKE_CURRENT_SOURCE_DIR}/src
         )
 
+# Installation on the system (we pack the context switcher with pls for now...)
+INSTALL(TARGETS context_switcher
+        EXPORT pls-targets
+        LIBRARY DESTINATION lib/context_switcher
+        ARCHIVE DESTINATION lib/context_switcher
+        )
+# ...all headers in `include`
+INSTALL(
+        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/pls
+        DESTINATION include
+        FILES_MATCHING PATTERN "*.h*"
+)
+
diff --git a/lib/pls/CMakeLists.txt b/lib/pls/CMakeLists.txt
index a77eb72..e120f2e 100644
--- a/lib/pls/CMakeLists.txt
+++ b/lib/pls/CMakeLists.txt
@@ -1,30 +1,5 @@
 # List all required files here (cmake best practice to NOT automate this step!)
 add_library(pls STATIC
-        #        include/pls/pls.h src/pls.cpp
-        #
-        #        include/pls/algorithms/invoke.h
-        #        include/pls/algorithms/invoke_impl.h
-        #        include/pls/algorithms/for_each.h
-        #        include/pls/algorithms/for_each_impl.h
-        #        include/pls/algorithms/scan.h
-        #        include/pls/algorithms/scan_impl.h
-        #
-        #        include/pls/dataflow/dataflow.h
-        #        include/pls/dataflow/internal/inputs.h
-        #        include/pls/dataflow/internal/outputs.h
-        #        include/pls/dataflow/internal/token.h
-        #        include/pls/dataflow/internal/in_port.h
-        #        include/pls/dataflow/internal/out_port.h
-        #        include/pls/dataflow/internal/function_node.h
-        #        include/pls/dataflow/internal/node.h
-        #        include/pls/dataflow/internal/graph.h
-        #        include/pls/dataflow/internal/build_state.h
-        #        include/pls/dataflow/internal/function_node_impl.h
-        #        include/pls/dataflow/internal/graph_impl.h
-        #        include/pls/dataflow/internal/switch_node.h
-        #        include/pls/dataflow/internal/merge_node.h
-        #        include/pls/dataflow/internal/split_node.h
-
         include/pls/internal/base/spin_lock.h
         include/pls/internal/base/tas_spin_lock.h src/internal/base/tas_spin_lock.cpp
         include/pls/internal/base/ttas_spin_lock.h src/internal/base/ttas_spin_lock.cpp
@@ -67,6 +42,13 @@ add_library(pls STATIC
         include/pls/internal/scheduling/heap_scheduler_memory.h
         src/internal/scheduling/task_manager.cpp)
 
+# Dependencies for pls
+target_link_libraries(pls Threads::Threads)
+target_link_libraries(pls context_switcher)
+if (EASY_PROFILER)
+    target_link_libraries(pls easy_profiler)
+endif ()
+
 # Add everything in `./include` to be in the include path of this project
 target_include_directories(pls
         PUBLIC
@@ -76,23 +58,19 @@ target_include_directories(pls
         ${CMAKE_CURRENT_SOURCE_DIR}/src # TODO: Set this up when we require private headers
         )
 
-# Add cmake dependencies here if needed
-target_link_libraries(pls
-        Threads::Threads # pthread support
-        context_switcher # coroutine support
-        )
-if (EASY_PROFILER)
-    target_link_libraries(pls easy_profiler)
-endif ()
+# Enable warnings/tidy code checking from our compiler
+target_compile_options(pls PRIVATE
+        $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+        -Wall>
+        $<$<CXX_COMPILER_ID:MSVC>:
+        -W4>)
 
-# Rules for istalling the library on a system
+# Rules for installing the library on a system
 # ...binaries
-INSTALL(TARGETS pls context_switcher
+INSTALL(TARGETS pls
         EXPORT pls-targets
-        LIBRARY
-        DESTINATION lib/pls
-        ARCHIVE
-        DESTINATION lib/pls
+        LIBRARY DESTINATION lib/pls
+        ARCHIVE DESTINATION lib/pls
         )
 # ...all headers in `include`
 INSTALL(
@@ -111,17 +89,10 @@ INSTALl(
         FILES pls-config.cmake
         DESTINATION lib/pls
 )
-# ...add a custom target that will only build the library when istalling.
+# ...add a custom target that will only build the library when installing.
 # This can allow us to speed up the installation on embedded devices.
 ADD_CUSTOM_TARGET(install.pls
         ${CMAKE_COMMAND}
         -DBUILD_TYPE=${CMAKE_BUILD_TYPE}
         -P ${CMAKE_BINARY_DIR}/cmake_install.cmake)
-ADD_DEPENDENCIES(install.pls pls)
-
-# Enable warnings/tidy code checking from our compiler
-target_compile_options(pls PRIVATE
-        $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
-        -Wall>
-        $<$<CXX_COMPILER_ID:MSVC>:
-        -W4>)
+ADD_DEPENDENCIES(install.pls context_switcher pls)
--
libgit2 0.26.0