diff options
| author | Louis Verhaard <louis.verhaard@arm.com> | 2020-09-30 09:01:52 +0200 |
|---|---|---|
| committer | Louis Verhaard <louis.verhaard@arm.com> | 2020-10-08 16:29:29 +0200 |
| commit | aee5d7537ff81ffda5ba222721b72f914ce50fb8 (patch) | |
| tree | 495b9dfff2a188c6916f8ca2e390ee88f7da8ccc /ethosu/vela/npu_performance.py | |
| parent | 36ad73a0fb46d3f844845c97c56d92de2a7a9b3d (diff) | |
| download | ethos-u-vela-aee5d7537ff81ffda5ba222721b72f914ce50fb8.tar.gz | |
MLBEDSW-3148: Refactor Operation
- op.type is now an enum instead of a string
- Removed unused operator codes
- Refactored some attributes like npu_block_type, fused_activation_function
- Refactored operator index calculation
- Refactored a number of operator sets
Change-Id: I641f65ee375794b7aec42abc0664251ae37d78e8
Signed-off-by: Louis Verhaard <louis.verhaard@arm.com>
Diffstat (limited to 'ethosu/vela/npu_performance.py')
| -rw-r--r-- | ethosu/vela/npu_performance.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ethosu/vela/npu_performance.py b/ethosu/vela/npu_performance.py index e09fc9e1..fc148f38 100644 --- a/ethosu/vela/npu_performance.py +++ b/ethosu/vela/npu_performance.py @@ -41,10 +41,7 @@ def rolling_buffer_dims_from_passes(arch, ps1, block_config_ps1, ps2, block_conf if ps2.npu_block_type in set((NpuBlockType.ConvolutionMxN, NpuBlockType.VectorProduct)): op = ps2.primary_op - ifm_idx, _, _, _, _ = op.get_ifm_ifm2_weight_bias_ofm_indices() - ifm_block_depth = arch.calc_ifm_block_depth( - op.inputs[ifm_idx].shape[-1], op.inputs[ifm_idx].dtype.size_in_bits() - ) + ifm_block_depth = arch.calc_ifm_block_depth(op.ifm.shape[-1], op.ifm.dtype.size_in_bits()) else: ifm_block_depth = block_config_ps2[-1] @@ -237,8 +234,8 @@ def performance_metrics_for_pass(arch, ps, block_config=None, rewrite_list=[], f elif primary_op: skirt = primary_op.attrs.get("skirt", skirt) explicit_padding = primary_op.attrs.get("explicit_padding", explicit_padding) - assert primary_op.attrs["npu_block_type"] == ps.npu_block_type - npu_block_type = primary_op.attrs["npu_block_type"] + assert primary_op.type.npu_block_type == ps.npu_block_type + npu_block_type = primary_op.type.npu_block_type ifm_tensor, _, weight_tensor, ofm_tensor = ps.get_primary_op_ifm_ifm2_weights_ofm() |