diff options
Diffstat (limited to 'ethosu/vela/test')
| -rw-r--r-- | ethosu/vela/test/test_lut.py | 16 | ||||
| -rw-r--r-- | ethosu/vela/test/testutil.py | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ethosu/vela/test/test_lut.py b/ethosu/vela/test/test_lut.py index 3b7f57be..3dda1793 100644 --- a/ethosu/vela/test/test_lut.py +++ b/ethosu/vela/test/test_lut.py @@ -79,6 +79,14 @@ def process(arch, op_list): return sg +def filter_lut_cmds(cmd_list): + lut_cmd_list = [] + for cmd in cmd_list: + if "lut" in cmd.in_tensor.name: + lut_cmd_list.append(cmd) + return lut_cmd_list + + def test_optimize_high_level_cmd_stream_2K(): # Tests lut.optimize_high_level_cmd_stream, blending 256 byte and 2K luts arch = testutil.create_arch() @@ -116,6 +124,10 @@ def test_optimize_high_level_cmd_stream_2K(): cmd_list = sg.high_level_command_stream # Check that only the needed DMA commands are left expected_dma_ops = [op0, op1, op2, op5_2K, op6_2K, op7] + + cmd_list = filter_lut_cmds(cmd_list) + orig_cmd_list = filter_lut_cmds(orig_cmd_list) + for (cmd, op) in zip(cmd_list, expected_dma_ops): assert cmd.in_tensor == op.activation_lut # Check that lut0, lut1 and lut2 in op0, op1, op2 are stored on different addresses @@ -165,6 +177,10 @@ def test_optimize_high_level_cmd_stream_1K(): sg.high_level_command_stream = orig_cmd_list lut.optimize_high_level_cmd_stream(sg, arch) cmd_list = sg.high_level_command_stream + + cmd_list = filter_lut_cmds(cmd_list) + orig_cmd_list = filter_lut_cmds(orig_cmd_list) + # Check that only the needed DMA commands are left expected_dma_ops = [op0, op1, op2_1K, op5_2K, op7] for (cmd, op) in zip(cmd_list, expected_dma_ops): diff --git a/ethosu/vela/test/testutil.py b/ethosu/vela/test/testutil.py index fb6ca591..d4ae97b4 100644 --- a/ethosu/vela/test/testutil.py +++ b/ethosu/vela/test/testutil.py @@ -23,7 +23,6 @@ from ethosu.vela.nn_graph import Subgraph from ethosu.vela.operation import NpuBlockType from ethosu.vela.operation import Operation from ethosu.vela.tensor import create_const_tensor -from ethosu.vela.tensor import MemArea from ethosu.vela.tensor import Tensor @@ -32,7 +31,6 @@ def create_arch(): vela_config=None, system_config=None, accelerator_config=architecture_features.Accelerator.Ethos_U55_128.value, - permanent_storage=MemArea.OnChipFlash, override_block_config=None, block_config_limit=None, global_memory_clock_scale=1.0, |