Removed @ from delimiters, added it as offset designator.

[jlpeyton]

Summary

Moved '@' from delimiters to offset designators for the KMP_PLACE_THREADS environment variable. Only one of: postfix "o" or prefix @, should be used in the value of KMP_PLACE_THREADS. For example, '2s@2,4c@2,1t'. This is also the format of KMP_SETTINGS=1 output now (removed "o" from there). e.g., 2s,2o,4c,2o,1t.

[AndreyChurbanov]

LGTM

openmp/trunk/runtime/src/i18n/en_US.txt

 AffGranCantUseMultGroups     "Cannot use affinity granularity \"%1$s\" with multiple Windows* OS processor groups, using \"%2$s\"."
 AffWindowsProcGroupMap       "%1$s: Mapping Windows* OS processor group <i> proc <j> to OS proc 64*<i>+<j>."
 AffOSProcToGroup             "%1$s: OS proc %2$d maps to Windows* OS processor group %3$d proc %4$d"
 AffBalancedNotAvail          "%1$s: Affinity balanced is not available."
 OBSOLETE                     "%1$s: granularity=core will be used."
 EnvLockWarn                  "%1$s must be set prior to first OMP lock call or critical section; ignored."
 FutexNotSupported            "futex system call not supported; %1$s=%2$s ignored."
 AffGranUsing                 "%1$s: granularity=%2$s will be used."
-AffThrPlaceInvalid           "%1$s: invalid value \"%2$s\", valid format is \"nS[,nO],nC[,nO],nT "
+AffThrPlaceInvalid           "%1$s: invalid value \"%2$s\", valid format is \"Ns[@N],Nc[@N],Nt "
                              "(nSockets@offset, nCores@offset, nTthreads per core)\"."
 AffThrPlaceUnsupported       "KMP_PLACE_THREADS ignored: unsupported architecture."
 AffThrPlaceManyCores         "KMP_PLACE_THREADS ignored: too many cores requested."
 SyntaxErrorUsing             "%1$s: syntax error, using %2$s."
 AdaptiveNotSupported         "%1$s: Adaptive locks are not supported; using queuing."
 EnvSyntaxError               "%1$s: Invalid symbols found. Check the value \"%2$s\"."
 EnvSpacesNotAllowed          "%1$s: Spaces between digits are not allowed \"%2$s\"."
 BoundToOSProcSet             "%1$s: pid %2$d thread %3$d bound to OS proc set %4$s"
 CnsLoopIncrIllegal           "%1$s error: parallel loop increment and condition are inconsistent."
 NoGompCancellation           "libgomp cancellation is not currently supported."
 AffThrPlaceNonUniform        "KMP_PLACE_THREADS ignored: non-uniform topology."
 AffThrPlaceNonThreeLevel     "KMP_PLACE_THREADS ignored: only three-level topology is supported."
 AffGranTopGroup              "%1$s: granularity=%2$s is not supported with KMP_TOPOLOGY_METHOD=group. Using \"granularity=fine\"."
 AffGranGroupType             "%1$s: granularity=group is not supported with KMP_AFFINITY=%2$s. Using \"granularity=core\"."
 AffThrPlaceManySockets       "KMP_PLACE_THREADS ignored: too many sockets requested."
+AffThrPlaceDeprecated        "KMP_PLACE_THREADS \"o\" offset designator deprecated, please use @ prefix for offset value."
 
 
 # --------------------------------------------------------------------------------------------------
 -*- HINTS -*-
 # --------------------------------------------------------------------------------------------------
 
 # Hints. Hint may be printed after a message. Usually it is longer explanation text or suggestion.
 # To maintain hint numbers (they are visible to customers), add new hints to the end.

