Merge pull request #387 from nysal/issue-383

Fix cache line size detection on power

ompi/mca/coll/libnbc/coll_libnbc_component.c

@@ -88,13 +88,13 @@ libnbc_open(void)
     int ret;
 
     OBJ_CONSTRUCT(&mca_coll_libnbc_component.requests, opal_free_list_t);
+    OBJ_CONSTRUCT(&mca_coll_libnbc_component.active_requests, opal_list_t);
     ret = opal_free_list_init (&mca_coll_libnbc_component.requests,
                                sizeof(ompi_coll_libnbc_request_t), 8,
                                OBJ_CLASS(ompi_coll_libnbc_request_t),
                                0, 0, 0, -1, 8, NULL, 0, NULL, NULL, NULL);
     if (OMPI_SUCCESS != ret) return ret;
 
-    OBJ_CONSTRUCT(&mca_coll_libnbc_component.active_requests, opal_list_t);
     /* note: active comms is the number of communicators who have had
        a non-blocking collective started */
     mca_coll_libnbc_component.active_comms = 0;

opal/mca/hwloc/base/hwloc_base_util.c

@@ -211,28 +211,33 @@ int opal_hwloc_base_filter_cpus(hwloc_topology_t topo)
 
 static void fill_cache_line_size(void)
 {
-    int i = 0;
+    int i = 0, cache_level = 2;
     unsigned size;
     hwloc_obj_t obj;
     bool found = false;
 
     /* Look for the smallest L2 cache size */
     size = 4096;
+    while (cache_level > 0 && !found) {
+        i=0;
         while (1) {
             obj = opal_hwloc_base_get_obj_by_type(opal_hwloc_topology,
-                                              HWLOC_OBJ_CACHE, 2,
+                                                  HWLOC_OBJ_CACHE, cache_level,
                                                   i, OPAL_HWLOC_LOGICAL);
             if (NULL == obj) {
+                --cache_level;
                 break;
             } else {
-            found = true;
                 if (NULL != obj->attr &&
+                    obj->attr->cache.linesize > 0 &&
                     size > obj->attr->cache.linesize) {
                     size = obj->attr->cache.linesize;
+                    found = true;
                 }
             }
             ++i;
         }
+    }
 
     /* If we found an L2 cache size in the hwloc data, save it in
        opal_cache_line_size.  Otherwise, we'll leave whatever default