Remove no-longer-used hwloc support fns

Remove a set of functions that were only used by ORTE as they are no
longer required. We can probably remove more of them with a little
cleanup in the rest of the code.

Signed-off-by: Ralph Castain <rhc@pmix.org>

opal/dss/dss_types.h

@@ -91,7 +91,6 @@ typedef struct {
 #define    OPAL_BYTE_OBJECT         (opal_data_type_t)   20 /**< byte object structure */
 #define    OPAL_DATA_TYPE           (opal_data_type_t)   21 /**< data type */
 #define    OPAL_NULL                (opal_data_type_t)   22 /**< don't interpret data type */
-#define    OPAL_HWLOC_TOPO          (opal_data_type_t)   25 /**< hwloc topology */
 #define    OPAL_VALUE               (opal_data_type_t)   26 /**< opal value structure */
 #define    OPAL_BUFFER              (opal_data_type_t)   27 /**< pack the remaining contents of a buffer as an object */
 #define    OPAL_PTR                 (opal_data_type_t)   28 /**< pointer to void* */

opal/mca/hwloc/base/Makefile.am

@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2015      Intel, Inc. All rights reserved.
+# Copyright (c) 2015-2020 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -15,7 +15,6 @@ headers += \
 
 libmca_hwloc_la_SOURCES += \
         base/hwloc_base_frame.c \
-        base/hwloc_base_dt.c \
         base/hwloc_base_util.c \
         base/hwloc_base_maffinity.c
 

opal/mca/hwloc/base/base.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011-2017 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2017      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -175,26 +175,13 @@ OPAL_DECLSPEC unsigned int opal_hwloc_base_get_nbobjs_by_type(hwloc_topology_t t
                                                               hwloc_obj_type_t target,
                                                               unsigned cache_level,
                                                               opal_hwloc_resource_type_t rtype);
-OPAL_DECLSPEC void opal_hwloc_base_clear_usage(hwloc_topology_t topo);
 
 OPAL_DECLSPEC hwloc_obj_t opal_hwloc_base_get_obj_by_type(hwloc_topology_t topo,
                                                           hwloc_obj_type_t target,
                                                           unsigned cache_level,
                                                           unsigned int instance,
                                                           opal_hwloc_resource_type_t rtype);
-OPAL_DECLSPEC unsigned int opal_hwloc_base_get_obj_idx(hwloc_topology_t topo,
-                                                       hwloc_obj_t obj,
-                                                       opal_hwloc_resource_type_t rtype);
 
-OPAL_DECLSPEC int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo,
-                                    char* device_name,
-                                    opal_list_t *sorted_list);
-
-/**
- * Get the number of pu's under a given hwloc object.
- */
-OPAL_DECLSPEC unsigned int opal_hwloc_base_get_npus(hwloc_topology_t topo,
-                                                    hwloc_obj_t target);
 OPAL_DECLSPEC char* opal_hwloc_base_print_binding(opal_binding_policy_t binding);
 
 /**
@@ -202,19 +189,6 @@ OPAL_DECLSPEC char* opal_hwloc_base_print_binding(opal_binding_policy_t binding)
  */
 OPAL_DECLSPEC bool opal_hwloc_base_single_cpu(hwloc_cpuset_t cpuset);
 
