commit 5cd50e3c0ad5c117f28f7d79e24433316739c357
author Andrey Churbanov <Andrey.Churbanov@intel.com> Thu Jan 29 17:14:58 2015 +0000
committer Andrey Churbanov <Andrey.Churbanov@intel.com> Thu Jan 29 17:14:58 2015 +0000
tree b1cd81a4d661a11f1ee9a2c8a17d64f48506dbb1
parent a1849af4a98ad567d0bf0ddc51e5c8acabbe507f

enable environment variable KMP_PLACE_THREADS also for non-MIC architectures

llvm-svn: 227467

openmp/runtime/src/kmp_affinity.cpp

diff --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp
index e1962d1..b16b458 100644
--- a/openmp/runtime/src/kmp_affinity.cpp
+++ b/openmp/runtime/src/kmp_affinity.cpp
@@ -3327,9 +3327,6 @@
 #undef ADD_MASK
 #undef ADD_MASK_OSID
 
-
-# if KMP_MIC
-
 static void
 __kmp_apply_thread_places(AddrUnsPair **pAddr, int depth)
 {
@@ -3350,7 +3347,7 @@
     if ( __kmp_place_num_threads_per_core == 0 ) {
         __kmp_place_num_threads_per_core = __kmp_nThreadsPerCore;  // use all HW contexts
     }
-    if ( __kmp_place_core_offset + __kmp_place_num_cores > nCoresPerPkg ) {
+    if ( __kmp_place_core_offset + __kmp_place_num_cores > (unsigned int)nCoresPerPkg ) {
         KMP_WARNING( AffThrPlaceManyCores );
         return;
     }
@@ -3360,11 +3357,11 @@
     int i, j, k, n_old = 0, n_new = 0;
     for ( i = 0; i < nPackages; ++i ) {
         for ( j = 0; j < nCoresPerPkg; ++j ) {
-            if ( j < __kmp_place_core_offset || j >= __kmp_place_core_offset + __kmp_place_num_cores ) {
+            if ( (unsigned int)j < __kmp_place_core_offset || (unsigned int)j >= __kmp_place_core_offset + __kmp_place_num_cores ) {
                 n_old += __kmp_nThreadsPerCore;   // skip not-requested core
             } else {
                 for ( k = 0; k < __kmp_nThreadsPerCore; ++k ) {
-                    if ( k < __kmp_place_num_threads_per_core ) {
+                    if ( (unsigned int)k < __kmp_place_num_threads_per_core ) {
                         newAddr[n_new] = (*pAddr)[n_old];   // copy requested core' data to new location
                         n_new++;
                     }
@@ -3382,8 +3379,6 @@
     *pAddr = newAddr;      // replace old topology with new one
 }
 
-# endif /* KMP_MIC */
-
 
 static AddrUnsPair *address2os = NULL;
 static int           * procarr = NULL;
@@ -3705,9 +3700,7 @@
         return;
     }
 
-# if KMP_MIC
     __kmp_apply_thread_places(&address2os, depth);
-# endif
 
     //
     // Create the table of masks, indexed by thread Id.