From: Cesar Strauss Date: Fri, 1 Jan 2021 14:11:24 +0000 (-0300) Subject: Move NOP test case earlier X-Git-Tag: 24jan2021_ls180~45 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=38425a9889f6c24b3d8cb98034de621c2b02b401;p=soc.git Move NOP test case earlier Better way to see alu_o_ok being disabled during the instruction. --- diff --git a/src/soc/experiment/test/test_compalu_multi.py b/src/soc/experiment/test/test_compalu_multi.py index 0f5f6a7c..7fb946c7 100644 --- a/src/soc/experiment/test/test_compalu_multi.py +++ b/src/soc/experiment/test/test_compalu_multi.py @@ -454,6 +454,10 @@ def scoreboard_sim(op): yield from op.issue([5, 2], MicrOp.OP_CMP, [3], src_delays=[0, 1], dest_delays=[2]) # test all combinations of masked input ports + # NOP does not make any request nor response + yield from op.issue([5, 2], MicrOp.OP_NOP, [0], + rdmaskn=[1, 1], wrmask=[1], + src_delays=[1, 2], dest_delays=[1]) # sign_extend(0x80) = 0xFF80 yield from op.issue([0x80, 2], MicrOp.OP_EXTS, [0xFF80], rdmaskn=[0, 1], @@ -462,10 +466,6 @@ def scoreboard_sim(op): yield from op.issue([2, 0x80], MicrOp.OP_EXTSWSLI, [0xFF80], rdmaskn=[1, 0], src_delays=[1, 2], dest_delays=[1]) - # NOP does not make any request nor response - yield from op.issue([5, 2], MicrOp.OP_NOP, [0], - rdmaskn=[1, 1], wrmask=[1], - src_delays=[1, 2], dest_delays=[1]) def test_compunit_fsm(): @@ -691,7 +691,7 @@ def test_compunit_regspec1(): 'op__insn_type', 'op__invert_in', 'a[15:0]', 'b[15:0]', 'valid_i', 'ready_o']), ('next port', 'out', [ - 'alu_o[15:0]', 'valid_o', 'ready_i'])]), + 'alu_o[15:0]', 'valid_o', 'ready_i', 'alu_o_ok'])]), ('debug', {'module': 'top'}, ['src1_count[7:0]', 'src2_count[7:0]', 'dest1_count[7:0]'])]