Set NTHREADS to utils_get_num_cores() at minimum

Set NTHREADS to utils_get_num_cores() at minimum
and rename NTHREADS to numThreads.

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

test/ipcFixtures.hpp

@@ -93,6 +93,7 @@ struct umfIpcTest : umf_test::test,
         providerParamsDestroy = provider_params_destroy;
         memAccessor = accessor;
         openedIpcCacheSize = getOpenedIpcCacheSize();
+        numThreads = std::max(10, (int)utils_get_num_cores());
     }
 
     void TearDown() override { test::TearDown(); }
@@ -162,7 +163,7 @@ struct umfIpcTest : umf_test::test,
               closeCount(0) {}
     };
 
-    static constexpr int NTHREADS = 10;
+    unsigned int numThreads;
     stats_type stat;
     MemoryAccessor *memAccessor = nullptr;
 
@@ -188,9 +189,9 @@ struct umfIpcTest : umf_test::test,
             ptrs.push_back(ptr);
         }
 
-        std::array<std::vector<umf_ipc_handle_t>, NTHREADS> ipcHandles;
+        std::vector<std::vector<umf_ipc_handle_t>> ipcHandles(numThreads);
 
-        umf_test::syncthreads_barrier syncthreads(NTHREADS);
+        umf_test::syncthreads_barrier syncthreads(numThreads);
 
         auto getHandlesFn = [shuffle, &ipcHandles, &ptrs,
                              &syncthreads](size_t tid) {
@@ -212,7 +213,7 @@ struct umfIpcTest : umf_test::test,
             }
         };
 
-        umf_test::parallel_exec(NTHREADS, getHandlesFn);
+        umf_test::parallel_exec(numThreads, getHandlesFn);
 
         auto putHandlesFn = [&ipcHandles, &syncthreads](size_t tid) {
             syncthreads();
@@ -222,7 +223,7 @@ struct umfIpcTest : umf_test::test,
             }
         };
 
-        umf_test::parallel_exec(NTHREADS, putHandlesFn);
+        umf_test::parallel_exec(numThreads, putHandlesFn);
 
         for (void *ptr : ptrs) {
             umf_result_t ret = umfPoolFree(pool.get(), ptr);
@@ -246,7 +247,7 @@ struct umfIpcTest : umf_test::test,
             ptrs.push_back(ptr);
         }
 
-        umf_test::syncthreads_barrier syncthreads(NTHREADS);
+        umf_test::syncthreads_barrier syncthreads(numThreads);
 
         auto getPutHandlesFn = [shuffle, &ptrs, &syncthreads](size_t) {
             // Each thread gets a copy of the pointers to shuffle them
@@ -268,7 +269,7 @@ struct umfIpcTest : umf_test::test,
             }
         };
 
-        umf_test::parallel_exec(NTHREADS, getPutHandlesFn);
+        umf_test::parallel_exec(numThreads, getPutHandlesFn);
 
         for (void *ptr : ptrs) {
             umf_result_t ret = umfPoolFree(pool.get(), ptr);
@@ -302,13 +303,13 @@ struct umfIpcTest : umf_test::test,
             ipcHandles.push_back(ipcHandle);
         }
 
-        std::array<std::vector<void *>, NTHREADS> openedIpcHandles;
+        std::vector<std::vector<umf_ipc_handle_t>> openedIpcHandles(numThreads);
         umf_ipc_handler_handle_t ipcHandler = nullptr;
         ret = umfPoolGetIPCHandler(pool.get(), &ipcHandler);
         ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
         ASSERT_NE(ipcHandler, nullptr);
 
-        umf_test::syncthreads_barrier syncthreads(NTHREADS);
+        umf_test::syncthreads_barrier syncthreads(numThreads);
 
         auto openHandlesFn = [shuffle, &ipcHandles, &openedIpcHandles,
                               &syncthreads, ipcHandler](size_t tid) {
@@ -325,11 +326,11 @@ struct umfIpcTest : umf_test::test,
                 umf_result_t ret =
                     umfOpenIPCHandle(ipcHandler, ipcHandle, &ptr);
                 ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
-                openedIpcHandles[tid].push_back(ptr);
+                openedIpcHandles[tid].push_back((umf_ipc_data_t *)ptr);
             }
         };
 
-        umf_test::parallel_exec(NTHREADS, openHandlesFn);
+        umf_test::parallel_exec(numThreads, openHandlesFn);
 
         auto closeHandlesFn = [&openedIpcHandles, &syncthreads](size_t tid) {
             syncthreads();
@@ -339,7 +340,7 @@ struct umfIpcTest : umf_test::test,
             }
         };
 
-        umf_test::parallel_exec(NTHREADS, closeHandlesFn);
+        umf_test::parallel_exec(numThreads, closeHandlesFn);
 
         for (auto ipcHandle : ipcHandles) {
             ret = umfPutIPCHandle(ipcHandle);
@@ -386,7 +387,7 @@ struct umfIpcTest : umf_test::test,
         ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
         ASSERT_NE(ipcHandler, nullptr);
 
-        umf_test::syncthreads_barrier syncthreads(NTHREADS);
+        umf_test::syncthreads_barrier syncthreads(numThreads);
 
         auto openCloseHandlesFn = [shuffle, &ipcHandles, &syncthreads,
                                    ipcHandler](size_t) {
@@ -408,7 +409,7 @@ struct umfIpcTest : umf_test::test,
             }
         };
 