openmp/trunk/runtime/src/kmp_settings.c

 // -------------------------------------------------------------------------------------------------
 // KMP_PLACE_THREADS
 // -------------------------------------------------------------------------------------------------
 
 static void
 __kmp_stg_parse_place_threads( char const * name, char const * value, void * data ) {
     // Value example: 5Cx2Tx15O
     // Which means "use 5 cores with offset 15, 2 threads per core"
-    // AC: extended to sockets level:
-    //     2s,6o,2c,2o,2t   or   2s,6o,2c,2t,2o
-    //     (to not break legacy code core-offset can be last).
+    // AC: extended to sockets level, examples of
+    //     "use 2 sockets with offset 6, 2 cores with offset 2 per socket, 2 threads per core":
+    //     2s,6o,2c,2o,2t; 2s,6o,2c,2t,2o; 2s@6,2c@2,2t
+    //     To not break legacy code core-offset can be last;
+    //     postfix "o" or prefix @ can be offset designator.
     // Note: not all syntax errors are analyzed, some may be skipped.
-#define CHECK_DELIM(_x)   (*(_x) == ',' || *(_x) == '@' || *(_x) == 'x')
+#define CHECK_DELIM(_x)   (*(_x) == ',' || *(_x) == 'x')
     int         num;
-    int         flagS = 0, flagC = 0, flagT = 0;
+    int single_warning = 0;
+    int flagS = 0, flagC = 0, flagT = 0, flagSO = 0, flagCO = 0;
     const char *next = value;
     const char *prev;
 
     SKIP_WS(next);  // skip white spaces
     if (*next == '\0')
         return;   // no data provided, retain default values
     // Get num_sockets first (or whatever specified)
     if (*next >= '0' && *next <= '9') {
         prev = next;
         SKIP_DIGITS(next);
         num = __kmp_str_to_int(prev, *next);
         SKIP_WS(next);
-        if (*next == 's' || *next == 'S') {
+        if (*next == 's' || *next == 'S') {  // e.g. "2s"
             __kmp_place_num_sockets = num;
             flagS = 1; // got num sockets
             next++;
+            if (*next == '@') { // socket offset, e.g. "2s@4"
+                flagSO = 1;
+                prev = ++next;  // don't allow spaces for simplicity
+                if (!(*next >= '0' && *next <= '9')) {
+                    KMP_WARNING(AffThrPlaceInvalid, name, value);
+                    return;
+                }
+                SKIP_DIGITS(next);
+                num = __kmp_str_to_int(prev, *next);
+                __kmp_place_socket_offset = num;
+            }
         } else if (*next == 'c' || *next == 'C') {
             __kmp_place_num_cores = num;
             flagS = flagC = 1; // sockets were not specified - use default
             next++;
+            if (*next == '@') { // core offset, e.g. "2c@6"
+                flagCO = 1;
+                prev = ++next;  // don't allow spaces for simplicity
+                if (!(*next >= '0' && *next <= '9')) {
+                    KMP_WARNING(AffThrPlaceInvalid, name, value);
+                    return;
+                }
+                SKIP_DIGITS(next);
+                num = __kmp_str_to_int(prev, *next);
+                __kmp_place_core_offset = num;
+            }
         } else if (CHECK_DELIM(next)) {
             __kmp_place_num_cores = num; // no letter-designator - num cores
             flagS = flagC = 1; // sockets were not specified - use default
             next++;
         } else if (*next == 't' || *next == 'T') {
             __kmp_place_num_threads_per_core = num;
             // sockets, cores were not specified - use default
             return;   // we ignore offset value in case all cores are used
#define CHECK_DELIM(_x)   (*(_x) == ',' || *(_x) == 'x')
     }
 
     // Get second value (could be offset, num_cores, num_threads)
     if (*next >= '0' && *next <= '9') {
         prev = next;
         SKIP_DIGITS(next);
         num = __kmp_str_to_int(prev, *next);
         SKIP_WS(next);
-        if (*next == 'o' || *next == 'O') { // offset specified
-            if (flagC) { // whether num_cores already specified (when sockets skipped)
+        if (*next == 'c' || *next == 'C') {
+            KMP_DEBUG_ASSERT(flagC == 0);
+            __kmp_place_num_cores = num;
+            flagC = 1;
+            next++;
+            if (*next == '@') { // core offset, e.g. "2c@6"
+                flagCO = 1;
+                prev = ++next;  // don't allow spaces for simplicity
+                if (!(*next >= '0' && *next <= '9')) {
+                    KMP_WARNING(AffThrPlaceInvalid, name, value);
+                    return;
+                }
+                SKIP_DIGITS(next);
+                num = __kmp_str_to_int(prev, *next);
+                __kmp_place_core_offset = num;
+            }
+        } else if (*next == 'o' || *next == 'O') { // offset specified
+            KMP_WARNING(AffThrPlaceDeprecated);
+            single_warning = 1;
+            if (flagC) { // whether num_cores already specified (sockets skipped)
+                KMP_DEBUG_ASSERT(!flagCO); // either "o" or @, not both
                 __kmp_place_core_offset = num;
             } else {
+                KMP_DEBUG_ASSERT(!flagSO); // either "o" or @, not both
                 __kmp_place_socket_offset = num;
             }
             next++;
-        } else if (*next == 'c' || *next == 'C') {
-            KMP_DEBUG_ASSERT(flagC == 0);
-            __kmp_place_num_cores = num;
-            flagC = 1;
-            next++;
         } else if (*next == 't' || *next == 'T') {
             KMP_DEBUG_ASSERT(flagT == 0);
             __kmp_place_num_threads_per_core = num;
             flagC = 1; // num_cores could be skipped ?
             flagT = 1;
             next++; // can have core-offset specified after num threads
         } else if (*next == '\0') {
             KMP_DEBUG_ASSERT(flagC); // 4x2 means 4 cores 2 threads per core
#define CHECK_DELIM(_x)   (*(_x) == ',' || *(_x) == 'x')
     }
 
     // Get third value (could be core-offset, num_cores, num_threads)
     if (*next >= '0' && *next <= '9') {
         prev = next;
         SKIP_DIGITS(next);
         num = __kmp_str_to_int(prev, *next);
         SKIP_WS(next);
-        if (*next == 'c' || *next == 'C') {
+        if (*next == 't' || *next == 'T') {
+            KMP_DEBUG_ASSERT(flagT == 0);
+            __kmp_place_num_threads_per_core = num;
+            if (flagC == 0)
+                return; // num_cores could be skipped (e.g. 2s,4o,2t)
+            flagT = 1;
+            next++; // can have core-offset specified later (e.g. 2s,1c,2t,3o)
+        } else if (*next == 'c' || *next == 'C') {
             KMP_DEBUG_ASSERT(flagC == 0);
             __kmp_place_num_cores = num;
             flagC = 1;
             next++;
+            //KMP_DEBUG_ASSERT(*next != '@'); // socket offset used "o" designator
         } else if (*next == 'o' || *next == 'O') {
+            KMP_WARNING(AffThrPlaceDeprecated);
+            single_warning = 1;
             KMP_DEBUG_ASSERT(flagC);
+            //KMP_DEBUG_ASSERT(!flagSO); // socket offset couldn't use @ designator
             __kmp_place_core_offset = num;
             next++;
-        } else if (*next == 't' || *next == 'T') {
-            KMP_DEBUG_ASSERT(flagT == 0);
-            __kmp_place_num_threads_per_core = num;
-            if (flagC == 0)
-                return; // num_cores could be skipped (e.g. 2s,4o,2t)
-            flagT = 1;
-            next++; // can have core-offset specified later (e.g. 2s,1c,2t,3o)
         } else {
             KMP_WARNING(AffThrPlaceInvalid, name, value);
             return;
         }
     } else {
         KMP_WARNING(AffThrPlaceInvalid, name, value);
         return;
     }
     KMP_DEBUG_ASSERT(flagC);
     SKIP_WS(next);
     if ( *next == '\0' )
             return;
     if (CHECK_DELIM(next)) {
         next++;   // skip delimiter
         SKIP_WS(next);
     }
 
     // Get 4-th value (could be core-offset, num_threads)
     if (*next >= '0' && *next <= '9') {
         prev = next;
         SKIP_DIGITS(next);
         num = __kmp_str_to_int(prev, *next);
         SKIP_WS(next);
         if (*next == 'o' || *next == 'O') {
+            if (!single_warning) { // warn once
+                KMP_WARNING(AffThrPlaceDeprecated);
+            }
+            KMP_DEBUG_ASSERT(!flagSO); // socket offset couldn't use @ designator
             __kmp_place_core_offset = num;
             next++;
         } else if (*next == 't' || *next == 'T') {
             KMP_DEBUG_ASSERT(flagT == 0);
             __kmp_place_num_threads_per_core = num;
             flagT = 1;
             next++; // can have core-offset specified after num threads
         } else {
#define CHECK_DELIM(_x)   (*(_x) == ',' || *(_x) == 'x')
 
     // Get 5-th value (could be core-offset, num_threads)
     if (*next >= '0' && *next <= '9') {
         prev = next;
         SKIP_DIGITS(next);
         num = __kmp_str_to_int(prev, *next);
         SKIP_WS(next);
         if (*next == 'o' || *next == 'O') {
+            if (!single_warning) { // warn once
+                KMP_WARNING(AffThrPlaceDeprecated);
+            }
             KMP_DEBUG_ASSERT(flagT);
+            KMP_DEBUG_ASSERT(!flagSO); // socket offset couldn't use @ designator
             __kmp_place_core_offset = num;
         } else if (*next == 't' || *next == 'T') {
             KMP_DEBUG_ASSERT(flagT == 0);
             __kmp_place_num_threads_per_core = num;
         } else {
             KMP_WARNING(AffThrPlaceInvalid, name, value);
         }
     } else {
if (__kmp_place_num_sockets + __kmp_place_num_cores + __kmp_place_num_threads_per_core) {
         __kmp_str_buf_init(&buf);
         if(__kmp_env_format)
             KMP_STR_BUF_PRINT_NAME_EX(name);
         else
             __kmp_str_buf_print(buffer, "   %s='", name);
         if (__kmp_place_num_sockets) {
             __kmp_str_buf_print(&buf, "%ds", __kmp_place_num_sockets);
             if (__kmp_place_socket_offset)
-                __kmp_str_buf_print(&buf, "@%do", __kmp_place_socket_offset);
+                __kmp_str_buf_print(&buf, "@%d", __kmp_place_socket_offset);
             comma = 1;
         }
         if (__kmp_place_num_cores) {
             __kmp_str_buf_print(&buf, "%s%dc", comma?",":"", __kmp_place_num_cores);
             if (__kmp_place_core_offset)
-                __kmp_str_buf_print(&buf, "@%do", __kmp_place_core_offset);
+                __kmp_str_buf_print(&buf, "@%d", __kmp_place_core_offset);
             comma = 1;
         }
         if (__kmp_place_num_threads_per_core)
             __kmp_str_buf_print(&buf, "%s%dt", comma?",":"", __kmp_place_num_threads_per_core);
         __kmp_str_buf_print(buffer, "%s'\n", buf.str );
         __kmp_str_buf_free(&buf);
 /*
     } else {