diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2017-05-15 19:05:59 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2017-05-15 19:05:59 +0000 |
| commit | e4c0f2b8d38151e64235df419e68a6bcb0799e53 (patch) | |
| tree | 381a32f0f6facd66120e00c8d9bb2522321f59e2 /runtime/src/kmp_affinity.cpp | |
| parent | c2f4638c23b467a97ede62fe5ae650cabe6c3ac1 (diff) | |
Fix for KMP_AFFINITY=respect with multiple processor groups
An assert() was being tripped when KMP_AFFINITY=respect + Multiple Processor
Groups. Let __kmp_affinity_create_proc_group_map() function be able to create
address2os object which contains a single group by deleting restriction that
process affinity mask must span multiple groups.
git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@303101 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime/src/kmp_affinity.cpp')
| -rw-r--r-- | runtime/src/kmp_affinity.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/src/kmp_affinity.cpp b/runtime/src/kmp_affinity.cpp index 2d7f7a3..b58a3d6 100644 --- a/runtime/src/kmp_affinity.cpp +++ b/runtime/src/kmp_affinity.cpp @@ -682,10 +682,9 @@ static int __kmp_affinity_create_proc_group_map(AddrUnsPair **address2os, *address2os = NULL; *msg_id = kmp_i18n_null; - // If we don't have multiple processor groups, return now. + // If we aren't affinity capable, then return now. // The flat mapping will be used. - if ((!KMP_AFFINITY_CAPABLE()) || - (__kmp_get_proc_group(__kmp_affin_fullMask) >= 0)) { + if (!KMP_AFFINITY_CAPABLE()) { // FIXME set *msg_id return -1; } |