intermediate changes

ref:51d474bda1b99a2cf73ca7da0cd5398ef5683bf4

1 files changed, 25 insertions, 352 deletions

diff --git a/contrib/libs/cxxsupp/openmp/omp.h b/contrib/libs/cxxsupp/openmp/omp.h
index cb2fe495993..2dee5600ecd 100644
--- a/contrib/libs/cxxsupp/openmp/omp.h
+++ b/contrib/libs/cxxsupp/openmp/omp.h
@@ -1,13 +1,14 @@
 /*
- * include/omp.h.var
+ * include/41/omp.h.var
  */
 
 
 //===----------------------------------------------------------------------===//
 //
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.txt for details.
 //
 //===----------------------------------------------------------------------===//
 
@@ -15,15 +16,6 @@
 #ifndef __OMP_H
 #   define __OMP_H
 
-#if 0  // !defined(NORUNTIME) && !defined(USE_STL_SYSTEM)
-    // We need to put all possible dependencies to prevent blinking:
-    // on all stdlib.h that can be mentioned here within a platform.
-#   include <contrib/libs/cxxsupp/libcxx/include/stdlib.h>
-#else
-#   include <stdlib.h>
-#endif
-#   include <stdint.h>
-
 #   define KMP_VERSION_MAJOR    5
 #   define KMP_VERSION_MINOR    0
 #   define KMP_VERSION_BUILD    20140926
