maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

New hwloc API compatibility 

Differential Revision: http://reviews.llvm.org/D19628

llvm-svn: 269284
This commit is contained in:
Paul Osmialowski 2016-05-12 11:46:40 +00:00
parent 415c159e09
commit 562a3c2b66
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openmp/runtime/src/kmp_settings.c
View File

@ -5280,7 +5280,20 @@ __kmp_env_initialize( char const * string ) {
if(__kmp_affinity_verbose) if(__kmp_affinity_verbose)
KMP_WARNING(AffHwlocErrorOccurred, var, "hwloc_topology_init()"); 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); hwloc_topology_ignore_type(__kmp_hwloc_topology, HWLOC_OBJ_CACHE);
# endif
# endif # endif
if ( __kmp_affinity_type == affinity_disabled ) { if ( __kmp_affinity_type == affinity_disabled ) {
KMP_AFFINITY_DISABLE(); KMP_AFFINITY_DISABLE();