Set NTHREADS to utils_get_num_cores() at minimum

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

Author: ldorau

test/ipcFixtures.hpp

@@ -93,6 +93,9 @@ struct umfIpcTest : umf_test::test,
         providerParamsDestroy = provider_params_destroy;
         memAccessor = accessor;
         openedIpcCacheSize = getOpenedIpcCacheSize();
+
+        int ncores = utils_get_num_cores();
+        NTHREADS = (ncores > 10) ? ncores : 10;
     }
 
     void TearDown() override { test::TearDown(); }
@@ -162,7 +165,8 @@ struct umfIpcTest : umf_test::test,
               closeCount(0) {}
     };
 
-    static constexpr int NTHREADS = 10;
+    unsigned int NTHREADS;
+    static constexpr int CNTHREADS = 10;
     stats_type stat;
     MemoryAccessor *memAccessor = nullptr;
 
@@ -188,7 +192,7 @@ struct umfIpcTest : umf_test::test,
             ptrs.push_back(ptr);
         }
 
-        std::array<std::vector<umf_ipc_handle_t>, NTHREADS> ipcHandles;
+        std::array<std::vector<umf_ipc_handle_t>, CNTHREADS> ipcHandles;
 
         umf_test::syncthreads_barrier syncthreads(NTHREADS);
 
@@ -302,7 +306,7 @@ struct umfIpcTest : umf_test::test,
             ipcHandles.push_back(ipcHandle);
         }
 
-        std::array<std::vector<void *>, NTHREADS> openedIpcHandles;
+        std::array<std::vector<void *>, CNTHREADS> openedIpcHandles;
         umf_ipc_handler_handle_t ipcHandler = nullptr;
         ret = umfPoolGetIPCHandler(pool.get(), &ipcHandler);
         ASSERT_EQ(ret, UMF_RESULT_SUCCESS);

test/poolFixtures.hpp

@@ -82,13 +82,16 @@ struct umfPoolTest : umf_test::test,
         test::SetUp();
 
         pool = poolCreateExtUnique(this->GetParam());
+
+        int ncores = utils_get_num_cores();
+        NTHREADS = (ncores > 5) ? ncores : 5;
     }
 
     void TearDown() override { test::TearDown(); }
 
     umf_test::pool_unique_handle_t pool;
 
-    static constexpr int NTHREADS = 5;
+    int NTHREADS;
     static constexpr std::array<int, 7> nonAlignedAllocSizes = {5,  7,   23, 55,
                                                                 80, 119, 247};
 };

test/test_base_alloc.cpp

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -17,10 +17,12 @@
 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 ncores = utils_get_num_cores();
+    int NTHREADS = (ncores > 10) ? ncores : 10;
+
     auto pool = std::shared_ptr<umf_ba_pool_t>(umf_ba_create(ALLOCATION_SIZE),
                                                umf_ba_destroy);
 

test/test_base_alloc_linear.cpp

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -50,10 +50,12 @@ 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 ncores = utils_get_num_cores();
+    int NTHREADS = (ncores > 10) ? ncores : 10;
+
     srand(0);
 
     // The first pool should be bigger than one page,