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 | 586849918b24e69cb158b06481ed7cd7028c22e2 (patch) | |
| tree | bd1971843615be9555fe02bf28c9a7c32bfed589 /openmp/runtime/src | |
| parent | 6e7a21274898873cb6aef79b869d89b1081acb7d (diff) | |
| download | bcm5719-llvm-586849918b24e69cb158b06481ed7cd7028c22e2.tar.gz bcm5719-llvm-586849918b24e69cb158b06481ed7cd7028c22e2.zip | |
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.
llvm-svn: 303101
Diffstat (limited to 'openmp/runtime/src')
| -rw-r--r-- | openmp/runtime/src/kmp_affinity.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp index 2d7f7a3e434..b58a3d6e461 100644 --- a/openmp/runtime/src/kmp_affinity.cpp +++ b/openmp/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; } |
