Move llvm_codegen_helpers.py into core.utils and rename to cgutils_extra

Author: Diptorup Deb

numba_dpex/core/parfors/reduction_helper.py

@@ -17,10 +17,10 @@
 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.cgutils_extra import get_llvm_type
 from numba_dpex.core.utils.kernel_launcher import KernelLaunchIRBuilder
 from numba_dpex.dpctl_iface import libsyclinterface_bindings as sycl
 
@@ -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 = [

numba_dpex/utils/llvm_codegen_helpers.py renamed to numba_dpex/core/utils/cgutils_extra.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
 
 

numba_dpex/core/utils/kernel_flattened_args_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