make topology_init faster

Author: lplewa

src/libumf.c

@@ -75,6 +75,9 @@ umf_result_t umfInit(void) {
         LOG_DEBUG("UMF library initialized");
     }
 
+    // some benchmarks uses multiple forks, and topology initialization is very slow
+    // so if we initialize topology before the first fork, we can get significant performance gain.
+    umfGetTopology();
     return UMF_RESULT_SUCCESS;
 }
 

src/provider/provider_os_memory.c

@@ -24,6 +24,7 @@
 #include "ctl/ctl_internal.h"
 #include "libumf.h"
 #include "provider_os_memory_internal.h"
+#include "topology.h"
 #include "utils_assert.h"
 #include "utils_common.h"
 #include "utils_concurrency.h"
@@ -556,27 +557,19 @@ static umf_result_t os_initialize(const void *params, void **provider) {
 
     memset(os_provider, 0, sizeof(*os_provider));
 
-    int r = hwloc_topology_init(&os_provider->topo);
-    if (r) {
-        LOG_ERR("HWLOC topology init failed");
-        ret = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-        goto err_free_os_provider;
-    }
-
-    r = hwloc_topology_load(os_provider->topo);
-    if (r) {
+    os_provider->topo = umfGetTopology();
+    if (!os_provider->topo) {
         os_store_last_native_error(UMF_OS_RESULT_ERROR_TOPO_DISCOVERY_FAILED,
                                    0);
         LOG_ERR("HWLOC topology discovery failed");
         ret = UMF_RESULT_ERROR_MEMORY_PROVIDER_SPECIFIC;
-        goto err_destroy_hwloc_topology;
     }
 
     os_provider->fd_offset_map = critnib_new(NULL, NULL);
     if (!os_provider->fd_offset_map) {
         LOG_ERR("creating file descriptor offset map failed");
         ret = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-        goto err_destroy_hwloc_topology;
+        goto err_free_os_provider;
     }
 
     ret = translate_params(in_params, os_provider);
@@ -619,8 +612,6 @@ static umf_result_t os_initialize(const void *params, void **provider) {
     free_bitmaps(os_provider);
 err_destroy_critnib:
     critnib_delete(os_provider->fd_offset_map);
-err_destroy_hwloc_topology:
-    hwloc_topology_destroy(os_provider->topo);
 err_free_os_provider:
     umf_ba_global_free(os_provider);
     return ret;
@@ -644,7 +635,7 @@ static umf_result_t os_finalize(void *provider) {
     if (os_provider->nodeset_str_buf) {
         umf_ba_global_free(os_provider->nodeset_str_buf);
     }
-    hwloc_topology_destroy(os_provider->topo);
+
     umf_ba_global_free(os_provider);
     return UMF_RESULT_SUCCESS;
 }

src/topology.c

@@ -1,6 +1,6 @@
 /*
  *
- * 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
@@ -33,6 +33,22 @@ static void umfCreateTopology(void) {
         return;
     }
 
+    if (hwloc_topology_set_all_types_filter(topology,
+                                            HWLOC_TYPE_FILTER_KEEP_NONE)) {
+        LOG_ERR("Failed to set topology filter");
+        hwloc_topology_destroy(topology);
+        topology = NULL;
+        return;
+    }
+
+    if (hwloc_topology_set_type_filter(topology, HWLOC_OBJ_CORE,
+                                       HWLOC_TYPE_FILTER_KEEP_ALL)) {
+        LOG_ERR("Failed to set core filter");
+        hwloc_topology_destroy(topology);
+        topology = NULL;
+        return;
+    }
+
     if (hwloc_topology_load(topology)) {
         LOG_ERR("Failed to initialize topology");
         hwloc_topology_destroy(topology);