diff --git a/generic_ip/generic_sequencer/18/src/test/generic_sequencer_18_tb.vhd b/generic_ip/generic_sequencer/18/src/test/generic_sequencer_18_tb.vhd index eeee9e0..de872cb 100644 --- a/generic_ip/generic_sequencer/18/src/test/generic_sequencer_18_tb.vhd +++ b/generic_ip/generic_sequencer/18/src/test/generic_sequencer_18_tb.vhd @@ -20,7 +20,7 @@ architecture behav of generic_sequencer_18_tb is constant VECTOR_WIDTH : natural range 20 to 24 := 20; -- Test bench only works in this range constant RAMP_WIDTH : natural range 14 to 14 := 14; constant BUS_WIDTH : natural range 32 to 32 := 32; - constant POS_WIDTH : natural range 20 to 32 := 32; + constant POS_WIDTH : natural range 20 to 32 := 27; constant SEQ_DEPTH : natural range 512 to 4096 := 1024; -- NOTE Test Bench needs more than 256 but some blocks do use ony 256 constant ADD_VEC_PIPE : boolean := true; constant VECT_RAMP_EN : boolean := true; @@ -255,20 +255,32 @@ begin mm_32b_write(x"00000072", x"30000007", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (7) mm_32b_write(x"00000073", x"8_4_000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (set MSBs to 0) mm_32b_write(x"00000074", x"8_0_005433", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (abs pos d21555) - mm_32b_write(x"00000075", x"30000008", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (8) - mm_32b_write(x"00000076", x"F0000000", seq_mm_s_rec, seq_mm_m_rec); -- END + mm_32b_write(x"00000075", x"30000008", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (8) + mm_32b_write(x"00000076", x"8_4_0000FF", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (set MSBs to FF - negative) + mm_32b_write(x"00000077", x"8_3_FFFF9B", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (stored - d101 => d-1) + mm_32b_write(x"00000078", x"30000009", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (9) + mm_32b_write(x"00000079", x"8_1_FFFFFE", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (cur pos 0 x2 => d-3) + mm_32b_write(x"0000007a", x"3000000A", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (A) + mm_32b_write(x"0000007b", x"70000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_STORE (while at -3) + mm_32b_write(x"0000007c", x"3000000B", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (B) + mm_32b_write(x"0000007d", x"8_4_000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (set MSBs to 0) + mm_32b_write(x"0000007e", x"8_0_000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (abs pos 0) + mm_32b_write(x"0000007f", x"3000000C", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (C) + mm_32b_write(x"00000080", x"82000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (stored => d-3) + mm_32b_write(x"00000081", x"3000000D", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (D) + mm_32b_write(x"00000082", x"F0000000", seq_mm_s_rec, seq_mm_m_rec); -- END -- JUMP, RETURN - mm_32b_write(x"00000080", x"30000000", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- 00 - mm_32b_write(x"00000081", x"20000001", seq_mm_s_rec, seq_mm_m_rec); -- TRIG_WAIT - mm_32b_write(x"00000082", x"C00000F0", seq_mm_s_rec, seq_mm_m_rec); -- JUMP - mm_32b_write(x"00000083", x"30000001", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- 01 - mm_32b_write(x"00000084", x"C00000F3", seq_mm_s_rec, seq_mm_m_rec); -- JUMP - mm_32b_write(x"00000085", x"30000002", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- 00 - mm_32b_write(x"00000086", x"F0000000", seq_mm_s_rec, seq_mm_m_rec); -- END + mm_32b_write(x"00000084", x"30000000", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- 00 + mm_32b_write(x"00000085", x"20000001", seq_mm_s_rec, seq_mm_m_rec); -- TRIG_WAIT + mm_32b_write(x"00000086", x"C00000F0", seq_mm_s_rec, seq_mm_m_rec); -- JUMP + mm_32b_write(x"00000087", x"30000001", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- 01 + mm_32b_write(x"00000088", x"C00000F3", seq_mm_s_rec, seq_mm_m_rec); -- JUMP + mm_32b_write(x"00000089", x"30000002", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- 00 + mm_32b_write(x"0000008a", x"F0000000", seq_mm_s_rec, seq_mm_m_rec); -- END mm_32b_write(x"000000F0", x"300000F0", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- F0 mm_32b_write(x"000000F1", x"20000001", seq_mm_s_rec, seq_mm_m_rec); -- TRIG_WAIT - mm_32b_write(x"000000F2", x"C0000083", seq_mm_s_rec, seq_mm_m_rec); -- JUMP + mm_32b_write(x"000000F2", x"C0000087", seq_mm_s_rec, seq_mm_m_rec); -- JUMP mm_32b_write(x"000000F3", x"300000F1", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- F1 mm_32b_write(x"000000F4", x"E0000000", seq_mm_s_rec, seq_mm_m_rec); -- RETURN @@ -1051,6 +1063,25 @@ begin pos_in <= std_logic_vector(to_signed(21555, POS_WIDTH)); check_vector(10, 24x"8"); wait_clk_cycles(1); + -- stored position (100) - 101 + pos_in <= std_logic_vector(to_signed(-1, POS_WIDTH)); + check_vector(10, 24x"9"); + wait_clk_cycles(1); + -- stored position (-1) - 2 + pos_in <= std_logic_vector(to_signed(-3, POS_WIDTH)); + check_vector(10, 24x"A"); + wait_clk_cycles(1); + check_vector(10, 24x"B"); -- position is stored! + wait_clk_cycles(1); + -- abs position 0 + pos_in <= std_logic_vector(to_signed(0, POS_WIDTH)); + check_vector(10, 24x"C"); + wait_clk_cycles(1); + -- stored position which was -3 + pos_in <= std_logic_vector(to_signed(-3, POS_WIDTH)); + check_vector(10, 24x"D"); + wait_clk_cycles(1); + pos_in <= (others => '0'); @@ -1061,8 +1092,8 @@ begin -- check the value of pos_store csr_read(CSR_POS_STORE_ADDR, data); - if (data(23 downto 0) /= std_logic_vector(to_unsigned(100, 24))) then - log("ERROR: Read pos_stored = 0x" & to_hstring(data(23 downto 0)) & ", expected = 0x" & to_hstring(std_logic_vector(to_unsigned(100, POS_WIDTH))) & ".", VLOW); + if (data(POS_WIDTH - 1 downto 0) /= std_logic_vector(to_signed(-3, POS_WIDTH))) then + log("ERROR: Read pos_stored = 0x" & to_hstring(data(POS_WIDTH - 1 downto 0)) & ", expected = 0x" & to_hstring(std_logic_vector(to_unsigned(100, POS_WIDTH))) & ".", VLOW); error_flag <= true; wait; end if; @@ -1079,7 +1110,7 @@ begin -- Issue a start request trigger_in <= (others => '0'); wait until clk = '1' and clk'event; - start_addr <= std_logic_vector(to_unsigned(8 * 16, log2(SEQ_DEPTH))); + start_addr <= std_logic_vector(to_unsigned(8 * 16 + 4, log2(SEQ_DEPTH))); start_req <= '1'; wait until clk = '1' and clk'event; start_req <= '0';