diff options
| author | Rickard Bolin <rickard.bolin@arm.com> | 2023-10-17 07:08:54 +0000 |
|---|---|---|
| committer | Rickard Bolin <rickard.bolin@arm.com> | 2023-10-30 07:58:04 +0000 |
| commit | 909923a2461087f64a40e07be7752e8923f70ae7 (patch) | |
| tree | a5214c76b0bb6a415e44da46ba6f6f19f4eb3c43 | |
| parent | b37a81bfce0c7ae3092e4b3c9f69e08644b84e25 (diff) | |
| download | ethos-u-vela-909923a2461087f64a40e07be7752e8923f70ae7.tar.gz | |
MLBEDSW-8156: Update max_outstanding_kernels to 2
Update max_outstanding_kernels to 2 and remove unit tests expecting
values of 2 or 3.
Change-Id: Ib8a3a88d3378d3ce84427935c91c7a46f04bc9ab
Signed-off-by: Rickard Bolin <rickard.bolin@arm.com>
| -rw-r--r-- | ethosu/vela/architecture_features.py | 4 | ||||
| -rw-r--r-- | ethosu/vela/test/extapi/test_extapi_generate_commands.py | 33 |
2 files changed, 2 insertions, 35 deletions
diff --git a/ethosu/vela/architecture_features.py b/ethosu/vela/architecture_features.py index 7c0d311..59c9841 100644 --- a/ethosu/vela/architecture_features.py +++ b/ethosu/vela/architecture_features.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2020-2022 Arm Limited and/or its affiliates <open-source-office@arm.com> +# SPDX-FileCopyrightText: Copyright 2020-2023 Arm Limited and/or its affiliates <open-source-office@arm.com> # # SPDX-License-Identifier: Apache-2.0 # @@ -286,7 +286,7 @@ class ArchitectureFeatures: axi_port_address_width = 32 axi_port_data_width = 64 - self.max_outstanding_kernels = 3 + self.max_outstanding_kernels = 2 self.ncores = accel_config.cores self.ofm_ublock = accel_config.ofm_ublock diff --git a/ethosu/vela/test/extapi/test_extapi_generate_commands.py b/ethosu/vela/test/extapi/test_extapi_generate_commands.py index 6284faa..b21aae3 100644 --- a/ethosu/vela/test/extapi/test_extapi_generate_commands.py +++ b/ethosu/vela/test/extapi/test_extapi_generate_commands.py @@ -744,39 +744,6 @@ def test_kernel_wait_1(): pos = check_cmd0(cmds, cmd0.NPU_OP_DMA_START, 0, pos) -def test_kernel_wait_2(): - """ - Verify that KERNEL_WAIT 2 is generated. - dma_ops[i] writes to the weight-address for conv_ops[i] - """ - conv_ops, dma_ops = setup_memory_barrier_tests() - cmds = npu_generate_register_command_stream( - [conv_ops[0], conv_ops[1], conv_ops[2], dma_ops[0]], NpuAccelerator.Ethos_U65_256 - ) - pos = check_cmd0(cmds, cmd0.NPU_OP_CONV, 0) - pos = check_cmd0(cmds, cmd0.NPU_OP_CONV, 0, pos + 1) - pos = check_cmd0(cmds, cmd0.NPU_OP_CONV, 0, pos + 1) - pos = check_cmd0(cmds, cmd0.NPU_OP_KERNEL_WAIT, 2, pos) - pos = check_cmd0(cmds, cmd0.NPU_OP_DMA_START, 0, pos) - - -def test_kernel_wait_3(): - """ - Verify that KERNEL_WAIT 2 is generated. - dma_ops[i] writes to the weight-address for conv_ops[i] - """ - conv_ops, dma_ops = setup_memory_barrier_tests() - cmds = npu_generate_register_command_stream( - [conv_ops[0], conv_ops[1], conv_ops[2], dma_ops[3], dma_ops[0]], NpuAccelerator.Ethos_U65_256 - ) - pos = check_cmd0(cmds, cmd0.NPU_OP_CONV, 0) - pos = check_cmd0(cmds, cmd0.NPU_OP_CONV, 0, pos + 1) - pos = check_cmd0(cmds, cmd0.NPU_OP_CONV, 0, pos + 1) - pos = check_cmd0(cmds, cmd0.NPU_OP_DMA_START, 0, pos) - pos = check_cmd0(cmds, cmd0.NPU_OP_KERNEL_WAIT, 2, pos) - pos = check_cmd0(cmds, cmd0.NPU_OP_DMA_START, 0, pos) - - def test_check_mem_limits(): # Tests that no code is generated with addresses out of bounds conv_op = create_fully_connected_op() |