[Openmp-commits] [PATCH] D19628: New hwloc API compatibility

[Paul Osmialowski via Openmp-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL269284: New hwloc API compatibility (authored by pawosm01).

Changed prior to commit:
  http://reviews.llvm.org/D19628?vs=55330&id=57019#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D19628

Files:
  openmp/trunk/runtime/src/kmp_settings.c

Index: openmp/trunk/runtime/src/kmp_settings.c
===================================================================
--- openmp/trunk/runtime/src/kmp_settings.c
+++ openmp/trunk/runtime/src/kmp_settings.c
@@ -5280,8 +5280,21 @@
             if(__kmp_affinity_verbose)
                 KMP_WARNING(AffHwlocErrorOccurred, var, "hwloc_topology_init()");
         }
+# if HWLOC_API_VERSION >= 0x00020000
+        // new hwloc API
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L1CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L2CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L3CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L4CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L5CACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L1ICACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L2ICACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+        hwloc_topology_set_type_filter(__kmp_hwloc_topology, HWLOC_OBJ_L3ICACHE, HWLOC_TYPE_FILTER_KEEP_NONE);
+# else
+        // old hwloc API
         hwloc_topology_ignore_type(__kmp_hwloc_topology, HWLOC_OBJ_CACHE);
 # endif
+# endif
         if ( __kmp_affinity_type == affinity_disabled ) {
             KMP_AFFINITY_DISABLE();
         }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D19628.57019.patch
Type: text/x-patch
Size: 1550 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20160512/1ed85256/attachment.bin>