@@ -33,30 +25,18 @@
     extern "C" {
 #   endif
 
-#   define omp_set_affinity_format   ompc_set_affinity_format
-#   define omp_get_affinity_format   ompc_get_affinity_format
-#   define omp_display_affinity      ompc_display_affinity
-#   define omp_capture_affinity      ompc_capture_affinity
-
 #   if defined(_WIN32)
 #       define __KAI_KMPC_CONVENTION __cdecl
-#       ifndef __KMP_IMP
-#           define __KMP_IMP __declspec(dllimport)
-#       endif
 #   else
 #       define __KAI_KMPC_CONVENTION
-#       ifndef __KMP_IMP
-#           define __KMP_IMP
-#       endif
 #   endif
 
     /* schedule kind constants */
     typedef enum omp_sched_t {
-        omp_sched_static  = 1,
-        omp_sched_dynamic = 2,
-        omp_sched_guided  = 3,
-        omp_sched_auto    = 4,
-        omp_sched_monotonic = 0x80000000
+	omp_sched_static  = 1,
+	omp_sched_dynamic = 2,
+	omp_sched_guided  = 3,
+	omp_sched_auto    = 4
     } omp_sched_t;
 
     /* set API functions */
@@ -82,7 +62,6 @@
     extern int    __KAI_KMPC_CONVENTION  omp_get_thread_limit        (void);
     extern int    __KAI_KMPC_CONVENTION  omp_get_max_active_levels   (void);
     extern void   __KAI_KMPC_CONVENTION  omp_get_schedule            (omp_sched_t *, int *);
-    extern int    __KAI_KMPC_CONVENTION  omp_get_max_task_priority   (void);
 
     /* lock API functions */
     typedef struct omp_lock_t {
@@ -106,25 +85,17 @@
     extern void   __KAI_KMPC_CONVENTION  omp_destroy_nest_lock (omp_nest_lock_t *);
     extern int    __KAI_KMPC_CONVENTION  omp_test_nest_lock    (omp_nest_lock_t *);
 
-    /* OpenMP 5.0  Synchronization hints*/
-    typedef enum omp_sync_hint_t {
-        omp_sync_hint_none           = 0,
-        omp_lock_hint_none           = omp_sync_hint_none,
-        omp_sync_hint_uncontended    = 1,
-        omp_lock_hint_uncontended    = omp_sync_hint_uncontended,
-        omp_sync_hint_contended      = (1<<1),
-        omp_lock_hint_contended      = omp_sync_hint_contended,
-        omp_sync_hint_nonspeculative = (1<<2),
-        omp_lock_hint_nonspeculative = omp_sync_hint_nonspeculative,
-        omp_sync_hint_speculative    = (1<<3),
-        omp_lock_hint_speculative    = omp_sync_hint_speculative,
+    /* lock hint type for dynamic user lock */
+    typedef enum omp_lock_hint_t {
+        omp_lock_hint_none           = 0,
+        omp_lock_hint_uncontended    = 1,
+        omp_lock_hint_contended      = (1<<1 ),
+        omp_lock_hint_nonspeculative = (1<<2 ),
+        omp_lock_hint_speculative    = (1<<3 ),
         kmp_lock_hint_hle            = (1<<16),
         kmp_lock_hint_rtm            = (1<<17),
         kmp_lock_hint_adaptive       = (1<<18)
-    } omp_sync_hint_t;
-
-    /* lock hint type for dynamic user lock */
-    typedef omp_sync_hint_t omp_lock_hint_t;
+    } omp_lock_hint_t;
 
     /* hinted lock initializers */
     extern void __KAI_KMPC_CONVENTION omp_init_lock_with_hint(omp_lock_t *, omp_lock_hint_t);
@@ -143,110 +114,13 @@
     extern int  __KAI_KMPC_CONVENTION  omp_get_team_num (void);
     extern int  __KAI_KMPC_CONVENTION  omp_get_cancellation (void);
 
-    /* OpenMP 4.5 */
-    extern int   __KAI_KMPC_CONVENTION  omp_get_initial_device (void);
-    extern void* __KAI_KMPC_CONVENTION  omp_target_alloc(size_t, int);
-    extern void  __KAI_KMPC_CONVENTION  omp_target_free(void *, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_is_present(const void *, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_memcpy(void *, const void *, size_t, size_t, size_t, int, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_memcpy_rect(void *, const void *, size_t, int, const size_t *,
-                                            const size_t *, const size_t *, const size_t *, const size_t *, int, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_associate_ptr(const void *, const void *, size_t, size_t, int);
-    extern int   __KAI_KMPC_CONVENTION  omp_target_disassociate_ptr(const void *, int);
-
-    /* OpenMP 5.0 */
-    extern int   __KAI_KMPC_CONVENTION  omp_get_device_num (void);
-    typedef void * omp_depend_t;
-
-    /* OpenMP 5.1 interop */
-    typedef intptr_t omp_intptr_t;
-
-    /* 0..omp_get_num_interop_properties()-1 are reserved for implementation-defined properties */
-    typedef enum omp_interop_property {
-        omp_ipr_fr_id = -1,
-        omp_ipr_fr_name = -2,
-        omp_ipr_vendor = -3,
-        omp_ipr_vendor_name = -4,
-        omp_ipr_device_num = -5,
-        omp_ipr_platform = -6,
-        omp_ipr_device = -7,
-        omp_ipr_device_context = -8,
-        omp_ipr_targetsync = -9,
-        omp_ipr_first = -9
-    } omp_interop_property_t;
-
-    #define omp_interop_none 0
-
-    typedef enum omp_interop_rc {
-        omp_irc_no_value = 1,
-        omp_irc_success = 0,
-        omp_irc_empty = -1,
-        omp_irc_out_of_range = -2,
-        omp_irc_type_int = -3,
-        omp_irc_type_ptr = -4,
-        omp_irc_type_str = -5,
-        omp_irc_other = -6
-    } omp_interop_rc_t;
-
-    typedef enum omp_interop_fr {
-        omp_ifr_cuda = 1,
-        omp_ifr_cuda_driver = 2,
-        omp_ifr_opencl = 3,
-        omp_ifr_sycl = 4,
-        omp_ifr_hip = 5,
-        omp_ifr_level_zero = 6,
-        omp_ifr_last = 7
-    } omp_interop_fr_t;
-
-    typedef void * omp_interop_t;
-
-    /*!
-     * The `omp_get_num_interop_properties` routine retrieves the number of implementation-defined properties available for an `omp_interop_t` object.
-     */
-    extern int          __KAI_KMPC_CONVENTION  omp_get_num_interop_properties(const omp_interop_t);
-    /*!
-     * The `omp_get_interop_int` routine retrieves an integer property from an `omp_interop_t` object.
-     */
-    extern omp_intptr_t __KAI_KMPC_CONVENTION  omp_get_interop_int(const omp_interop_t, omp_interop_property_t, int *);
-    /*!
-     * The `omp_get_interop_ptr` routine retrieves a pointer property from an `omp_interop_t` object.
-     */
-    extern void *       __KAI_KMPC_CONVENTION  omp_get_interop_ptr(const omp_interop_t, omp_interop_property_t, int *);
-    /*!
-     * The `omp_get_interop_str` routine retrieves a string property from an `omp_interop_t` object.
-     */
-    extern const char * __KAI_KMPC_CONVENTION  omp_get_interop_str(const omp_interop_t, omp_interop_property_t, int *);
-    /*!
-     * The `omp_get_interop_name` routine retrieves a property name from an `omp_interop_t` object.
-     */
-    extern const char * __KAI_KMPC_CONVENTION  omp_get_interop_name(const omp_interop_t, omp_interop_property_t);
-    /*!
-     * The `omp_get_interop_type_desc` routine retrieves a description of the type of a property associated with an `omp_interop_t` object.
-     */
-    extern const char * __KAI_KMPC_CONVENTION  omp_get_interop_type_desc(const omp_interop_t, omp_interop_property_t);
-    /*!
-     * The `omp_get_interop_rc_desc` routine retrieves a description of the return code associated with an `omp_interop_t` object.
-     */
-    extern const char * __KAI_KMPC_CONVENTION  omp_get_interop_rc_desc(const omp_interop_t, omp_interop_rc_t);
-
-    /* OpenMP 5.1 device memory routines */
-
-    /*!
-     * The `omp_target_memcpy_async` routine asynchronously performs a copy between any combination of host and device pointers.
-     */
-    extern int    __KAI_KMPC_CONVENTION  omp_target_memcpy_async(void *, const void *, size_t, size_t, size_t, int,
-                                             int, int, omp_depend_t *);
-    /*!
-     * The `omp_target_memcpy_rect_async` routine asynchronously performs a copy between any combination of host and device pointers.
-     */
-    extern int    __KAI_KMPC_CONVENTION  omp_target_memcpy_rect_async(void *, const void *, size_t, int, const size_t *,
-                                             const size_t *, const size_t *, const size_t *, const size_t *, int, int,
-                                             int, omp_depend_t *);
-    /*!
-     * The `omp_get_mapped_ptr` routine returns the device pointer that is associated with a host pointer for a given device.
-     */
-    extern void * __KAI_KMPC_CONVENTION  omp_get_mapped_ptr(const void *, int);
-    extern int    __KAI_KMPC_CONVENTION  omp_target_is_accessible(const void *, size_t, int);
+#if 0  // !defined(NORUNTIME) && !defined(USE_STL_SYSTEM)
+    // We need to put all possible dependencies to prevent blinking:
+    // on all stdlib.h that can be mentioned here within a platform.
+#   include <contrib/libs/cxxsupp/libcxx/include/stdlib.h>
+#else
+#   include <stdlib.h>
+#endif
 
     /* kmp API functions */
     extern int    __KAI_KMPC_CONVENTION  kmp_get_stacksize          (void);
@@ -261,7 +135,6 @@
     extern void   __KAI_KMPC_CONVENTION  kmp_set_library_turnaround (void);
     extern void   __KAI_KMPC_CONVENTION  kmp_set_library_throughput (void);
     extern void   __KAI_KMPC_CONVENTION  kmp_set_defaults           (char const *);
-    extern void   __KAI_KMPC_CONVENTION  kmp_set_disp_num_buffers   (int);
 
     /* Intel affinity API */
     typedef void * kmp_affinity_mask_t;
@@ -286,16 +159,7 @@
 
     extern omp_proc_bind_t __KAI_KMPC_CONVENTION omp_get_proc_bind (void);
 
-    /* OpenMP 4.5 affinity API */
-    extern int  __KAI_KMPC_CONVENTION omp_get_num_places (void);
-    extern int  __KAI_KMPC_CONVENTION omp_get_place_num_procs (int);
-    extern void __KAI_KMPC_CONVENTION omp_get_place_proc_ids (int, int *);
-    extern int  __KAI_KMPC_CONVENTION omp_get_place_num (void);
-    extern int  __KAI_KMPC_CONVENTION omp_get_partition_num_places (void);
-    extern void __KAI_KMPC_CONVENTION omp_get_partition_place_nums (int *);
-
     extern void * __KAI_KMPC_CONVENTION  kmp_malloc  (size_t);
-    extern void * __KAI_KMPC_CONVENTION  kmp_aligned_malloc  (size_t, size_t);
     extern void * __KAI_KMPC_CONVENTION  kmp_calloc  (size_t, size_t);
     extern void * __KAI_KMPC_CONVENTION  kmp_realloc (void *, size_t);
     extern void   __KAI_KMPC_CONVENTION  kmp_free    (void *);
@@ -303,199 +167,7 @@
     extern void   __KAI_KMPC_CONVENTION  kmp_set_warnings_on(void);
     extern void   __KAI_KMPC_CONVENTION  kmp_set_warnings_off(void);
 
-    /* OpenMP 5.0 Tool Control */
-    typedef enum omp_control_tool_result_t {
-        omp_control_tool_notool = -2,
-        omp_control_tool_nocallback = -1,
-        omp_control_tool_success = 0,
-        omp_control_tool_ignored = 1
-    } omp_control_tool_result_t;
-
-    typedef enum omp_control_tool_t {
-        omp_control_tool_start = 1,
-        omp_control_tool_pause = 2,
-        omp_control_tool_flush = 3,
-        omp_control_tool_end = 4
-    } 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_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_contended = 3,
-        omp_atv_uncontended = 4,
-        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.
-    typedef omp_uintptr_t omp_allocator_handle_t;
-    extern __KMP_IMP omp_allocator_handle_t const omp_null_allocator;
-    extern __KMP_IMP omp_allocator_handle_t const omp_default_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const omp_large_cap_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const omp_const_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const omp_high_bw_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const omp_low_lat_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const omp_cgroup_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const omp_pteam_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const omp_thread_mem_alloc;
-    /* Preview of target memory support */
-    extern __KMP_IMP omp_allocator_handle_t const llvm_omp_target_host_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const llvm_omp_target_shared_mem_alloc;
-    extern __KMP_IMP omp_allocator_handle_t const llvm_omp_target_device_mem_alloc;
-
-    typedef omp_uintptr_t omp_memspace_handle_t;
-    extern __KMP_IMP omp_memspace_handle_t const omp_default_mem_space;
-    extern __KMP_IMP omp_memspace_handle_t const omp_large_cap_mem_space;
-    extern __KMP_IMP omp_memspace_handle_t const omp_const_mem_space;
-    extern __KMP_IMP omp_memspace_handle_t const omp_high_bw_mem_space;
-    extern __KMP_IMP omp_memspace_handle_t const omp_low_lat_mem_space;
-    /* Preview of target memory support */
-    extern __KMP_IMP omp_memspace_handle_t const llvm_omp_target_host_mem_space;
-    extern __KMP_IMP omp_memspace_handle_t const llvm_omp_target_shared_mem_space;
-    extern __KMP_IMP omp_memspace_handle_t const llvm_omp_target_device_mem_space;
-#   else
-#       if __cplusplus >= 201103
-    typedef enum omp_allocator_handle_t : omp_uintptr_t
-#       else
-    typedef enum omp_allocator_handle_t
-#       endif
-    {
-      omp_null_allocator = 0,
-      omp_default_mem_alloc = 1,
-      omp_large_cap_mem_alloc = 2,
-      omp_const_mem_alloc = 3,
-      omp_high_bw_mem_alloc = 4,
-      omp_low_lat_mem_alloc = 5,
-      omp_cgroup_mem_alloc = 6,
-      omp_pteam_mem_alloc = 7,
-      omp_thread_mem_alloc = 8,
-      /* Preview of target memory support */
-      llvm_omp_target_host_mem_alloc = 100,
-      llvm_omp_target_shared_mem_alloc = 101,
-      llvm_omp_target_device_mem_alloc = 102,
-      KMP_ALLOCATOR_MAX_HANDLE = UINTPTR_MAX
-    } omp_allocator_handle_t;
-#       if __cplusplus >= 201103
-    typedef enum omp_memspace_handle_t : omp_uintptr_t
-#       else
-    typedef enum omp_memspace_handle_t
-#       endif
-    {
-      omp_default_mem_space = 0,
-      omp_large_cap_mem_space = 1,
-      omp_const_mem_space = 2,
-      omp_high_bw_mem_space = 3,
-      omp_low_lat_mem_space = 4,
-      /* Preview of target memory support */
-      llvm_omp_target_host_mem_space = 100,
-      llvm_omp_target_shared_mem_space = 101,
-      llvm_omp_target_device_mem_space = 102,
-      KMP_MEMSPACE_MAX_HANDLE = UINTPTR_MAX
-    } omp_memspace_handle_t;
-#   endif
-    extern omp_allocator_handle_t __KAI_KMPC_CONVENTION omp_init_allocator(omp_memspace_handle_t m,
-                                                       int ntraits, omp_alloctrait_t traits[]);
-    extern void __KAI_KMPC_CONVENTION omp_destroy_allocator(omp_allocator_handle_t allocator);
-
-    extern void __KAI_KMPC_CONVENTION omp_set_default_allocator(omp_allocator_handle_t a);
-    extern omp_allocator_handle_t __KAI_KMPC_CONVENTION omp_get_default_allocator(void);
-#   ifdef __cplusplus
-    extern void *__KAI_KMPC_CONVENTION omp_alloc(size_t size, omp_allocator_handle_t a = omp_null_allocator);
-    extern void *__KAI_KMPC_CONVENTION omp_calloc(size_t nmemb, size_t size, omp_allocator_handle_t a = omp_null_allocator);
-    extern void *__KAI_KMPC_CONVENTION omp_realloc(void *ptr, size_t size,
-                                                   omp_allocator_handle_t allocator = omp_null_allocator,
-                                                   omp_allocator_handle_t free_allocator = omp_null_allocator);
-    extern void __KAI_KMPC_CONVENTION omp_free(void * ptr, omp_allocator_handle_t a = omp_null_allocator);
-#   else
-    extern void *__KAI_KMPC_CONVENTION omp_alloc(size_t size, omp_allocator_handle_t a);
-    extern void *__KAI_KMPC_CONVENTION omp_calloc(size_t nmemb, size_t size, omp_allocator_handle_t a);
-    extern void *__KAI_KMPC_CONVENTION omp_realloc(void *ptr, size_t size, omp_allocator_handle_t allocator,
-                                                   omp_allocator_handle_t free_allocator);
-    extern void __KAI_KMPC_CONVENTION omp_free(void *ptr, omp_allocator_handle_t a);
-#   endif
-
-    /* OpenMP 5.0 Affinity Format */
-    extern void __KAI_KMPC_CONVENTION omp_set_affinity_format(char const *);
-    extern size_t __KAI_KMPC_CONVENTION omp_get_affinity_format(char *, size_t);
-    extern void __KAI_KMPC_CONVENTION omp_display_affinity(char const *);
-    extern size_t __KAI_KMPC_CONVENTION omp_capture_affinity(char *, size_t, char const *);
-
-    /* OpenMP 5.0 events */
-#   if defined(_WIN32)
-    // On Windows cl and icl do not support 64-bit enum, let's use integer then.
-    typedef omp_uintptr_t omp_event_handle_t;
-#   else
-    typedef enum omp_event_handle_t { KMP_EVENT_MAX_HANDLE = UINTPTR_MAX } omp_event_handle_t;
-#   endif
-    extern void __KAI_KMPC_CONVENTION omp_fulfill_event ( omp_event_handle_t event );
-
-    /* OpenMP 5.0 Pause Resources */
-    typedef enum omp_pause_resource_t {
-      omp_pause_resume = 0,
-      omp_pause_soft = 1,
-      omp_pause_hard = 2
-    } omp_pause_resource_t;
-    extern int __KAI_KMPC_CONVENTION omp_pause_resource(omp_pause_resource_t, int);
-    extern int __KAI_KMPC_CONVENTION omp_pause_resource_all(omp_pause_resource_t);
-
-    extern int __KAI_KMPC_CONVENTION omp_get_supported_active_levels(void);
-
-    /* OpenMP 5.1 */
-    extern void __KAI_KMPC_CONVENTION omp_set_num_teams(int num_teams);
-    extern int __KAI_KMPC_CONVENTION omp_get_max_teams(void);
-    extern void __KAI_KMPC_CONVENTION omp_set_teams_thread_limit(int limit);
-    extern int __KAI_KMPC_CONVENTION omp_get_teams_thread_limit(void);
-
-    /* OpenMP 5.1 Display Environment */
-    extern void omp_display_env(int verbose);
-
-#   if defined(_OPENMP) && _OPENMP >= 201811
-    #pragma omp begin declare variant match(device={kind(host)})
-    static inline int omp_is_initial_device(void) { return 1; }
-    #pragma omp end declare variant
-    #pragma omp begin declare variant match(device={kind(nohost)})
-    static inline int omp_is_initial_device(void) { return 0; }
-    #pragma omp end declare variant
-#   endif
-
 #   undef __KAI_KMPC_CONVENTION
-#   undef __KMP_IMP
 
     /* Warning:
        The following typedefs are not standard, deprecated and will be removed in a future release.
@@ -508,3 +180,4 @@
 #   endif
 
 #endif /* __OMP_H */
+