-/**
- * Provide a utility to parse a slot list against the local
- * cpus of given type, and produce a cpuset for the described binding
- */
-OPAL_DECLSPEC int opal_hwloc_base_cpu_list_parse(const char *slot_str,
-                                                  hwloc_topology_t topo,
-                                                  opal_hwloc_resource_type_t rtype,
-                                                  hwloc_cpuset_t cpumask);
-
-OPAL_DECLSPEC char* opal_hwloc_base_find_coprocessors(hwloc_topology_t topo);
-OPAL_DECLSPEC char* opal_hwloc_base_check_on_coprocessor(void);
-
-
 /**
  * Report a bind failure using the normal mechanisms if a component
  * fails to bind memory -- according to the value of the
@@ -243,23 +217,6 @@ OPAL_DECLSPEC int opal_hwloc_base_node_name_to_id(char *node_name, int *id);
 OPAL_DECLSPEC int opal_hwloc_base_memory_set(opal_hwloc_base_memory_segment_t *segments,
                                              size_t num_segments);
 
-/* datatype support */
-OPAL_DECLSPEC int opal_hwloc_pack(opal_buffer_t *buffer, const void *src,
-                                  int32_t num_vals,
-                                  opal_data_type_t type);
-OPAL_DECLSPEC int opal_hwloc_unpack(opal_buffer_t *buffer, void *dest,
-                                    int32_t *num_vals,
-                                    opal_data_type_t type);
-OPAL_DECLSPEC int opal_hwloc_copy(hwloc_topology_t *dest,
-                                  hwloc_topology_t src,
-                                  opal_data_type_t type);
-OPAL_DECLSPEC int opal_hwloc_compare(const hwloc_topology_t topo1,
-                                     const hwloc_topology_t topo2,
-                                     opal_data_type_t type);
-OPAL_DECLSPEC int opal_hwloc_print(char **output, char *prefix,
-                                   hwloc_topology_t src,
-                                   opal_data_type_t type);
-
 /**
  * Make a prettyprint string for a hwloc_cpuset_t (e.g., "socket
  * 2[core 3]").
@@ -285,11 +242,6 @@ OPAL_DECLSPEC hwloc_obj_t opal_hwloc_base_get_pu(hwloc_topology_t topo,
                                                  int lid,
                                                  opal_hwloc_resource_type_t rtype);
 
-/* get the topology "signature" so we can check for differences - caller
- * if responsible for freeing the returned string */
-OPAL_DECLSPEC char* opal_hwloc_base_get_topo_signature(hwloc_topology_t topo);
-
-
 /* get a string describing the locality of a given process */
 OPAL_DECLSPEC char* opal_hwloc_base_get_locality_string(hwloc_topology_t topo, char *bitmap);
 
