diff options
| author | Patrik Gustavsson <patrik.gustavsson@arm.com> | 2021-02-11 08:36:12 +0100 |
|---|---|---|
| committer | Patrik Gustavsson <patrik.gustavsson@arm.com> | 2021-02-11 15:02:22 +0100 |
| commit | 2446e59a9083f36f85beb88fdec6379d90b85cad (patch) | |
| tree | 11ec29acb69d8f9c49d4a339d0fb7686f71d9b2a | |
| parent | e3b1b91c450129308a3a1d466a2f2876a5a872b1 (diff) | |
| download | ethos-u-vela-2446e59a9083f36f85beb88fdec6379d90b85cad.tar.gz | |
MLBEDSW-3774 Fix avoid cascading for spilling
Fix avoid cascading for spilling.
Signed-off-by: Patrik Gustavsson <patrik.gustavsson@arm.com>
Change-Id: If86189bd1566eaa14387dfc2c02e3324ea6c184e
| -rw-r--r-- | ethosu/vela/graph_optimiser.py | 1 | ||||
| -rw-r--r-- | ethosu/vela/high_level_command_stream_generator.py | 1 | ||||
| -rw-r--r-- | ethosu/vela/scheduler.py | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ethosu/vela/graph_optimiser.py b/ethosu/vela/graph_optimiser.py index 50368b8..f5006c6 100644 --- a/ethosu/vela/graph_optimiser.py +++ b/ethosu/vela/graph_optimiser.py @@ -109,6 +109,7 @@ def rewrite_concat_ops(op, arch): DebugDatabase.add_optimised(op, avgpool_op) avgpool_op.ifm_shapes.append(op.ifm_shapes[idx]) avgpool_op.ofm_shapes.append(op.ofm_shapes[0]) + avgpool_op.memory_function = Op.ConcatSliceWrite assert ofm.shape[axis] == offset # If axis corresponds to C-dimension, NHCWB16 can only be used in the output if all the concat_start's are a diff --git a/ethosu/vela/high_level_command_stream_generator.py b/ethosu/vela/high_level_command_stream_generator.py index c2027e0..1ce7e7e 100644 --- a/ethosu/vela/high_level_command_stream_generator.py +++ b/ethosu/vela/high_level_command_stream_generator.py @@ -91,7 +91,6 @@ def generate_high_level_command_stream_for_pass(strat, passes, block_configs, id ofm_start[concat_axis] = concat_start ofm_end[concat_axis] = concat_end concat_offset = concat_start - ps.primary_op.memory_function = Op.ConcatSliceWrite elif op.type.is_relu_op() or op.type in (Op.Tanh, Op.Sigmoid): ps.primary_op.activation = create_activation_function(op.type) diff --git a/ethosu/vela/scheduler.py b/ethosu/vela/scheduler.py index 90b8942..9251623 100644 --- a/ethosu/vela/scheduler.py +++ b/ethosu/vela/scheduler.py @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Arm Limited or its affiliates. All rights reserved. +# Copyright (C) 2020-2021 Arm Limited or its affiliates. All rights reserved. # # SPDX-License-Identifier: Apache-2.0 # @@ -641,7 +641,7 @@ class DynamicProgrammingScheduler: def avoid_for_cascading(self, pred_candidate): for op in pred_candidate.ops: if ( - op.type == Op.ConcatSliceWrite + op.memory_function == Op.ConcatSliceWrite and self.arch.feature_map_storage_mem_area != self.arch.fast_storage_mem_area ): # For SRAM spilling, concat op is avoided as predecessor |