[OpenMP] Update allocator trait key/value definitions

[hbae]

Summary

Use new definitions introduced in 5.1 specification.

[AndreyChurbanov]

LGTM

openmp/runtime/src/include/omp.h.var

#   endif
     } omp_control_tool_t;
 
     extern int __KAI_KMPC_CONVENTION omp_control_tool(int, int, void*);
 
     /* OpenMP 5.0 Memory Management */
     typedef uintptr_t omp_uintptr_t;
 
     typedef enum {
-        omp_atk_threadmodel = 1,
+        omp_atk_sync_hint = 1,
         omp_atk_alignment = 2,
         omp_atk_access = 3,
         omp_atk_pool_size = 4,
         omp_atk_fallback = 5,
         omp_atk_fb_data = 6,
         omp_atk_pinned = 7,
         omp_atk_partition = 8
     } omp_alloctrait_key_t;
 
     typedef enum {
         omp_atv_false = 0,
         omp_atv_true = 1,
-        omp_atv_default = 2,
         omp_atv_contended = 3,
         omp_atv_uncontended = 4,
-        omp_atv_sequential = 5,
+        omp_atv_serialized = 5,
+        omp_atv_sequential = omp_atv_serialized, // (deprecated)
         omp_atv_private = 6,
         omp_atv_all = 7,
         omp_atv_thread = 8,
         omp_atv_pteam = 9,
         omp_atv_cgroup = 10,
         omp_atv_default_mem_fb = 11,
         omp_atv_null_fb = 12,
         omp_atv_abort_fb = 13,
         omp_atv_allocator_fb = 14,
         omp_atv_environment = 15,
         omp_atv_nearest = 16,
         omp_atv_blocked = 17,
         omp_atv_interleaved = 18
     } omp_alloctrait_value_t;
+    #define omp_atv_default ((omp_uintptr_t)-1)
 
     typedef struct {
         omp_alloctrait_key_t key;
         omp_uintptr_t value;
     } omp_alloctrait_t;
 
 #   if defined(_WIN32)
     // On Windows cl and icl do not support 64-bit enum, let's use integer then.

openmp/runtime/src/include/omp_lib.h.var

!
       parameter(omp_control_tool_notool=-2)
       integer(omp_control_tool_result_kind)omp_control_tool_nocallback
       parameter(omp_control_tool_nocallback=-1)
       integer(omp_control_tool_result_kind)omp_control_tool_success
       parameter(omp_control_tool_success=0)
       integer(omp_control_tool_result_kind)omp_control_tool_ignored
       parameter(omp_control_tool_ignored=1)
 
-      integer(kind=omp_alloctrait_key_kind)omp_atk_threadmodel
-      parameter(omp_atk_threadmodel=1)
+      integer(kind=omp_alloctrait_key_kind)omp_atk_sync_hint
+      parameter(omp_atk_sync_hint=1)
       integer(kind=omp_alloctrait_key_kind)omp_atk_alignment
       parameter(omp_atk_alignment=2)
       integer(kind=omp_alloctrait_key_kind)omp_atk_access
       parameter(omp_atk_access=3)
       integer(kind=omp_alloctrait_key_kind)omp_atk_pool_size
       parameter(omp_atk_pool_size=4)
       integer(kind=omp_alloctrait_key_kind)omp_atk_fallback
       parameter(omp_atk_fallback=5)
       integer(kind=omp_alloctrait_key_kind)omp_atk_fb_data
       parameter(omp_atk_fb_data=6)
       integer(kind=omp_alloctrait_key_kind)omp_atk_pinned
       parameter(omp_atk_pinned=7)
       integer(kind=omp_alloctrait_key_kind)omp_atk_partition
       parameter(omp_atk_partition=8)
 
+      integer(kind=omp_alloctrait_val_kind)omp_atv_default
+      parameter(omp_atv_default=-1)
       ! Reserved for future use
       integer(kind=omp_alloctrait_val_kind)omp_atv_false
       parameter(omp_atv_false=0)
       ! Reserved for future use
       integer(kind=omp_alloctrait_val_kind)omp_atv_true
       parameter(omp_atv_true=1)
-      integer(kind=omp_alloctrait_val_kind)omp_atv_default
-      parameter(omp_atv_default=2)
       integer(kind=omp_alloctrait_val_kind)omp_atv_contended
       parameter(omp_atv_contended=3)
       integer(kind=omp_alloctrait_val_kind)omp_atv_uncontended
       parameter(omp_atv_uncontended=4)