@@ -300,8 +252,6 @@ OPAL_DECLSPEC char* opal_hwloc_base_get_location(char *locality,
 
 OPAL_DECLSPEC opal_hwloc_locality_t opal_hwloc_compute_relative_locality(char *loc1, char *loc2);
 
-OPAL_DECLSPEC int opal_hwloc_base_topology_export_xmlbuffer(hwloc_topology_t topology, char **xmlpath, int *buflen);
-
 OPAL_DECLSPEC int opal_hwloc_base_topology_set_flags (hwloc_topology_t topology, unsigned long flags, bool io);
 END_C_DECLS
 

opal/mca/hwloc/base/hwloc_base_dt.c

@@ -1,309 +0,0 @@
-/*
- * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2017      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
- *
- * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- */
-
-#include "opal_config.h"
-#include "opal/constants.h"
-
-#include "opal/util/output.h"
-#include "opal/util/printf.h"
-
-#include "opal/dss/dss.h"
-#include "opal/mca/hwloc/base/base.h"
-
-int opal_hwloc_pack(opal_buffer_t *buffer, const void *src,
-                    int32_t num_vals,
-                    opal_data_type_t type)
-{
-    /* NOTE: hwloc defines topology_t as a pointer to a struct! */
-    hwloc_topology_t t, *tarray  = (hwloc_topology_t*)src;
-    int rc, i;
-    char *xmlbuffer=NULL;
-    int len;
-    struct hwloc_topology_support *support;
-
-    for (i=0; i < num_vals; i++) {
-        t = tarray[i];
-
-        /* extract an xml-buffer representation of the tree */
-        if (0 != opal_hwloc_base_topology_export_xmlbuffer(t, &xmlbuffer, &len)) {
-            return OPAL_ERROR;
-        }
-
-        /* add to buffer */
-        if (OPAL_SUCCESS != (rc = opal_dss.pack(buffer, &xmlbuffer, 1, OPAL_STRING))) {
-            free(xmlbuffer);
-            return rc;
-        }
-
-        /* cleanup */
-        if (NULL != xmlbuffer) {
-            free(xmlbuffer);
-        }
-
-        /* get the available support - hwloc unfortunately does
-         * not include this info in its xml export!
-         */
-        support = (struct hwloc_topology_support*)hwloc_topology_get_support(t);
-        /* pack the discovery support */
-        if (OPAL_SUCCESS != (rc = opal_dss.pack(buffer, support->discovery,
-                                                sizeof(struct hwloc_topology_discovery_support),
-                                                OPAL_BYTE))) {
-            return rc;
-        }
-        /* pack the cpubind support */
-        if (OPAL_SUCCESS != (rc = opal_dss.pack(buffer, support->cpubind,
-                                                sizeof(struct hwloc_topology_cpubind_support),
-                                                OPAL_BYTE))) {
-            return rc;
-        }
-        /* pack the membind support */
-        if (OPAL_SUCCESS != (rc = opal_dss.pack(buffer, support->membind,
-                                                sizeof(struct hwloc_topology_membind_support),
-                                                OPAL_BYTE))) {
-            return rc;
-        }
-    }
-
-    return OPAL_SUCCESS;
-}
-
-int opal_hwloc_unpack(opal_buffer_t *buffer, void *dest,
-                      int32_t *num_vals,
-                      opal_data_type_t type)
-{
-    /* NOTE: hwloc defines topology_t as a pointer to a struct! */
-    hwloc_topology_t t, *tarray  = (hwloc_topology_t*)dest;
-    int rc=OPAL_SUCCESS, i, cnt, j;
-    char *xmlbuffer;
-    struct hwloc_topology_support *support;
-
-    for (i=0, j=0; i < *num_vals; i++) {
-        /* unpack the xml string */
-        cnt=1;
-        if (OPAL_SUCCESS != (rc = opal_dss.unpack(buffer, &xmlbuffer, &cnt, OPAL_STRING))) {
-            goto cleanup;
-        }
-
-        /* convert the xml */
-        if (0 != hwloc_topology_init(&t)) {
-            rc = OPAL_ERROR;
-            free(xmlbuffer);
-            goto cleanup;
-        }
-        if (0 != hwloc_topology_set_xmlbuffer(t, xmlbuffer, strlen(xmlbuffer)+1)) {
-            rc = OPAL_ERROR;
-            free(xmlbuffer);
-            hwloc_topology_destroy(t);
-            goto cleanup;
-        }
-        free(xmlbuffer);
-        /* since we are loading this from an external source, we have to
-         * explicitly set a flag so hwloc sets things up correctly
-         */
-        if (0 != opal_hwloc_base_topology_set_flags(t, HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM, true)) {
-            rc = OPAL_ERROR;
-            hwloc_topology_destroy(t);
-            goto cleanup;
-        }
-        /* now load the topology */
-        if (0 != hwloc_topology_load(t)) {
-            rc = OPAL_ERROR;
-            hwloc_topology_destroy(t);
-            goto cleanup;
-        }
-
-        /* get the available support - hwloc unfortunately does
-         * not include this info in its xml import!
-         */
-        support = (struct hwloc_topology_support*)hwloc_topology_get_support(t);
-        cnt = sizeof(struct hwloc_topology_discovery_support);
-        if (OPAL_SUCCESS != (rc = opal_dss.unpack(buffer, support->discovery, &cnt, OPAL_BYTE))) {
-            goto cleanup;
-        }
-        cnt = sizeof(struct hwloc_topology_cpubind_support);
-        if (OPAL_SUCCESS != (rc = opal_dss.unpack(buffer, support->cpubind, &cnt, OPAL_BYTE))) {
-            goto cleanup;
-        }
-        cnt = sizeof(struct hwloc_topology_membind_support);
-        if (OPAL_SUCCESS != (rc = opal_dss.unpack(buffer, support->membind, &cnt, OPAL_BYTE))) {
-            goto cleanup;
-        }
-
-        /* pass it back */
-        tarray[i] = t;
-
-        /* track the number added */
-        j++;
-    }
-
- cleanup:
-    *num_vals = j;
-    return rc;
-}
-
-int opal_hwloc_copy(hwloc_topology_t *dest, hwloc_topology_t src, opal_data_type_t type)
-{
-#ifdef HAVE_HWLOC_TOPOLOGY_DUP
-    /* use the hwloc dup function */
-    return hwloc_topology_dup(dest, src);
-#else
-    /* hwloc_topology_dup() was introduced in hwloc v1.8.0.
-     * Note that as of March 2017, opal_hwloc_copy() is not (yet?) used in the code base anywhere. */
-    return OPAL_ERR_NOT_SUPPORTED;
-#endif
-}
-
-int opal_hwloc_compare(const hwloc_topology_t topo1,
-                       const hwloc_topology_t topo2,
-                       opal_data_type_t type)
-{
-    hwloc_topology_t t1, t2;
-    unsigned d1, d2;
-    struct hwloc_topology_support *s1, *s2;
-    char *x1=NULL, *x2=NULL;
-    int l1, l2;
-    int s;
-
-    /* stop stupid compiler warnings */
-    t1 = (hwloc_topology_t)topo1;
-    t2 = (hwloc_topology_t)topo2;
-
-    /* do something quick first */
-    d1 = hwloc_topology_get_depth(t1);
-    d2 = hwloc_topology_get_depth(t2);
-    if (d1 > d2) {
-        return OPAL_VALUE1_GREATER;
-    } else if (d2 > d1) {
-        return OPAL_VALUE2_GREATER;
-    }
-
-
-    /* do the comparison the "cheat" way - get an xml representation
-     * of each tree, and strcmp! This will work fine for inventory
-     * comparisons, but might not meet the need for comparing topology
-     * where we really need to do a tree-wise search so we only compare
-     * the things we care about, and ignore stuff like MAC addresses
-     */
-    if (0 != opal_hwloc_base_topology_export_xmlbuffer(t1, &x1, &l1)) {
-        return OPAL_EQUAL;
-    }
-    if (0 != opal_hwloc_base_topology_export_xmlbuffer(t2, &x2, &l2)) {
-        free(x1);
-        return OPAL_EQUAL;
-    }
-
-    s = strcmp(x1, x2);
-    free(x1);
-    free(x2);
-    if (s > 0) {
-        return OPAL_VALUE1_GREATER;
-    } else if (s < 0) {
-        return OPAL_VALUE2_GREATER;
-    }
-
-    /* compare the available support - hwloc unfortunately does
-     * not include this info in its xml support!
-     */
-    if (NULL == (s1 = (struct hwloc_topology_support*)hwloc_topology_get_support(t1)) ||
-        NULL == s1->cpubind || NULL == s1->membind) {
-        return OPAL_EQUAL;
-    }
-    if (NULL == (s2 = (struct hwloc_topology_support*)hwloc_topology_get_support(t2)) ||
-        NULL == s2->cpubind || NULL == s2->membind) {
-        return OPAL_EQUAL;
-    }
-    /* compare the fields we care about */
-    if (s1->cpubind->set_thisproc_cpubind != s2->cpubind->set_thisproc_cpubind ||
-        s1->cpubind->set_thisthread_cpubind != s2->cpubind->set_thisthread_cpubind ||
-        s1->membind->set_thisproc_membind != s2->membind->set_thisproc_membind ||
-        s1->membind->set_thisthread_membind != s2->membind->set_thisthread_membind) {
-        OPAL_OUTPUT_VERBOSE((5, opal_hwloc_base_framework.framework_output,
-                             "hwloc:base:compare BINDING CAPABILITIES DIFFER"));
-        return OPAL_VALUE1_GREATER;
-    }
-
-    return OPAL_EQUAL;
-}
-
-#define OPAL_HWLOC_MAX_STRING   2048
-
-static void print_hwloc_obj(char **output, char *prefix,
-                            hwloc_topology_t topo, hwloc_obj_t obj)
-{
-    hwloc_obj_t obj2;
-    char string[1024], *tmp, *tmp2, *pfx;
-    unsigned i;
-    struct hwloc_topology_support *support;
-
-    /* print the object type */
-    hwloc_obj_type_snprintf(string, 1024, obj, 1);
-    opal_asprintf(&pfx, "\n%s\t", (NULL == prefix) ? "" : prefix);
-    opal_asprintf(&tmp, "%sType: %s Number of child objects: %u%sName=%s",
-             (NULL == prefix) ? "" : prefix, string, obj->arity,
-             pfx, (NULL == obj->name) ? "NULL" : obj->name);
-    if (0 < hwloc_obj_attr_snprintf(string, 1024, obj, pfx, 1)) {
-        /* print the attributes */
-        opal_asprintf(&tmp2, "%s%s%s", tmp, pfx, string);
-        free(tmp);
-        tmp = tmp2;
-    }
-    /* print the cpusets - apparently, some new HWLOC types don't
-     * have cpusets, so protect ourselves here
-     */
-    if (NULL != obj->cpuset) {
-        hwloc_bitmap_snprintf(string, OPAL_HWLOC_MAX_STRING, obj->cpuset);
-        opal_asprintf(&tmp2, "%s%sCpuset:  %s", tmp, pfx, string);
-        free(tmp);
-        tmp = tmp2;
-    }
-    if (HWLOC_OBJ_MACHINE == obj->type) {
-        /* root level object - add support values */
-        support = (struct hwloc_topology_support*)hwloc_topology_get_support(topo);
-        opal_asprintf(&tmp2, "%s%sBind CPU proc:   %s%sBind CPU thread: %s", tmp, pfx,
-                 (support->cpubind->set_thisproc_cpubind) ? "TRUE" : "FALSE", pfx,
-                 (support->cpubind->set_thisthread_cpubind) ? "TRUE" : "FALSE");
-        free(tmp);
-        tmp = tmp2;
-        opal_asprintf(&tmp2, "%s%sBind MEM proc:   %s%sBind MEM thread: %s", tmp, pfx,
-                 (support->membind->set_thisproc_membind) ? "TRUE" : "FALSE", pfx,
-                 (support->membind->set_thisthread_membind) ? "TRUE" : "FALSE");
-        free(tmp);
-        tmp = tmp2;
-    }
-    opal_asprintf(&tmp2, "%s%s\n", (NULL == *output) ? "" : *output, tmp);
-    free(tmp);
-    free(pfx);
-    opal_asprintf(&pfx, "%s\t", (NULL == prefix) ? "" : prefix);
-    for (i=0; i < obj->arity; i++) {
-        obj2 = obj->children[i];
-        /* print the object */
-        print_hwloc_obj(&tmp2, pfx, topo, obj2);
-    }
-    free(pfx);
-    if (NULL != *output) {
-        free(*output);
-    }
-    *output = tmp2;
-}
-
-int opal_hwloc_print(char **output, char *prefix, hwloc_topology_t src, opal_data_type_t type)
-{
-    hwloc_obj_t obj;
-    char *tmp=NULL;
-
-    /* get root object */
-    obj = hwloc_get_root_obj(src);
-    /* print it */
-    print_hwloc_obj(&tmp, prefix, src, obj);
-    *output = tmp;
-    return OPAL_SUCCESS;
-}
-

opal/mca/hwloc/base/hwloc_base_frame.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011-2018 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
+ * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2016-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2019 IBM Corporation. All rights reserved.
@@ -170,7 +170,6 @@ static int opal_hwloc_base_register(mca_base_register_flag_t flags)
 static int opal_hwloc_base_open(mca_base_open_flag_t flags)
 {
     int rc;
-    opal_data_type_t tmp;
 
     if (opal_hwloc_base_inited) {
         return OPAL_SUCCESS;
@@ -241,18 +240,6 @@ static int opal_hwloc_base_open(mca_base_open_flag_t flags)
         return OPAL_ERROR;
     }
 
-    /* declare the hwloc data types */
-    tmp = OPAL_HWLOC_TOPO;
-    if (OPAL_SUCCESS != (rc = opal_dss.register_type(opal_hwloc_pack,
-                                                     opal_hwloc_unpack,
-                                                     (opal_dss_copy_fn_t)opal_hwloc_copy,
-                                                     (opal_dss_compare_fn_t)opal_hwloc_compare,
-                                                     (opal_dss_print_fn_t)opal_hwloc_print,
-                                                     OPAL_DSS_STRUCTURED,
-                                                     "OPAL_HWLOC_TOPO", &tmp))) {
-        return rc;
-    }
-
     return OPAL_SUCCESS;
 }