Merge pull request #1423 from IntelPython/refactor/keep-utils-in-one-place

ZzEeKkAa · web-flow · commit 5fb6093015bf · 2024-04-03T14:58:23.000-04:00
Move all utility functions into the core.utils module
diff --git a/numba_dpex/core/datamodel/models.py b/numba_dpex/core/datamodel/models.py
@@ -17,7 +17,7 @@
     DpctlMDLocalAccessorType,
     LocalAccessorType,
 )
-from numba_dpex.utils import address_space
+from numba_dpex.kernel_api.memory_enums import AddressSpace as address_space
 
 from ..types import (
     Array,
@@ -62,7 +62,7 @@ def __init__(self, dmm, fe_type):
         adrsp = (
             fe_type.addrspace
             if fe_type.addrspace is not None
-            else address_space.GLOBAL
+            else address_space.GLOBAL.value
         )
         be_type = dmm.lookup(fe_type.dtype).get_data_type().as_pointer(adrsp)
         super(GenericPointerModel, self).__init__(dmm, fe_type, be_type)
diff --git a/numba_dpex/core/kernel_launcher.py b/numba_dpex/core/kernel_launcher.py
@@ -26,7 +26,7 @@
     NdItemType,
 )
 from numba_dpex.core.types.kernel_api.local_accessor import LocalAccessorType
-from numba_dpex.core.utils import kernel_launcher as kl
+from numba_dpex.core.utils import call_kernel_builder as kl
 from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
 from numba_dpex.dpctl_iface.wrappers import wrap_event_reference
 from numba_dpex.kernel_api_impl.spirv.dispatcher import (
diff --git a/numba_dpex/core/parfors/parfor_lowerer.py b/numba_dpex/core/parfors/parfor_lowerer.py
@@ -20,7 +20,7 @@
     ReductionHelper,
     ReductionKernelVariables,
 )
-from numba_dpex.core.utils.kernel_launcher import KernelLaunchIRBuilder
+from numba_dpex.core.utils.call_kernel_builder import KernelLaunchIRBuilder
 from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
 
 from ..exceptions import UnsupportedParforError
diff --git a/numba_dpex/core/parfors/reduction_helper.py b/numba_dpex/core/parfors/reduction_helper.py
@@ -17,11 +17,11 @@
 from numba.parfors import parfor
 from numba.parfors.parfor_lowering_utils import ParforLoweringBuilder
 
-from numba_dpex import utils
 from numba_dpex.core.datamodel.models import (
     dpex_data_model_manager as kernel_dmm,
 )
-from numba_dpex.core.utils.kernel_launcher import KernelLaunchIRBuilder
+from numba_dpex.core.utils.call_kernel_builder import KernelLaunchIRBuilder
+from numba_dpex.core.utils.cgutils_extra import get_llvm_type
 from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
 
 from ..types.dpnp_ndarray_type import DpnpNdArray
