ELGIP-159 The msb control now seems to work. Test bench uses it for pos and neg numbers

This commit is contained in:
Damian Smith 2021-10-27 16:41:42 +01:00
commit f4d4001eb8
3 changed files with 60 additions and 18 deletions

View file

@ -1,7 +1,6 @@
onerror {resume}
quietly WaveActivateNextPane {} 0
add wave -noupdate /generic_sequencer_18_tb/clk
add wave -noupdate /generic_sequencer_18_tb/reset_n
add wave -noupdate /generic_sequencer_18_tb/avs_csr_address
add wave -noupdate /generic_sequencer_18_tb/avs_csr_write
add wave -noupdate -radix hexadecimal /generic_sequencer_18_tb/avs_csr_writedata
@ -42,7 +41,7 @@ add wave -noupdate -radix hexadecimal /generic_sequencer_18_tb/iUUT/avs_seq_writ
add wave -noupdate /generic_sequencer_18_tb/iUUT/avs_seq_read
add wave -noupdate -radix hexadecimal /generic_sequencer_18_tb/iUUT/avs_seq_readdata
add wave -noupdate /generic_sequencer_18_tb/iUUT/start_req
add wave -noupdate -radix hexadecimal -childformat {{/generic_sequencer_18_tb/iUUT/start_addr(8) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(7) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(6) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(5) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(4) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(3) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(2) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(1) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(0) -radix hexadecimal}} -subitemconfig {/generic_sequencer_18_tb/iUUT/start_addr(8) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(7) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(6) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(5) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(4) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(3) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(2) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(1) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(0) {-height 15 -radix hexadecimal}} /generic_sequencer_18_tb/iUUT/start_addr
add wave -noupdate -radix hexadecimal -childformat {{/generic_sequencer_18_tb/iUUT/start_addr(9) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(8) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(7) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(6) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(5) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(4) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(3) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(2) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(1) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/start_addr(0) -radix hexadecimal}} -subitemconfig {/generic_sequencer_18_tb/iUUT/start_addr(9) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(8) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(7) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(6) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(5) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(4) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(3) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(2) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(1) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/start_addr(0) {-height 15 -radix hexadecimal}} /generic_sequencer_18_tb/iUUT/start_addr
add wave -noupdate -radix hexadecimal -childformat {{/generic_sequencer_18_tb/iUUT/trigger_in(11) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(10) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(9) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(8) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(7) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(6) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(5) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(4) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(3) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(2) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(1) -radix hexadecimal} {/generic_sequencer_18_tb/iUUT/trigger_in(0) -radix hexadecimal}} -subitemconfig {/generic_sequencer_18_tb/iUUT/trigger_in(11) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(10) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(9) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(8) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(7) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(6) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(5) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(4) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(3) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(2) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(1) {-height 15 -radix hexadecimal} /generic_sequencer_18_tb/iUUT/trigger_in(0) {-height 15 -radix hexadecimal}} /generic_sequencer_18_tb/iUUT/trigger_in
add wave -noupdate -radix hexadecimal /generic_sequencer_18_tb/iUUT/pos_in
add wave -noupdate /generic_sequencer_18_tb/iUUT/busy
@ -139,6 +138,9 @@ add wave -noupdate /generic_sequencer_18_tb/iUUT/decode
add wave -noupdate /generic_sequencer_18_tb/iUUT/busy_i
add wave -noupdate /generic_sequencer_18_tb/iUUT/ld_start_addr
add wave -noupdate /generic_sequencer_18_tb/iUUT/ld_pos
add wave -noupdate /generic_sequencer_18_tb/iUUT/pos_comp_msbs
add wave -noupdate /generic_sequencer_18_tb/iUUT/operand_comp
add wave -noupdate /generic_sequencer_18_tb/iUUT/gPOS_GEN/pPOS_REGs/pos_comp_vector
TreeUpdate [SetDefaultTree]
WaveRestoreCursors {{Cursor 1} {24927383 ps} 0}
quietly wave cursor active 1
@ -156,4 +158,4 @@ configure wave -griddelta 40
configure wave -timeline 0
configure wave -timelineunits ps
update
WaveRestoreZoom {23944887 ps} {27786423 ps}
WaveRestoreZoom {27340541 ps} {31182077 ps}

View file

