MLBEDSW-6298: MLCE: Unable to find a valid block config

 - Fixed a bug due to ResizeBilinear modifying the attributes of a
shared IFM
 - The ifm_resampling_mode is now an attribute of an operator rather
than a tensor
 - Changed all calls to try_block_config() to use the attribute rather
than recalculating it in multiple places

Signed-off-by: Tim Hall <tim.hall@arm.com>
Change-Id: I4641e9cd6b049bd4186776d98e3e751c5e5bcc06

1 files changed, 10 insertions, 12 deletions

diff --git a/ethosu/vela/high_level_command_to_npu_op.py b/ethosu/vela/high_level_command_to_npu_op.py
index f7c91aa2..c8221320 100644
--- a/ethosu/vela/high_level_command_to_npu_op.py
+++ b/ethosu/vela/high_level_command_to_npu_op.py
@@ -49,6 +49,7 @@ from .architecture_features import ArchitectureFeatures
 from .data_type import DataType
 from .debug_database import DebugDatabase
 from .errors import UnsupportedFeatureError
+from .ethos_u55_regs.ethos_u55_regs import resampling_mode
 from .high_level_command_stream import Box
 from .high_level_command_stream import Command
 from .high_level_command_stream import DMA
@@ -104,6 +105,14 @@ elementwise_op_map = {
 }
 
 
+# inverse of the resampling_mode_map in the register command stream generator
+resampling_mode_inv_map = {
+    resampling_mode.NONE: NpuResamplingMode.NONE,
+    resampling_mode.NEAREST: NpuResamplingMode.NEAREST,
+    resampling_mode.TRANSPOSE: NpuResamplingMode.TRANSPOSE,
+}
+
+
 def ifm_ifm2_correct_order(ifm_shape: List[int], ifm2_shape: List[int]) -> bool:
     if ifm_shape == []:
         # Scalar needs to be in IFM2
@@ -193,17 +202,6 @@ def get_mem_limits_for_regions(arch: ArchitectureFeatures) -> Dict[int, int]:
     return mem_limits
 
 
-def get_upscale(op: Operation) -> NpuResamplingMode:
-    upscale = NpuResamplingMode.NONE
-    if op.type == Op.ResizeBilinear:
-        # perform nearest neighbor upscale
-        upscale = NpuResamplingMode.NEAREST
-    elif op.type == Op.Conv2DBackpropInputSwitchedBias:
-        # perform insert zero upscale
-        upscale = NpuResamplingMode.TRANSPOSE
-    return upscale
-
-
 def get_double_buffer_offset(arch: ArchitectureFeatures, range_index: int, core: int) -> int:
     """Returns 0 if the first half of a double buffer should be used, 1 if the second half should be used"""
     return ((range_index - core) // arch.ncores) % 2
@@ -409,7 +407,7 @@ def set_common_op_fields(npu_op: NpuBlockOperation, cmd: NpuStripe, arch: Archit
     if not op.type.is_elementwise_op():
         npu_op.padding = create_padding(cmd, op)
         npu_op.kernel = to_npu_kernel(op.kernel)
-    npu_op.ifm_upscale = get_upscale(op)
+    npu_op.ifm_upscale = resampling_mode_inv_map[op.ifm_resampling_mode]
     return npu_op