@@ -431,11 +431,11 @@ def copy_final_sum_to_host(self, parfor_kernel):
 
             dest = builder.bitcast(
                 lowerer.getvar(redvar),
-                utils.get_llvm_type(context=context, type=types.voidptr),
+                get_llvm_type(context=context, type=types.voidptr),
             )
             src = builder.bitcast(
                 builder.load(array_attr),
-                utils.get_llvm_type(context=context, type=types.voidptr),
+                get_llvm_type(context=context, type=types.voidptr),
             )
 
             args = [
diff --git a/numba_dpex/core/types/kernel_api/local_accessor.py b/numba_dpex/core/types/kernel_api/local_accessor.py
@@ -8,7 +8,7 @@
 from numba.np import numpy_support
 
 from numba_dpex.core.types import USMNdArray
-from numba_dpex.utils import address_space as AddressSpace
+from numba_dpex.kernel_api.memory_enums import AddressSpace
 
 
 class DpctlMDLocalAccessorType(Type):
@@ -36,14 +36,14 @@ def __init__(self, ndim, dtype):
 
         type_name = (
             f"LocalAccessor(dtype={parsed_dtype}, ndim={ndim}, "
-            f"address_space={AddressSpace.LOCAL})"
+            f"address_space={AddressSpace.LOCAL.value})"
         )
 
         super().__init__(
             ndim=ndim,
             layout="C",
             dtype=parsed_dtype,
-            addrspace=AddressSpace.LOCAL,
+            addrspace=AddressSpace.LOCAL.value,
             name=type_name,
         )
 
diff --git a/numba_dpex/core/types/usm_ndarray_type.py b/numba_dpex/core/types/usm_ndarray_type.py
@@ -13,7 +13,7 @@
 from numba.np.numpy_support import from_dtype
 
 from numba_dpex.core.types.dpctl_types import DpctlSyclQueue
-from numba_dpex.utils.constants import address_space
+from numba_dpex.kernel_api.memory_enums import AddressSpace as address_space
 
 
 class USMNdArray(Array):
@@ -30,7 +30,7 @@ def __init__(
         readonly=False,
         name=None,
         aligned=True,
-        addrspace=address_space.GLOBAL,
+        addrspace=address_space.GLOBAL.value,
     ):
         if (
             queue is not None
diff --git a/numba_dpex/core/typing/typeof.py b/numba_dpex/core/typing/typeof.py
@@ -9,8 +9,8 @@
 from numba.np import numpy_support
 
 from numba_dpex.kernel_api import AtomicRef, Group, Item, LocalAccessor, NdItem
+from numba_dpex.kernel_api.memory_enums import AddressSpace as address_space
 from numba_dpex.kernel_api.ranges import NdRange, Range
-from numba_dpex.utils.constants import address_space
 
 from ..types.dpctl_types import DpctlSyclEvent, DpctlSyclQueue
 from ..types.dpnp_ndarray_type import DpnpNdArray
@@ -59,7 +59,7 @@ def _array_typeof_helper(val, array_class_type):
         readonly=readonly,
         usm_type=usm_type,
         queue=ty_queue,
-        addrspace=address_space.GLOBAL,
+        addrspace=address_space.GLOBAL.value,
     )
 
 
diff --git a/numba_dpex/core/utils/call_kernel_builder.py b/numba_dpex/core/utils/call_kernel_builder.py
@@ -17,18 +17,17 @@
 from numba.core.datamodel import DataModelManager
 from numba.core.types.containers import UniTuple
 
-from numba_dpex import utils
 from numba_dpex.core import config
 from numba_dpex.core.exceptions import UnreachableError
 from numba_dpex.core.runtime.context import DpexRTContext
 from numba_dpex.core.types import USMNdArray
 from numba_dpex.core.types.kernel_api.local_accessor import LocalAccessorType
 from numba_dpex.core.types.kernel_api.ranges import NdRangeType, RangeType
+from numba_dpex.core.utils import cgutils_extra
 from numba_dpex.core.utils.kernel_flattened_args_builder import (
     KernelFlattenedArgsBuilder,
 )
 from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
-from numba_dpex.utils import create_null_ptr
 
 MAX_SIZE_OF_SYCL_RANGE = 3
 
@@ -142,10 +141,15 @@ def _build_nullptr(self):
 
         Returns: An LLVM Value storing a null pointer
         """
-        zero = cgutils.alloca_once(self.builder, utils.LLVMTypes.int64_t)
+        zero = cgutils.alloca_once(
+            self.builder, cgutils_extra.LLVMTypes.int64_t
+        )
         self.builder.store(self.context.get_constant(types.int64, 0), zero)
         return self.builder.bitcast(
-            zero, utils.get_llvm_type(context=self.context, type=types.voidptr)
+            zero,
+            cgutils_extra.get_llvm_type(
+                context=self.context, type=types.voidptr
+            ),
         )
 
     # TODO: remove, not part of the builder
@@ -159,7 +163,9 @@ def get_queue(self, exec_queue: dpctl.SyclQueue) -> llvmir.Instruction:
         # Allocate a stack var to store the queue created from the filter string
         sycl_queue_val = cgutils.alloca_once(
             self.builder,
-            utils.get_llvm_type(context=self.context, type=types.voidptr),
+            cgutils_extra.get_llvm_type(
+                context=self.context, type=types.voidptr
+            ),
         )
         # Insert a global constant to store the filter string
         device = self.context.insert_const_string(
@@ -256,8 +262,8 @@ def _create_sycl_range(self, idx_range):
         """
         int64_range = [
             (
-                self.builder.sext(rext, utils.LLVMTypes.int64_t)
-                if rext.type != utils.LLVMTypes.int64_t
+                self.builder.sext(rext, cgutils_extra.LLVMTypes.int64_t)
+                if rext.type != cgutils_extra.LLVMTypes.int64_t
                 else rext
             )
             for rext in idx_range
@@ -334,7 +340,7 @@ def set_kernel_from_spirv(
             )
         else:
             spv_compiler_options = self.builder.load(
-                create_null_ptr(self.builder, self.context)
+                cgutils_extra.create_null_ptr(self.builder, self.context)
             )
 
         # build_or_get_kernel steals reference to context and device cause it
diff --git a/numba_dpex/core/utils/cgutils_extra.py b/numba_dpex/core/utils/cgutils_extra.py
diff --git a/numba_dpex/core/utils/kernel_flattened_args_builder.py b/numba_dpex/core/utils/kernel_flattened_args_builder.py
@@ -16,12 +16,12 @@
 from numba.core import cgutils, types
 from numba.core.cpu import CPUContext
 
-from numba_dpex import utils
 from numba_dpex.core.types import USMNdArray
 from numba_dpex.core.types.kernel_api.local_accessor import (
     DpctlMDLocalAccessorType,
     LocalAccessorType,
 )
+from numba_dpex.core.utils import cgutils_extra as utils
 from numba_dpex.dpctl_iface._helpers import numba_type_to_dpctl_typenum
 
 
diff --git a/numba_dpex/kernel_api_impl/spirv/dispatcher.py b/numba_dpex/kernel_api_impl/spirv/dispatcher.py
@@ -36,7 +36,7 @@
 )
 from numba_dpex.core.pipelines import kernel_compiler
 from numba_dpex.core.types import USMNdArray
-from numba_dpex.core.utils import kernel_launcher as kl
+from numba_dpex.core.utils import call_kernel_builder as kl
 from numba_dpex.kernel_api_impl.spirv import spirv_generator
 from numba_dpex.kernel_api_impl.spirv.codegen import SPIRVCodeLibrary
 from numba_dpex.kernel_api_impl.spirv.target import (
diff --git a/numba_dpex/kernel_api_impl/spirv/overloads/_private_array_overloads.py b/numba_dpex/kernel_api_impl/spirv/overloads/_private_array_overloads.py
@@ -20,12 +20,12 @@
 
 from numba_dpex.core.types import USMNdArray
 from numba_dpex.kernel_api import PrivateArray
+from numba_dpex.kernel_api.memory_enums import AddressSpace
 from numba_dpex.kernel_api_impl.spirv.arrayobj import (
     np_cfarray,
     require_literal,
 )
 from numba_dpex.kernel_api_impl.spirv.target import SPIRVTypingContext
-from numba_dpex.utils import address_space as AddressSpace
 
 from ._registry import lower
 
@@ -50,7 +50,7 @@ def typer(shape, dtype, fill_zeros=types.BooleanLiteral(False)):
             dtype=_ty_parse_dtype(dtype),
             ndim=_ty_parse_shape(shape),
             layout="C",
-            addrspace=AddressSpace.PRIVATE,
+            addrspace=AddressSpace.PRIVATE.value,
         )
 
     return typer
diff --git a/numba_dpex/kernel_api_impl/spirv/target.py b/numba_dpex/kernel_api_impl/spirv/target.py
@@ -24,9 +24,9 @@
 from numba_dpex.core.types import IntEnumLiteral
 from numba_dpex.core.typing import dpnpdecl
 from numba_dpex.kernel_api.flag_enum import FlagEnum
+from numba_dpex.kernel_api.memory_enums import AddressSpace as address_space
 from numba_dpex.kernel_api_impl.spirv.arrayobj import populate_array
 from numba_dpex.ocl.mathimpl import lower_ocl_impl, sig_mapper
-from numba_dpex.utils import address_space, calling_conv
 
 from . import codegen
 from .overloads._registry import registry as spirv_registry
@@ -367,7 +367,7 @@ def declare_function(self, module, fndesc):
         if not self.enable_debuginfo:
             fn.attributes.add("alwaysinline")
         ret = super().declare_function(module, fndesc)
-        ret.calling_convention = calling_conv.CC_SPIR_FUNC
+        ret.calling_convention = CC_SPIR_FUNC
         return ret
 
     def insert_const_string(self, mod, string):
@@ -392,15 +392,15 @@ def insert_const_string(self, mod, string):
         if gv is None:
             # Not defined yet
             gv = cgutils.add_global_variable(
-                mod, text.type, name=name, addrspace=address_space.GENERIC
+                mod, text.type, name=name, addrspace=address_space.GENERIC.value
             )
             gv.linkage = "internal"
             gv.global_constant = True
             gv.initializer = text
 
         # Cast to a i8* pointer
         charty = gv.type.pointee.element
-        return gv.bitcast(charty.as_pointer(address_space.GENERIC))
+        return gv.bitcast(charty.as_pointer(address_space.GENERIC.value))
 
     def addrspacecast(self, builder, src, addrspace):
         """Insert an LLVM addressspace cast instruction into the module.
diff --git a/numba_dpex/ocl/ocldecl.py b/numba_dpex/ocl/ocldecl.py
@@ -15,7 +15,7 @@
 
 import numba_dpex as dpex
 from numba_dpex.core.types import Array
-from numba_dpex.utils import address_space
+from numba_dpex.kernel_api import AddressSpace as address_space
 
 registry = Registry()
 intrinsic = registry.register
@@ -158,7 +158,7 @@ def typer(shape, dtype):
                     dtype=nb_dtype,
                     ndim=ndim,
                     layout="C",
-                    addrspace=address_space.LOCAL,
+                    addrspace=address_space.LOCAL.value,
                 )
 
         return typer
@@ -201,7 +201,7 @@ def typer(shape, dtype):
                     dtype=nb_dtype,
                     ndim=ndim,
                     layout="C",
-                    addrspace=address_space.PRIVATE,
+                    addrspace=address_space.PRIVATE.value,
                 )
 
         return typer
diff --git a/numba_dpex/ocl/oclimpl.py b/numba_dpex/ocl/oclimpl.py
@@ -16,9 +16,9 @@
 from numba_dpex import spirv_kernel_target
 from numba_dpex.core import config
 from numba_dpex.core.types import Array
+from numba_dpex.kernel_api import AddressSpace as address_space
 from numba_dpex.kernel_api_impl.spirv.codegen import SPIR_DATA_LAYOUT
 from numba_dpex.ocl.atomics import atomic_helper
-from numba_dpex.utils import address_space
 
 from . import stubs
 from ._declare_function import _declare_function
@@ -301,7 +301,7 @@ def dpex_private_array_integer(context, builder, sig, args):
         shape=(length,),
         dtype=dtype,
         symbol_name="_dpex_pmem",
-        addrspace=address_space.PRIVATE,
+        addrspace=address_space.PRIVATE.value,
     )
 
 
@@ -316,7 +316,7 @@ def dpex_private_array_tuple(context, builder, sig, args):
         shape=shape,
         dtype=dtype,
         symbol_name="_dpex_pmem",
-        addrspace=address_space.PRIVATE,
+        addrspace=address_space.PRIVATE.value,
     )
 
 
@@ -330,7 +330,7 @@ def dpex_local_array_integer(context, builder, sig, args):
         shape=(length,),
         dtype=dtype,
         symbol_name="_dpex_lmem",
-        addrspace=address_space.LOCAL,
+        addrspace=address_space.LOCAL.value,
     )
 
 
@@ -345,7 +345,7 @@ def dpex_local_array_tuple(context, builder, sig, args):
         shape=shape,
         dtype=dtype,
         symbol_name="_dpex_lmem",
-        addrspace=address_space.LOCAL,
+        addrspace=address_space.LOCAL.value,
     )
 
 
@@ -358,7 +358,7 @@ def _generic_array(context, builder, shape, dtype, symbol_name, addrspace):
     lldtype = context.get_data_type(dtype)
     laryty = llvmir.ArrayType(lldtype, elemcount)
 
-    if addrspace == address_space.LOCAL:
+    if addrspace == address_space.LOCAL.value:
         lmod = builder.module
 
         # Create global variable in the requested address-space
@@ -374,7 +374,7 @@ def _generic_array(context, builder, shape, dtype, symbol_name, addrspace):
         if dtype not in types.number_domain:
             raise TypeError("unsupported type: %s" % dtype)
 
-    elif addrspace == address_space.PRIVATE:
+    elif addrspace == address_space.PRIVATE.value:
         gvmem = cgutils.alloca_once(builder, laryty, name=symbol_name)
     else:
         raise NotImplementedError("addrspace {addrspace}".format(**locals()))
@@ -397,7 +397,7 @@ def _make_array(
     dtype,
     shape,
     layout="C",
-    addrspace=address_space.GENERIC,
+    addrspace=address_space.GENERIC.value,
 ):
     ndim = len(shape)
     # Create array object
diff --git a/numba_dpex/printimpl.py b/numba_dpex/printimpl.py
@@ -8,15 +8,15 @@
 from numba.core import cgutils, types
 from numba.core.imputils import Registry
 
-from numba_dpex.utils import address_space
+from numba_dpex.kernel_api.memory_enums import AddressSpace as address_space
 
 registry = Registry()
 lower = registry.lower
 
 
 def declare_print(lmod):
     voidptrty = llvmir.PointerType(
-        llvmir.IntType(8), addrspace=address_space.GENERIC
+        llvmir.IntType(8), addrspace=address_space.GENERIC.value
     )
     printfty = llvmir.FunctionType(
         llvmir.IntType(32), [voidptrty], var_arg=True
diff --git a/numba_dpex/tests/core/test_itanium_mangler_extension.py b/numba_dpex/tests/core/test_itanium_mangler_extension.py
diff --git a/numba_dpex/tests/test_array_utils.py b/numba_dpex/tests/test_array_utils.py
diff --git a/numba_dpex/utils/__init__.py b/numba_dpex/utils/__init__.py
diff --git a/numba_dpex/utils/array_utils.py b/numba_dpex/utils/array_utils.py
diff --git a/numba_dpex/utils/constants.py b/numba_dpex/utils/constants.py

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`NdItemType,`
`27`	`27`	`)`
`28`	`28`	`from numba_dpex.core.types.kernel_api.local_accessor import LocalAccessorType`
`29`		`-from numba_dpex.core.utils import kernel_launcher as kl`
	`29`	`+from numba_dpex.core.utils import call_kernel_builder as kl`
`30`	`30`	`from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl`
`31`	`31`	`from numba_dpex.dpctl_iface.wrappers import wrap_event_reference`
`32`	`32`	`from numba_dpex.kernel_api_impl.spirv.dispatcher import (`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`ReductionHelper,`
`21`	`21`	`ReductionKernelVariables,`
`22`	`22`	`)`
`23`		`-from numba_dpex.core.utils.kernel_launcher import KernelLaunchIRBuilder`
	`23`	`+from numba_dpex.core.utils.call_kernel_builder import KernelLaunchIRBuilder`
`24`	`24`	`from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl`
`25`	`25`
`26`	`26`	`from ..exceptions import UnsupportedParforError`