(Closes #2846) extend KernelModuleInlineTrans so that it re-names inlined routines

src/psyclone/domain/lfric/lfric_kern.py

@@ -129,6 +129,9 @@ def __init__(self):
         api_config = Config.get().api_conf("lfric")
         self._argument_kinds = {api_config.default_kind["real"],
                                 api_config.default_kind["integer"]}
+        # TODO #2054 - this 'routine' property can be replaced once this
+        # class sub-classes Call.
+        self.routine: Optional[Reference] = None
 
     def reference_accesses(self) -> VariablesAccessMap:
         '''

src/psyclone/psyGen.py

@@ -1172,11 +1172,12 @@ def __init__(self,
         self._opencl_options = {'local_size': 64, 'queue_number': 1}
         self.arg_descriptors = call.ktype.arg_descriptors
 
-        # If we have an ancestor InvokeSchedule then add the necessary
-        # symbols.
         # TODO #2054 - this 'routine' property can be replaced once this
         # class sub-classes Call.
         self.routine: Optional[Reference] = None
+
+        # If we have an ancestor InvokeSchedule then add the necessary
+        # symbols.
         container = self.ancestor(Container)
         if container:
             symtab = container.symbol_table
@@ -1213,6 +1214,16 @@ def get_callees(self):
         raise NotImplementedError(
             f"get_callees() must be overridden in class {self.__class__}")
 
+    @property
+    def name(self) -> str:
+        '''
+        Override Kern.name to use the RoutineSymbol name if one is available.
+
+        '''
+        if self.routine:
+            return self.routine.symbol.name
+        return super().name
+
     @property
     def opencl_options(self):
         '''
@@ -1309,7 +1320,7 @@ def lower_to_language_level(self) -> Node:
         '''
         symtab = self.ancestor(InvokeSchedule).symbol_table
 
-        rsymbol = symtab.lookup(self._name)
+        rsymbol = symtab.lookup(self.name)
 
         # Create Call to the rsymbol with the argument expressions as children
         # of the new node

src/psyclone/tests/domain/gocean/goloop_test.py

@@ -267,6 +267,7 @@ def __init__(self):
             PSyIR node'''
             # pylint: disable=super-init-not-called, non-parent-init-called
             Node.__init__(self)  # Ignore hierarchy constructors
+            self.routine = None
 
     # Test Loop containing kernels with different offsets
     gokern1 = GOKernMock()

src/psyclone/tests/domain/gocean/transformations/globalstoargs_test.py

@@ -104,8 +104,8 @@ def test_kernelimportstoargumentstrans_no_wildcard_import():
     trans = KernelImportsToArguments()
     with pytest.raises(TransformationError) as err:
         trans.apply(kernel)
-    assert ("'kernel_with_use_code' contains accesses to 'rdt' which is "
-            "unresolved" in str(err.value))
+    assert ("'kernel_with_use_code_inlined_' contains accesses to 'rdt' which "
+            "is unresolved" in str(err.value))
 
 
 def test_kernelimportstoargumentstrans(fortran_writer):
@@ -165,16 +165,16 @@ def test_kernelimportstoargumentstrans(fortran_writer):
 
     # Check the kernel code is generated as expected
     kernel_code = fortran_writer(kernel.get_callees()[0])
-    assert ("subroutine kernel_with_use_code(ji, jj, istep, ssha, tmask, "
-            "rdt, magic)" in kernel_code)
+    assert ("subroutine kernel_with_use_code_inlined_(ji, jj, istep, ssha, "
+            "tmask, rdt, magic)" in kernel_code)
     assert "real(kind=go_wp), intent(in) :: rdt" in kernel_code
     assert "real(kind=go_wp), intent(inout) :: magic" in kernel_code
 
     # Check that the PSy-layer generated code now contains the use statement
     # and argument call
     generated_code = str(psy.gen)
     assert "use model_mod, only : magic, rdt" in generated_code
-    assert ("call kernel_with_use_code(i, j, oldu_fld, cu_fld%data, "
+    assert ("call kernel_with_use_code_inlined_(i, j, oldu_fld, cu_fld%data, "
             "cu_fld%grid%tmask, rdt, magic)" in generated_code)
     assert invoke.schedule.symbol_table.lookup("model_mod")
     assert invoke.schedule.symbol_table.lookup("rdt")
@@ -210,8 +210,8 @@ def create_data_symbol(arg):
     kernels = kernel.get_callees()
     kernel_code = fortran_writer(kernels[0])
 
-    assert ("subroutine kernel_with_use_code(ji, jj, istep, ssha, tmask, rdt, "
-            "magic)" in kernel_code)
+    assert ("subroutine kernel_with_use_code_inlined_(ji, jj, istep, ssha, "
+            "tmask, rdt, magic)" in kernel_code)
     assert "integer, intent(in) :: rdt" in kernel_code
 
 
@@ -261,15 +261,15 @@ def test_kernelimportstoarguments_multiple_kernels(fortran_writer):
     # The kernels are checked before the psy.gen, so they don't include the
     # modified suffix.
     expected = [
-        ["subroutine kernel_with_use_code(ji, jj, istep, ssha, tmask, rdt, "
-         "magic)",
+        ["subroutine kernel_with_use_code_inlined_(ji, jj, istep, ssha, "
+         "tmask, rdt, magic)",
          "real(kind=go_wp), intent(in) :: rdt"],
-        ["subroutine kernel_with_use2_code(ji, jj, istep, ssha, tmask, cbfr,"
-         " rdt)",
+        ["subroutine kernel_with_use2_code_inlined_(ji, jj, istep, ssha, "
+         "tmask, cbfr, rdt)",
          "real(kind=go_wp), intent(inout) :: cbfr\n    real(kind=go_wp), "
          "intent(in) :: rdt"],
-        ["subroutine kernel_with_use_code(ji, jj, istep, ssha, tmask, rdt, "
-         "magic)",
+        ["subroutine kernel_with_use_code_inlined_(ji, jj, istep, ssha, "
+         "tmask, rdt, magic)",
          "real(kind=go_wp), intent(in) :: rdt\n    real(kind=go_wp), "
          "intent(inout) :: magic"]]
 

src/psyclone/tests/domain/gocean/transformations/gocean1p0_transformations_test.py

@@ -1530,8 +1530,8 @@ def raise_gen_error():
     monkeypatch.setattr(kern, "get_callees", raise_gen_error)
     with pytest.raises(TransformationError) as err:
         rtrans.apply(kern)
-    assert ("Failed to create PSyIR for kernel 'continuity_code'. Cannot "
-            "transform such a kernel." in str(err.value))
+    assert ("Failed to create PSyIR for kernel 'continuity_code_inlined_'. "
+            "Cannot transform such a kernel." in str(err.value))
 
 
 def test_accroutinetrans_with_routine(fortran_writer):

src/psyclone/tests/domain/gocean/transformations/gocean_move_iteration_boundaries_inside_kernel_trans_test.py

@@ -209,8 +209,8 @@ def test_go_move_iteration_boundaries_inside_kernel_two_kernels_apply_twice(
   ystop = cu_fld%internal%ystop
   do j = 1, SIZE(cu_fld%data, dim=2), 1
     do i = 1, SIZE(cu_fld%data, dim=1), 1
-      call compute_cu_code(i, j, cu_fld%data, p_fld%data, u_fld%data, xstart, \
-xstop, ystart, ystop)
+      call compute_cu_code_inlined_(i, j, cu_fld%data, p_fld%data, u_fld%data,\
+ xstart, xstop, ystart, ystop)
     enddo
   enddo
   xstart_1 = 1
@@ -219,8 +219,8 @@ def test_go_move_iteration_boundaries_inside_kernel_two_kernels_apply_twice(
   ystop_1 = SIZE(uold_fld%data, dim=2)
   do j = 1, SIZE(uold_fld%data, dim=2), 1
     do i = 1, SIZE(uold_fld%data, dim=1), 1
-      call time_smooth_code(i, j, cu_fld%data, unew_fld%data, uold_fld%data, \
-xstart_1, xstop_1, ystart_1, ystop_1)
+      call time_smooth_code_inlined_(i, j, cu_fld%data, unew_fld%data, \
+uold_fld%data, xstart_1, xstop_1, ystart_1, ystop_1)
     enddo
   enddo