Merge pull request #1112 from IntelPython/fix/kernel_func_name

Generate proper mangled name for kernel functions

Author: Diptorup Deb

numba_dpex/core/codegen.py

@@ -35,6 +35,7 @@ def _optimize_final_module(self):
         pmb.opt_level = config.OPT
 
         pmb.disable_unit_at_a_time = False
+        pmb.inlining_threshold = 2
         pmb.disable_unroll_loops = True
         pmb.loop_vectorize = False
         pmb.slp_vectorize = False

numba_dpex/core/kernel_interface/spirv_kernel.py

@@ -136,6 +136,7 @@ def compile(
         kernel = cres.target_context.prepare_ocl_kernel(
             func, cres.signature.args
         )
+        cres.library._optimize_final_module()
         self._llvm_module = kernel.module.__str__()
         self._module_name = kernel.name
 

numba_dpex/core/targets/kernel_target.py

@@ -9,7 +9,7 @@
 from llvmlite import binding as ll
 from llvmlite import ir as llvmir
 from numba import typeof
-from numba.core import cgutils, types, typing, utils
+from numba.core import cgutils, funcdesc, types, typing, utils
 from numba.core.base import BaseContext
 from numba.core.callconv import MinimalCallConv
 from numba.core.registry import cpu_target
@@ -240,7 +240,7 @@ def _generate_kernel_wrapper(self, func, argtypes):
             llvmir.VoidType(), arginfo.argument_types
         )
         wrapper_module = self.create_module("dpex.kernel.wrapper")
-        wrappername = "dpexPy_{name}".format(name=func.name)
+        wrappername = func.name.replace("dpex_fn", "dpex_kernel")
         argtys = list(arginfo.argument_types)
         fnty = llvmir.FunctionType(
             llvmir.IntType(32),
@@ -373,13 +373,9 @@ def target_data(self):
         return self._target_data
 
     def mangler(self, name, argtypes, abi_tags=(), uid=None):
-        def repl(m):
-            ch = m.group(0)
-            return "_%X_" % ord(ch)
-
-        qualified = name + "." + ".".join(str(a) for a in argtypes)
-        mangled = VALID_CHARS.sub(repl, qualified)
-        return "dpex_py_devfn_" + mangled
+        return funcdesc.default_mangler(
+            name + "dpex_fn", argtypes, abi_tags=abi_tags, uid=uid
+        )
 
     def prepare_ocl_kernel(self, func, argtypes):
         module = func.module

numba_dpex/core/types/usm_ndarray_type.py

@@ -222,3 +222,17 @@ def as_array(self):
     @property
     def box_type(self):
         return dpctl.tensor.usm_ndarray
+
+    @property
+    def mangling_args(self):
+        """Returns a list of parameters used to create a mangled name for a
+        USMNdArray type.
+        """
+        filter_str_splits = self.device.split(":")
+        args = [
+            self.dtype,
+            self.ndim,
+            self.layout,
+            filter_str_splits[0] + "_" + filter_str_splits[1],
+        ]
+        return self.__class__.__name__, args