+      integer(kind=omp_alloctrait_val_kind)omp_atv_serialized
+      parameter(omp_atv_serialized=5)
       integer(kind=omp_alloctrait_val_kind)omp_atv_sequential
       parameter(omp_atv_sequential=5)
       integer(kind=omp_alloctrait_val_kind)omp_atv_private
       parameter(omp_atv_private=6)
       integer(kind=omp_alloctrait_val_kind)omp_atv_all
       parameter(omp_atv_all=7)
       integer(kind=omp_alloctrait_val_kind)omp_atv_thread
       parameter(omp_atv_thread=8)

openmp/runtime/src/include/omp_lib.f90.var

!
         integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_flush = 3
         integer (kind=omp_control_tool_kind), parameter :: omp_control_tool_end = 4
 
         integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_notool = -2
         integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_nocallback = -1
         integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_success = 0
         integer (kind=omp_control_tool_result_kind), parameter :: omp_control_tool_ignored = 1
 
-        integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_threadmodel = 1
+        integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_sync_hint = 1
         integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_alignment = 2
         integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_access = 3
         integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_pool_size = 4
         integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_fallback = 5
         integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_fb_data = 6
         integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_pinned = 7
         integer (kind=omp_alloctrait_key_kind), parameter :: omp_atk_partition = 8
 
+        integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_default = -1
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_false = 0
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_true = 1
-        integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_default = 2
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_contended = 3
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_uncontended = 4
-        integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_sequential = 5
+        integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_serialized = 5
+        integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_sequential = omp_atv_serialized
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_private = 6
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_all = 7
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_thread = 8
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_pteam = 9
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_cgroup = 10
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_default_mem_fb = 11
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_null_fb = 12
         integer (kind=omp_alloctrait_val_kind), parameter :: omp_atv_abort_fb = 13

openmp/runtime/src/kmp.h

 
 /* OpenMP 5.0 Memory Management support */
 
 #ifndef __OMP_H
 // Duplicate type definitions from omp.h
 typedef uintptr_t omp_uintptr_t;
 
 typedef enum {
-  omp_atk_threadmodel = 1,
+  omp_atk_sync_hint = 1,
   omp_atk_alignment = 2,
   omp_atk_access = 3,
   omp_atk_pool_size = 4,
   omp_atk_fallback = 5,
   omp_atk_fb_data = 6,
   omp_atk_pinned = 7,
   omp_atk_partition = 8
 } omp_alloctrait_key_t;
 
 typedef enum {
   omp_atv_false = 0,
   omp_atv_true = 1,
-  omp_atv_default = 2,
   omp_atv_contended = 3,
   omp_atv_uncontended = 4,
-  omp_atv_sequential = 5,
+  omp_atv_serialized = 5,
+  omp_atv_sequential = omp_atv_serialized, // (deprecated)
   omp_atv_private = 6,
   omp_atv_all = 7,
   omp_atv_thread = 8,
   omp_atv_pteam = 9,
   omp_atv_cgroup = 10,
   omp_atv_default_mem_fb = 11,
   omp_atv_null_fb = 12,
   omp_atv_abort_fb = 13,
   omp_atv_allocator_fb = 14,
   omp_atv_environment = 15,
   omp_atv_nearest = 16,
   omp_atv_blocked = 17,
   omp_atv_interleaved = 18
 } omp_alloctrait_value_t;
+#define omp_atv_default ((omp_uintptr_t)-1)
 
 typedef void *omp_memspace_handle_t;
 extern omp_memspace_handle_t const omp_default_mem_space;
 extern omp_memspace_handle_t const omp_large_cap_mem_space;
 extern omp_memspace_handle_t const omp_const_mem_space;
 extern omp_memspace_handle_t const omp_high_bw_mem_space;
 extern omp_memspace_handle_t const omp_low_lat_mem_space;
 

openmp/runtime/src/kmp_alloc.cpp

KMP_DEBUG_ASSERT(ms == omp_default_mem_space || ms == omp_low_lat_mem_space ||
                    ms == omp_large_cap_mem_space || ms == omp_const_mem_space ||
                    ms == omp_high_bw_mem_space);
   kmp_allocator_t *al;
   int i;
   al = (kmp_allocator_t *)__kmp_allocate(sizeof(kmp_allocator_t)); // zeroed
   al->memspace = ms; // not used currently
   for (i = 0; i < ntraits; ++i) {
     switch (traits[i].key) {
-    case omp_atk_threadmodel:
+    case omp_atk_sync_hint:
     case omp_atk_access:
     case omp_atk_pinned:
       break;
     case omp_atk_alignment:
       __kmp_type_convert(traits[i].value, &(al->alignment));
       KMP_ASSERT(IS_POWER_OF_TWO(al->alignment));
       break;
     case omp_atk_pool_size: