[Openmp-commits] [openmp] d345fe7 - [OpenMP][libomp] NFC: Move omp_* functions out of kmp_* section

[Jonathan Peyton via Openmp-commits]

Author: Jonathan Peyton
Date: 2022-03-31T13:39:30-05:00
New Revision: d345fe7c221f34c84d0f5c55c5153c0020ca1d10

URL: https://github.com/llvm/llvm-project/commit/d345fe7c221f34c84d0f5c55c5153c0020ca1d10
DIFF: https://github.com/llvm/llvm-project/commit/d345fe7c221f34c84d0f5c55c5153c0020ca1d10.diff

LOG: [OpenMP][libomp] NFC: Move omp_* functions out of kmp_* section

Added: 
    

Modified: 
    openmp/runtime/src/include/omp_lib.f90.var
    openmp/runtime/src/include/omp_lib.h.var

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/src/include/omp_lib.f90.var b/openmp/runtime/src/include/omp_lib.f90.var
index 5feb299236bb7..12474b6c4bcb7 100644
--- a/openmp/runtime/src/include/omp_lib.f90.var
+++ b/openmp/runtime/src/include/omp_lib.f90.var
@@ -480,6 +480,26 @@
             integer (kind=omp_integer_kind) omp_get_max_task_priority
           end function omp_get_max_task_priority
 
+          subroutine omp_init_lock_with_hint(svar, hint) bind(c)
+            use omp_lib_kinds
+            integer (kind=omp_lock_kind) svar
+            integer (kind=omp_lock_hint_kind), value :: hint
+          end subroutine omp_init_lock_with_hint
+
+          subroutine omp_init_nest_lock_with_hint(nvar, hint) bind(c)
+            use omp_lib_kinds
+            integer (kind=omp_nest_lock_kind) nvar
+            integer (kind=omp_lock_hint_kind), value :: hint
+          end subroutine omp_init_nest_lock_with_hint
+
+          function omp_control_tool(command, modifier, arg) bind(c)
+            use omp_lib_kinds
+            integer (kind=omp_integer_kind) omp_control_tool
+            integer (kind=omp_control_tool_kind), value :: command
+            integer (kind=omp_control_tool_kind), value :: modifier
+            integer (kind=kmp_pointer_kind), optional :: arg
+          end function omp_control_tool
+
           function omp_init_allocator(memspace, ntraits, traits)
             use omp_lib_kinds
             integer (kind=omp_allocator_handle_kind) omp_init_allocator
@@ -549,7 +569,6 @@
             logical (kind=omp_logical_kind), value :: verbose
           end subroutine omp_display_env
 
-
           function omp_target_alloc(size, device_num) bind(c)
             use omp_lib_kinds
             type(c_ptr) omp_target_alloc
@@ -859,26 +878,6 @@
             logical (kind=omp_logical_kind) kmp_get_cancellation_status
           end function kmp_get_cancellation_status
 
-          subroutine omp_init_lock_with_hint(svar, hint) bind(c)
-            use omp_lib_kinds
-            integer (kind=omp_lock_kind) svar
-            integer (kind=omp_lock_hint_kind), value :: hint
-          end subroutine omp_init_lock_with_hint
-
-          subroutine omp_init_nest_lock_with_hint(nvar, hint) bind(c)
-            use omp_lib_kinds
-            integer (kind=omp_nest_lock_kind) nvar
-            integer (kind=omp_lock_hint_kind), value :: hint
-          end subroutine omp_init_nest_lock_with_hint
-
-          function omp_control_tool(command, modifier, arg) bind(c)
-            use omp_lib_kinds
-            integer (kind=omp_integer_kind) omp_control_tool
-            integer (kind=omp_control_tool_kind), value :: command
-            integer (kind=omp_control_tool_kind), value :: modifier
-            integer (kind=kmp_pointer_kind), optional :: arg
-          end function omp_control_tool
-
         end interface
 
       end module omp_lib

diff  --git a/openmp/runtime/src/include/omp_lib.h.var b/openmp/runtime/src/include/omp_lib.h.var
index 987de7b7db70b..a2094f45b0caa 100644
--- a/openmp/runtime/src/include/omp_lib.h.var
+++ b/openmp/runtime/src/include/omp_lib.h.var
@@ -574,6 +574,26 @@
           integer (kind=omp_integer_kind) omp_get_max_task_priority
         end function omp_get_max_task_priority
 
+        subroutine omp_init_lock_with_hint(svar, hint) bind(c)
+          import
+          integer (kind=omp_lock_kind) svar
+          integer (kind=omp_lock_hint_kind), value :: hint
+        end subroutine omp_init_lock_with_hint
+
+        subroutine omp_init_nest_lock_with_hint(nvar, hint) bind(c)
+          import
+          integer (kind=omp_nest_lock_kind) nvar
+          integer (kind=omp_lock_hint_kind), value :: hint
+        end subroutine omp_init_nest_lock_with_hint
+
+        function omp_control_tool(command, modifier, arg) bind(c)
+          import
+          integer (kind=omp_integer_kind) omp_control_tool
+          integer (kind=omp_control_tool_kind), value :: command
+          integer (kind=omp_control_tool_kind), value :: modifier
+          integer (kind=kmp_pointer_kind), optional :: arg
+        end function omp_control_tool
+
         function omp_init_allocator(memspace, ntraits, traits)
           import
           integer (omp_allocator_handle_kind) omp_init_allocator
@@ -948,27 +968,6 @@
 
         subroutine kmp_set_warnings_off() bind(c)
         end subroutine kmp_set_warnings_off
-
-        subroutine omp_init_lock_with_hint(svar, hint) bind(c)
-          import
-          integer (kind=omp_lock_kind) svar
-          integer (kind=omp_lock_hint_kind), value :: hint
-        end subroutine omp_init_lock_with_hint
-
-        subroutine omp_init_nest_lock_with_hint(nvar, hint) bind(c)
-          import
-          integer (kind=omp_nest_lock_kind) nvar
-          integer (kind=omp_lock_hint_kind), value :: hint
-        end subroutine omp_init_nest_lock_with_hint
-
-        function omp_control_tool(command, modifier, arg) bind(c)
-          import
-          integer (kind=omp_integer_kind) omp_control_tool
-          integer (kind=omp_control_tool_kind), value :: command
-          integer (kind=omp_control_tool_kind), value :: modifier
-          integer (kind=kmp_pointer_kind), optional :: arg
-        end function omp_control_tool
-
       end interface
 
 !DIR$ IF DEFINED (__INTEL_OFFLOAD)