@ -505,7 +505,11 @@ begin
fsm_nxt <= s_fetch;
when s_pos_wait =>
if (pos_in = pos_target) then
if subcode = x"4" then
-- don't wait - just set the comparator top bits
fsm_nxt <= s_fetch;
pos_comp_msbs <= operand_1(pos_comp_msbs'range);
elsif (pos_in = pos_target) then
fsm_nxt <= s_fetch;
end if;
@ -760,8 +764,6 @@ begin
pos_target <= pos_store;
when X"3" =>
pos_target <= std_logic_vector(signed(pos_store) + signed(pos_comp_vector(pos_in'range)));
when X"4" =>
pos_comp_msbs <= operand_1(pos_comp_msbs'range);
when others => null;
end case;
end if;

View file

@ -20,8 +20,8 @@ architecture behav of generic_sequencer_18_tb is
constant VECTOR_WIDTH : natural range 1 to 24 := 24; -- FIXME test bench assumes 24
constant RAMP_WIDTH : natural range 1 to 16 := 14; -- FIXME test bench assumes 14
constant BUS_WIDTH : natural range 1 to 32 := 32;
constant POS_WIDTH : natural range 1 to 32 := 32;
constant SEQ_DEPTH : natural range 512 to 4096 := 4096; -- NOTE Test Bench needs more than 256 but some code does use 256
constant POS_WIDTH : natural range 1 to 32 := 32; -- FIXME need to test negative offsets with and without top bits
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;
constant BUS_BURST_EN : boolean := true;
@ -234,17 +234,29 @@ begin
mm_32b_write(x"0000004B", x"F0000000", seq_mm_s_rec, seq_mm_m_rec); -- End
-- POS_STORE, POS_WAIT
mm_32b_write(x"00000060", x"30000000", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET
mm_32b_write(x"00000061", x"80000064", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT
mm_32b_write(x"00000060", x"30000000", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (0)
mm_32b_write(x"00000061", x"80000064", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (abs pos x64, d100)
mm_32b_write(x"00000062", x"70000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_STORE
mm_32b_write(x"00000063", x"30000001", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET
mm_32b_write(x"00000064", x"81000032", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT
mm_32b_write(x"00000065", x"30000002", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET
mm_32b_write(x"00000066", x"82000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT
mm_32b_write(x"00000067", x"30000003", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET
mm_32b_write(x"00000068", x"83000014", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT
mm_32b_write(x"00000069", x"30000004", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET
mm_32b_write(x"0000006A", x"F0000000", seq_mm_s_rec, seq_mm_m_rec); -- END
mm_32b_write(x"00000063", x"30000001", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (1)
mm_32b_write(x"00000064", x"81000032", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (cur pos + x32 => d150)
mm_32b_write(x"00000065", x"30000002", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (2)
mm_32b_write(x"00000066", x"82000000", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (stored => d100)
mm_32b_write(x"00000067", x"30000003", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (3)
mm_32b_write(x"00000068", x"83000014", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (stored + x14 => d120)
mm_32b_write(x"00000069", x"30000004", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (4)
mm_32b_write(x"0000006A", x"8_4_0000FF", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (set MSBs to negative)
mm_32b_write(x"0000006B", x"8_0_FFFF9C", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (abs pos d-100)
mm_32b_write(x"0000006C", x"30000005", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (5)
mm_32b_write(x"0000006D", x"8_4_00007F", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (set MSBs to 7f - large pos)
mm_32b_write(x"0000006E", x"8_0_FFABCD", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (abs pos d2147462093)
mm_32b_write(x"0000006F", x"30000006", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET (6)
mm_32b_write(x"00000070", x"8_4_000080", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (set MSBs to 80 - large neg)
mm_32b_write(x"00000071", x"8_0_005433", seq_mm_s_rec, seq_mm_m_rec); -- POS_WAIT (abs pos d-2147462093)
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
-- JUMP, RETURN
mm_32b_write(x"00000080", x"30000000", seq_mm_s_rec, seq_mm_m_rec); -- VEC_SET -- 00
@ -1014,6 +1026,32 @@ begin
pos_in <= std_logic_vector(to_unsigned(120, POS_WIDTH));
check_vector(10, 24x"4");
wait_clk_cycles(1);
-- check that pos 100 doesn't trigger when waiting for negative
pos_in <= std_logic_vector(to_unsigned(100, POS_WIDTH));
check_vector(10, 24x"4");
wait_clk_cycles(1);
-- check that neg 99 doesn't trigger when waiting for negative
pos_in <= std_logic_vector(to_signed(-99, POS_WIDTH));
check_vector(10, 24x"4");
wait_clk_cycles(1);
-- check that neg 101 doesn't trigger when waiting for negative
pos_in <= std_logic_vector(to_signed(-101, POS_WIDTH));
check_vector(10, 24x"4");
wait_clk_cycles(1);
-- check that neg 100 triggers
pos_in <= std_logic_vector(to_signed(-100, POS_WIDTH));
check_vector(10, 24x"5");
wait_clk_cycles(1);
pos_in <= std_logic_vector(to_signed(2147462093, POS_WIDTH));
check_vector(10, 24x"6");
wait_clk_cycles(1);
pos_in <= std_logic_vector(to_signed(-2147462093, POS_WIDTH));
check_vector(10, 24x"7");
wait_clk_cycles(1);
pos_in <= std_logic_vector(to_signed(21555, POS_WIDTH));
check_vector(10, 24x"8");
wait_clk_cycles(1);
pos_in <= (others => '0');
if (busy /= '0') then