From c7a2c92f188ab846cc52392a1ad7f6fae8626fd5 Mon Sep 17 00:00:00 2001 From: Cesar Strauss Date: Thu, 31 Dec 2020 10:36:58 -0300 Subject: [PATCH] Show rdmaskn and wrmask in GTKWave --- src/soc/experiment/test/test_compalu_multi.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/soc/experiment/test/test_compalu_multi.py b/src/soc/experiment/test/test_compalu_multi.py index 70256cf9..34360293 100644 --- a/src/soc/experiment/test/test_compalu_multi.py +++ b/src/soc/experiment/test/test_compalu_multi.py @@ -605,19 +605,22 @@ def test_compunit_regspec3(): + ('' if is_engine_pysim() else '[6:0]'), {'display': 'insn_type'})]), ('operand 1 port', 'in', [ + ('cu_rdmaskn_i[2:0]', {'bit': 2}), ('cu_rd__rel_o[2:0]', {'bit': 2}), ('cu_rd__go_i[2:0]', {'bit': 2}), 'src1_i[15:0]']), ('operand 2 port', 'in', [ + ('cu_rdmaskn_i[2:0]', {'bit': 1}), ('cu_rd__rel_o[2:0]', {'bit': 1}), ('cu_rd__go_i[2:0]', {'bit': 1}), 'src2_i[15:0]']), ('operand 3 port', 'in', [ + ('cu_rdmaskn_i[2:0]', {'bit': 0}), ('cu_rd__rel_o[2:0]', {'bit': 0}), ('cu_rd__go_i[2:0]', {'bit': 0}), 'src1_i[15:0]']), ('result port', 'out', [ - 'cu_wr__rel_o', 'cu_wr__go_i', 'dest1_o[15:0]']), + 'cu_wrmask_o', 'cu_wr__rel_o', 'cu_wr__go_i', 'dest1_o[15:0]']), ('alu', {'submodule': 'alu'}, [ ('prev port', 'in', [ 'oper_i_None__insn_type', 'i1[15:0]', @@ -673,15 +676,17 @@ def test_compunit_regspec1(): ('oper_i_None__imm_data__ok', {'display': 'imm_ok'}), ('oper_i_None__zero_a', {'display': 'zero_a'})]), ('operand 1 port', 'in', [ + ('cu_rdmaskn_i[1:0]', {'bit': 1}), ('cu_rd__rel_o[1:0]', {'bit': 1}), ('cu_rd__go_i[1:0]', {'bit': 1}), 'src1_i[15:0]']), ('operand 2 port', 'in', [ + ('cu_rdmaskn_i[1:0]', {'bit': 0}), ('cu_rd__rel_o[1:0]', {'bit': 0}), ('cu_rd__go_i[1:0]', {'bit': 0}), 'src2_i[15:0]']), ('result port', 'out', [ - 'cu_wr__rel_o', 'cu_wr__go_i', 'dest1_o[15:0]']), + 'cu_wrmask_o', 'cu_wr__rel_o', 'cu_wr__go_i', 'dest1_o[15:0]']), ('alu', {'submodule': 'alu'}, [ ('prev port', 'in', [ 'op__insn_type', 'op__invert_in', 'a[15:0]', 'b[15:0]', -- 2.30.2