KMP_WARNING(AffNoValidProcID);
}
__kmp_affinity_type = affinity_none;
+ __kmp_create_affinity_none_places();
return;
}
break;
KMP_WARNING(AffBalancedNotAvail, "KMP_AFFINITY");
}
__kmp_affinity_type = affinity_none;
+ __kmp_create_affinity_none_places();
return;
- } else if (__kmp_affinity_uniform_topology()) {
- break;
- } else { // Non-uniform topology
-
+ } else if (!__kmp_affinity_uniform_topology()) {
// Save the depth for further usage
__kmp_aff_depth = depth;
procarr[core * maxprocpercore + inlastcore] = proc;
}
-
- break;
+ }
+ if (__kmp_affinity_compact >= depth) {
+ __kmp_affinity_compact = depth - 1;
}
sortAddresses:
th->th.th_new_place = i;
th->th.th_first_place = 0;
th->th.th_last_place = __kmp_affinity_num_masks - 1;
+ } else if (KMP_AFFINITY_NON_PROC_BIND) {
+ // When using a Non-OMP_PROC_BIND affinity method,
+ // set all threads' place-partition-var to the entire place list
+ th->th.th_first_place = 0;
+ th->th.th_last_place = __kmp_affinity_num_masks - 1;
}
if (i == KMP_PLACE_ALL) {
}
if (!KMP_AFFINITY_CAPABLE())
return 0;
- if (KMP_AFFINITY_NON_PROC_BIND) {
- return 1;
- }
gtid = __kmp_entry_gtid();
thread = __kmp_thread_from_gtid(gtid);
first_place = thread->th.th_first_place;
return;
gtid = __kmp_entry_gtid();
thread = __kmp_thread_from_gtid(gtid);
- if (KMP_AFFINITY_NON_PROC_BIND) {
- place_nums[0] = thread->th.th_current_place;
- return;
- }
first_place = thread->th.th_first_place;
last_place = thread->th.th_last_place;
if (first_place < 0 || last_place < 0)
--- /dev/null
+// RUN: %libomp-compile && env KMP_AFFINITY=compact %libomp-run
+// REQUIRES: openmp-4.0
+
+#include <stdio.h>
+#include <stdint.h>
+#include <omp.h>
+#include "omp_testsuite.h"
+
+int test_nested_affinity_bug() {
+ int a = 0;
+ omp_set_nested(1);
+ #pragma omp parallel num_threads(2) shared(a)
+ {
+ #pragma omp parallel num_threads(2) shared(a) proc_bind(close)
+ {
+ #pragma omp atomic
+ a++;
+ }
+ }
+ return 1;
+}
+
+int main() {
+ int i;
+ int num_failed = 0;
+
+ for (i = 0; i < REPETITIONS; i++) {
+ if (!test_nested_affinity_bug()) {
+ num_failed++;
+ }
+ }
+ return num_failed;
+}