__has_feature(thread_sanitizer) and __SANITIZE_THREAD__ catch clang and gcc

Author: galabovaa

BUILD.bazel

@@ -73,6 +73,26 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "highs-runtime-opts",
+    hdrs = ["app/HighsRuntimeOptions.h",
+            "app/CLI11.hpp"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//:highs",
+    ],
+)
+
+cc_binary(
+    name = "highs-bin",
+    srcs = ["app/RunHighs.cpp"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//:highs",
+        "//:highs-runtime-opts",
+    ],
+)
+
 cc_binary(
     name = "call-highs-example",
     srcs = ["examples/call_highs_from_cpp.cpp"],

CMakeLists.txt

@@ -126,7 +126,6 @@ option(HIGHS_COVERAGE "Activate the code coverage compilation" OFF)
 # Only Debug is theted atm 
 # See below for RelWithDeb info, todo test wip
 set(DEBUG_MEMORY "Off" CACHE STRING "Sanitizers")
-option(SANITIZE_THREAD "TSAN" OFF)
 
 # emscripten
 option(EMSCRIPTEN_HTML "Emscripten HTML output" OFF)

highs/HConfig.h.in

@@ -13,7 +13,6 @@
 #cmakedefine HIGHS_HAVE_MM_PAUSE
 #cmakedefine HIGHS_HAVE_BUILTIN_CLZ
 #cmakedefine HIGHS_HAVE_BITSCAN_REVERSE
-#cmakedefine SANITIZE_THREAD
 
 #define HIGHS_GITHASH "@GITHASH@"
 #define HIGHS_VERSION_MAJOR @HIGHS_VERSION_MAJOR@

highs/parallel/HighsTaskExecutor.h

@@ -28,14 +28,16 @@
 #include "util/HighsInt.h"
 #include "util/HighsRandom.h"
 
-#if defined(SANITIZE_THREAD)
-#define TSAN_ENABLED
-#elif defined(__has_feature) 
+#ifdef __has_feature
 #if __has_feature(thread_sanitizer)
 #define TSAN_ENABLED
 #endif
 #endif
 
+#ifdef __SANITIZE_THREAD__
+#define TSAN_ENABLED
+#endif
+
 #ifdef TSAN_ENABLED
 #define TSAN_ANNOTATE_HAPPENS_BEFORE(addr) \
     AnnotateHappensBefore(__FILE__, __LINE__, (void*)(addr))
@@ -144,10 +146,21 @@ class HighsTaskExecutor {
 
     workerDeques.resize(numThreads);
     workerBunk = cache_aligned::make_shared<HighsSplitDeque::WorkerBunk>();
+#ifdef __has_feature
+std::cout << "__has_feature is ON" << std::endl;
+#else
+std::cout << "__has_feature is OFF" << std::endl;
+#endif
+#ifdef TSAN_ENABLED
+std::cout << "TSAN is ON" << std::endl;
+#else
+std::cout << "TSAN is OFF" << std::endl;
+#endif
     for (int i = 0; i < numThreads; ++i) {
       workerDeques[i] = cache_aligned::make_unique<HighsSplitDeque>(
           workerBunk, workerDeques.data(), i, numThreads);
 
+
       // TSAN_ANNOTATE_HAPPENS_AFTER(&workerBunk);
     }