Moving group barrier function declarations to spv_fn_declarations

Author: adarshyoga

numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_atomic_ref_overloads.py

@@ -32,7 +32,7 @@
     get_memory_semantics_mask,
     get_scope,
 )
-from .spv_atomic_fn_declarations import (
+from .spv_fn_declarations import (
     _SUPPORT_CONVERGENT,
     get_or_insert_atomic_load_fn,
     get_or_insert_spv_atomic_compare_exchange_fn,

numba_dpex/experimental/_kernel_dpcpp_spirv_overloads/_group_barrier_overloads.py

@@ -3,23 +3,25 @@
 # SPDX-License-Identifier: Apache-2.0
 
 """
-Provides overloads for functions included in kernel_iface.barrier that
+Provides overloads for functions included in kernel_api.barrier that
 generate dpcpp SPIR-V LLVM IR intrinsic function calls.
 """
 
 from llvmlite import ir as llvmir
-from numba.core import cgutils, types
+from numba.core import types
 from numba.core.errors import TypingError
 from numba.extending import intrinsic, overload
 
-from numba_dpex.core import itanium_mangler as ext_itanium_mangler
 from numba_dpex.core.types.kernel_api.index_space_ids import GroupType
 from numba_dpex.experimental.target import DPEX_KERNEL_EXP_TARGET_NAME
 from numba_dpex.kernel_api import group_barrier
 from numba_dpex.kernel_api.memory_enums import MemoryOrder, MemoryScope
 
 from ._spv_atomic_inst_helper import get_memory_semantics_mask, get_scope
-from .spv_atomic_fn_declarations import _SUPPORT_CONVERGENT
+from .spv_fn_declarations import (
+    _SUPPORT_CONVERGENT,
+    get_or_insert_spv_group_barrier_fn,
+)
 
 
 def _get_memory_scope(fence_scope):
@@ -35,7 +37,7 @@ def _intrinsic_barrier(
     ty_mem_scope,  # pylint: disable=unused-argument
     ty_spirv_mem_sem_mask,  # pylint: disable=unused-argument
 ):
-    # Signature of `__spirv_control_barrier` call that is
+    # Signature of `__spirv_ControlBarrier` call that is
     # generated for group_barrier. It takes three arguments -
     # exec_scope, memory_scope and memory_semantics_mask.
     # All arguments have to be of type unsigned int32.
@@ -44,42 +46,17 @@ def _intrinsic_barrier(
     def _intrinsic_barrier_codegen(
         context, builder, sig, args  # pylint: disable=unused-argument
     ):
-        exec_scope_arg = builder.trunc(args[0], llvmir.IntType(32))
-        mem_scope_arg = builder.trunc(args[1], llvmir.IntType(32))
-        spirv_memory_semantics_mask_arg = builder.trunc(
-            args[2], llvmir.IntType(32)
-        )
-
         fn_args = [
-            exec_scope_arg,
-            mem_scope_arg,
-            spirv_memory_semantics_mask_arg,
+            builder.trunc(args[0], llvmir.IntType(32)),
+            builder.trunc(args[1], llvmir.IntType(32)),
+            builder.trunc(args[2], llvmir.IntType(32)),
         ]
 
-        mangled_fn_name = ext_itanium_mangler.mangle_ext(
-            "__spirv_ControlBarrier", [types.uint32, types.uint32, types.uint32]
+        callinst = builder.call(
+            get_or_insert_spv_group_barrier_fn(builder.module), fn_args
         )
 
-        spirv_fn_arg_types = [
-            llvmir.IntType(32),
-            llvmir.IntType(32),
-            llvmir.IntType(32),
-        ]
-
-        fn = cgutils.get_or_insert_function(
-            builder.module,
-            llvmir.FunctionType(llvmir.VoidType(), spirv_fn_arg_types),
-            mangled_fn_name,
-        )
-
-        if _SUPPORT_CONVERGENT:
-            fn.attributes.add("convergent")
-        fn.attributes.add("nounwind")
-        fn.calling_convention = "spir_func"
-
-        callinst = builder.call(fn, fn_args)
-
-        if _SUPPORT_CONVERGENT:
+        if _SUPPORT_CONVERGENT:  # pylint: disable=duplicate-code
             callinst.attributes.add("convergent")
         callinst.attributes.add("nounwind")