Limit Sylvan threads to 1 on Apple Silicon

volkm · Sep 4, 2024 · 330e2c9 · 330e2c9
1 parent ef92a81
commit 330e2c9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/storm/settings/modules/SylvanSettings.cpp b/src/storm/settings/modules/SylvanSettings.cpp
@@ -47,13 +47,22 @@ uint_fast64_t SylvanSettings::getNumberOfThreads() const {
         }
     }
     // Automatic detection
+#ifdef APPLE_SILICON
+    // Prevents issues with multi-threaded execution on Apple Silicon
+    return 1u;
+#else
     return std::max(1u, storm::utility::getNumberOfThreads());
+#endif
 }
 
 bool SylvanSettings::check() const {
     if (isNumberOfThreadsSet()) {
         auto const autoDetectThreads = std::max(1u, storm::utility::getNumberOfThreads());
         auto const numberFromSettings = getNumberOfThreads();
+#ifdef APPLE_SILICON
+        STORM_LOG_WARN_COND(numberFromSettings <= 1,
+                            "Sylvan does not properly work for multiple threads on Apple Silicon. We recommend limiting the number of threads to 1.");
+#endif
         STORM_LOG_WARN_COND(numberFromSettings <= autoDetectThreads, "Setting the number of sylvan threads to "
                                                                          << numberFromSettings << " which exceeds the recommended number for your system ("
                                                                          << autoDetectThreads << ").");

diff --git a/src/storm/utility/OsDetection.h b/src/storm/utility/OsDetection.h
@@ -16,6 +16,9 @@
 #define MACOS
 #define NOEXCEPT noexcept
 #define _DARWIN_USE_64_BIT_INODE
+#ifdef __arm64__
+#define APPLE_SILICON
+#endif
 #include <cxxabi.h>    // Required by ErrorHandling.h
 #include <execinfo.h>  // Required by ErrorHandling.h
 #include <sys/mman.h>