-        umf_test::parallel_exec(NTHREADS, openCloseHandlesFn);
+        umf_test::parallel_exec(numThreads, openCloseHandlesFn);
 
         for (auto ipcHandle : ipcHandles) {
             ret = umfPutIPCHandle(ipcHandle);

test/poolFixtures.hpp

@@ -5,6 +5,7 @@
 #ifndef UMF_TEST_POOL_FIXTURES_HPP
 #define UMF_TEST_POOL_FIXTURES_HPP 1
 
+#include <algorithm>
 #include <array>
 #include <cstring>
 #include <functional>
@@ -83,13 +84,15 @@ struct umfPoolTest : umf_test::test,
         test::SetUp();
 
         pool = poolCreateExtUnique(this->GetParam());
+#undef max
+        numThreads = std::max(5, (int)utils_get_num_cores());
     }
 
     void TearDown() override { test::TearDown(); }
 
     umf_test::pool_unique_handle_t pool;
 
-    static constexpr int NTHREADS = 5;
+    int numThreads;
     static constexpr std::array<int, 7> nonAlignedAllocSizes = {5,  7,   23, 55,
                                                                 80, 119, 247};
 };
@@ -282,7 +285,7 @@ TEST_P(umfPoolTest, multiThreadedMallocFree) {
     };
 
     std::vector<std::thread> threads;
-    for (int i = 0; i < NTHREADS; i++) {
+    for (int i = 0; i < numThreads; i++) {
         threads.emplace_back(poolMalloc, allocSize, pool.get());
     }
 
@@ -301,7 +304,7 @@ TEST_P(umfPoolTest, multiThreadedpow2AlignedAlloc) {
     };
 
     std::vector<std::thread> threads;
-    for (int i = 0; i < NTHREADS; i++) {
+    for (int i = 0; i < numThreads; i++) {
         threads.emplace_back(poolpow2AlignedAlloc, pool.get());
     }
 
@@ -336,7 +339,7 @@ TEST_P(umfPoolTest, multiThreadedReallocFree) {
     };
 
     std::vector<std::thread> threads;
-    for (int i = 0; i < NTHREADS; i++) {
+    for (int i = 0; i < numThreads; i++) {
         threads.emplace_back(poolRealloc, allocSize, multiplier, pool.get());
     }
 
@@ -367,7 +370,7 @@ TEST_P(umfPoolTest, multiThreadedCallocFree) {
     };
 
     std::vector<std::thread> threads;
-    for (int i = 0; i < NTHREADS; i++) {
+    for (int i = 0; i < numThreads; i++) {
         threads.emplace_back(poolCalloc, num, sizeof(int), pool.get());
     }
 
@@ -393,7 +396,7 @@ TEST_P(umfPoolTest, multiThreadedMallocFreeRandomSizes) {
     };
 
     std::vector<std::thread> threads;
-    for (int i = 0; i < NTHREADS; i++) {
+    for (int i = 0; i < numThreads; i++) {
         threads.emplace_back(poolMalloc, (rand() % 16) * 8, pool.get());
     }
 

test/test_base_alloc.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 */
 
+#include <algorithm>
 #include <cstdio>
 #include <cstdlib>
 #include <thread>
@@ -17,9 +18,9 @@
 using umf_test::test;
 
 TEST_F(test, baseAllocMultiThreadedAllocMemset) {
-    static constexpr int NTHREADS = 10;
     static constexpr int ITERATIONS = 1000;
     static constexpr int ALLOCATION_SIZE = 16;
+    int numThreads = std::max(10, (int)utils_get_num_cores());
 
     auto pool = std::shared_ptr<umf_ba_pool_t>(umf_ba_create(ALLOCATION_SIZE),
                                                umf_ba_destroy);
@@ -43,7 +44,7 @@ TEST_F(test, baseAllocMultiThreadedAllocMemset) {
     };
 
     std::vector<std::thread> threads;
-    for (int i = 0; i < NTHREADS; i++) {
+    for (int i = 0; i < numThreads; i++) {
         threads.emplace_back(poolAlloc, i, pool.get());
     }
 

test/test_base_alloc_linear.cpp

@@ -5,6 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 */
 
+#include <algorithm>
 #include <cstdio>
 #include <cstdlib>
 #include <thread>
@@ -50,9 +51,9 @@ TEST_F(test, baseAllocLinearPoolContainsPointer) {
 }
 
 TEST_F(test, baseAllocLinearMultiThreadedAllocMemset) {
-    static constexpr int NTHREADS = 10;
     static constexpr int ITERATIONS = 1000;
     static constexpr int MAX_ALLOCATION_SIZE = 1024;
+    int numThreads = std::max(10, (int)utils_get_num_cores());
 
     srand(0);
 
@@ -94,7 +95,7 @@ TEST_F(test, baseAllocLinearMultiThreadedAllocMemset) {
     };
 
     std::vector<std::thread> threads;
-    for (int i = 0; i < NTHREADS; i++) {
+    for (int i = 0; i < numThreads; i++) {
         threads.emplace_back(poolAlloc, i, pool.get());
     }