libdispatch/tbb on linux

LuisaGroup · Dec 17, 2024 · 78501f2 · 78501f2
1 parent 042d6b7
commit 78501f2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/backends/fallback/CMakeLists.txt b/src/backends/fallback/CMakeLists.txt
@@ -33,14 +33,23 @@ if (LLVM_FOUND AND embree_FOUND)
     # exclude codegen from unity build since it's too big
     set_source_files_properties(fallback_codegen.cpp PROPERTIES UNITY_BUILD OFF)
 
-    # use TBB for parallel_for on non-Apple Unix systems if available
+    # use libdispatch or TBB for parallel_for on non-Apple Unix systems if available
     if (UNIX AND NOT APPLE)
-        find_package(TBB CONFIG)
-        if (TBB_FOUND)
-            target_compile_definitions(luisa-compute-backend-fallback PRIVATE LUISA_COMPUTE_ENABLE_TBB=1)
-            target_link_libraries(luisa-compute-backend-fallback PRIVATE TBB::tbb)
+        # libdispatch
+        find_library(DISPATCH_LIB dispatch)
+        find_path(DISPATCH_INCLUDE_DIR dispatch/dispatch.h)
+        if (DISPATCH_LIB AND DISPATCH_INCLUDE_DIR)
+            target_compile_definitions(luisa-compute-backend-fallback PRIVATE LUISA_COMPUTE_ENABLE_LIBDISPATCH=1)
+            target_link_libraries(luisa-compute-backend-fallback PRIVATE ${DISPATCH_LIB})
+            target_include_directories(luisa-compute-backend-fallback PRIVATE ${DISPATCH_INCLUDE_DIR})
         else ()
-            message(WARNING "TBB not found. Fallback backend will not use TBB. Performance may be affected.")
+            find_package(TBB CONFIG)
+            if (TBB_FOUND)
+                target_compile_definitions(luisa-compute-backend-fallback PRIVATE LUISA_COMPUTE_ENABLE_TBB=1)
+                target_link_libraries(luisa-compute-backend-fallback PRIVATE TBB::tbb)
+            else ()
+                message(WARNING "TBB and libdispatch not found. Performance of the fallback backend may be affected.")
+            endif ()
         endif ()
     endif ()
 

diff --git a/src/backends/fallback/fallback_command_queue.cpp b/src/backends/fallback/fallback_command_queue.cpp
@@ -152,7 +152,11 @@ void FallbackCommandQueue::enqueue_parallel(uint n, luisa::move_only_function<vo
     enqueue([this, n, task = std::move(task)]() mutable noexcept {
 #if defined(LUISA_FALLBACK_USE_DISPATCH_QUEUE)
         if (_dispatch_queue == nullptr) {
+#ifdef QOS_CLASS_USER_INTERACTIVE
             _dispatch_queue = dispatch_get_global_queue(QOS_CLASS_USER_INTERACTIVE, 0);
+#else
+            _dispatch_queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0);
+#endif
             dispatch_retain(_dispatch_queue);
         }
         dispatch_apply_f(n, _dispatch_queue, &task, [](void *context, size_t idx) noexcept {

diff --git a/src/backends/fallback/fallback_command_queue.h b/src/backends/fallback/fallback_command_queue.h
@@ -14,6 +14,9 @@
 #elif defined(LUISA_PLATFORM_WINDOWS)
 #define LUISA_FALLBACK_USE_PPL
 #include <ppl.h>
+#elif defined(LUISA_COMPUTE_ENABLE_LIBDISPATCH)
+#define LUISA_FALLBACK_USE_DISPATCH_QUEUE
+#include <dispatch/dispatch.h>
 #elif defined(LUISA_COMPUTE_ENABLE_TBB)
 #define LUISA_FALLBACK_USE_TBB
 #include <tbb/parallel_for.h>