diff --git a/generic_ip/common/0/src/test/avalon_verify_pkg.vhd b/generic_ip/common/0/src/test/avalon_verify_pkg.vhd index 8c2e4b0..81e5a75 100644 --- a/generic_ip/common/0/src/test/avalon_verify_pkg.vhd +++ b/generic_ip/common/0/src/test/avalon_verify_pkg.vhd @@ -8,6 +8,9 @@ library OSVVM ; use OSVVM.RandomBasePkg.all ; use OSVVM.RandomPkg.all ; +library work; +use work.common_test_pkg.all; + package AVALON_VERIFY_PKG is shared variable RV : RandomPType; @@ -29,6 +32,9 @@ package AVALON_VERIFY_PKG is signal clk_clk : std_logic := '0'; signal reset_reset_n : std_logic := '0'; + + shared variable mm_read_latency : prot_int_t; + shared variable mm_use_waitrequest : prot_flag_t; ----------------------------------------------------------------------------- -- Avalon MM section @@ -87,7 +93,7 @@ package AVALON_VERIFY_PKG is mm_readdatavalid : std_logic; end record; - procedure mm_m_init( signal mm_m_rec : out mm_m_rec_t ); + procedure mm_m_init( signal mm_m_rec : out mm_m_rec_t; read_latency : natural := 0; use_waitrequest : boolean := false); procedure mm_s_init( signal mm_s_rec : out mm_s_rec_t ); procedure mm_128b_m_init( signal mm_m_rec : out mm_128b_m_rec_t ); @@ -241,7 +247,7 @@ package body AVALON_VERIFY_PKG is mm_s_rec.mm_readdatavalid <= '0'; end mm_128b_s_init; - procedure mm_m_init( signal mm_m_rec : out mm_m_rec_t ) is + procedure mm_m_init( signal mm_m_rec : out mm_m_rec_t; read_latency : natural := 0; use_waitrequest : boolean := false) is begin mm_m_rec.mm_address <= (others => '0'); mm_m_rec.mm_byteenable <= (others => '0'); @@ -251,6 +257,12 @@ package body AVALON_VERIFY_PKG is mm_m_rec.mm_byteenable <= (others => '0'); mm_m_rec.mm_debugaccess <= '0'; mm_m_rec.mm_burstcount <= (others => '0'); + mm_read_latency.set(read_latency); + if(use_waitrequest = true) then + mm_use_waitrequest.set; + else + mm_use_waitrequest.reset; + end if; end mm_m_init; procedure mm_s_init( signal mm_s_rec : out mm_s_rec_t ) is @@ -267,7 +279,7 @@ package body AVALON_VERIFY_PKG is signal mm_m_rec : out mm_128b_m_rec_t) is begin wait until rising_edge(clk_clk); - if mm_s_rec.mm_waitrequest = '1' then + if(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') then wait until falling_edge(mm_s_rec.mm_waitrequest); end if; for i in 0 to size-1 loop @@ -302,7 +314,7 @@ package body AVALON_VERIFY_PKG is signal mm_m_rec : out mm_m_rec_t) is begin wait until rising_edge(clk_clk); - if mm_s_rec.mm_waitrequest = '1' then + if(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') then wait until falling_edge(mm_s_rec.mm_waitrequest); end if; for i in 0 to size-1 loop @@ -341,7 +353,7 @@ package body AVALON_VERIFY_PKG is mm_m_rec.mm_writedata <= data; mm_m_rec.mm_write <= '1'; wait until falling_edge(clk_clk); - while mm_s_rec.mm_waitrequest = '1' loop + while(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') loop wait until falling_edge(clk_clk); end loop; wait until rising_edge(clk_clk); @@ -360,7 +372,7 @@ package body AVALON_VERIFY_PKG is my_addr := std_logic_vector(unsigned(my_addr)+2); end if; wait until rising_edge(clk_clk); - if mm_s_rec.mm_waitrequest = '1' then + if(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') then wait until falling_edge(mm_s_rec.mm_waitrequest); end if; mm_m_rec.mm_address <= addr or base_addr; @@ -383,7 +395,7 @@ package body AVALON_VERIFY_PKG is signal mm_m_rec : out mm_m_rec_t) is begin wait until rising_edge(clk_clk); - if mm_s_rec.mm_waitrequest = '1' then + if(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') then wait until falling_edge(mm_s_rec.mm_waitrequest); end if; mm_m_rec.mm_address <= addr or base_addr; @@ -413,11 +425,16 @@ package body AVALON_VERIFY_PKG is mm_m_rec.mm_address <= addr or base_addr; mm_m_rec.mm_read <= '1'; wait until falling_edge(clk_clk); - while mm_s_rec.mm_waitrequest = '1' loop + while(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') loop wait until falling_edge(clk_clk); end loop; wait until rising_edge(clk_clk); mm_m_rec.mm_read <= '0'; + if(mm_use_waitrequest.is_set = false) then + for n in 1 to mm_read_latency.get loop + wait until rising_edge(clk_clk); + end loop; -- n + end if; if(mm_s_rec.use_readvalid = true) then if(mm_s_rec.mm_readdatavalid = '0') then wait until mm_s_rec.mm_readdatavalid = '1'; @@ -433,7 +450,7 @@ package body AVALON_VERIFY_PKG is signal mm_m_rec : out mm_m_rec_t) is begin wait until rising_edge(clk_clk); - if mm_s_rec.mm_waitrequest = '1' then + if(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') then wait until falling_edge(mm_s_rec.mm_waitrequest); end if; mm_m_rec.mm_address <= addr or base_addr; @@ -450,7 +467,7 @@ package body AVALON_VERIFY_PKG is signal mm_m_rec : out mm_m_rec_t) is begin wait until rising_edge(clk_clk); - if mm_s_rec.mm_waitrequest = '1' then + if(mm_use_waitrequest.is_set = true and mm_s_rec.mm_waitrequest = '1') then wait until falling_edge(mm_s_rec.mm_waitrequest); end if; mm_m_rec.mm_address <= addr or base_addr; diff --git a/generic_ip/fire_pulse_manager/1/sim/sim_fpm.do b/generic_ip/fire_pulse_manager/1/sim/sim_fpm.do index fa56acf..b2d28b8 100644 --- a/generic_ip/fire_pulse_manager/1/sim/sim_fpm.do +++ b/generic_ip/fire_pulse_manager/1/sim/sim_fpm.do @@ -20,9 +20,6 @@ vcom -2008 -work OSVVM $OSVVM_PATH/RandomBasePkg.vhd vcom -2008 -work OSVVM $OSVVM_PATH/SortListPkg_int.vhd vcom -2008 -work OSVVM $OSVVM_PATH/RandomPkg.vhd -# Compile the VHDL packages that support bus protocols, memory mapped registers and functional procedures -vcom -2008 -work $WORKLIB $COMMON_PATH/test/avalon_verify_pkg.vhd - # Compile the testbench support files: # Log package and common @@ -31,6 +28,9 @@ vcom -2008 -work $WORKLIB $COMMON_PATH/common_pkg.vhd vcom -2008 -work $WORKLIB $COMMON_PATH/test/common_test_pkg.vhd vcom -2008 -work $WORKLIB $COMMON_PATH/test/log_pkg.vhd +# Compile the VHDL packages that support bus protocols, memory mapped registers and functional procedures +vcom -2008 -work $WORKLIB $COMMON_PATH/test/avalon_verify_pkg.vhd + # Generic Sequencer vcom -2008 -work $WORKLIB $GENERIC_PATH/generic_sequencer/15/src/dpram_sclk_15.vhd vcom -2008 -work $WORKLIB $GENERIC_PATH/generic_sequencer/15/src/generic_sequencer_15_pkg.vhd diff --git a/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd b/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd index 938a1bb..c2d26f8 100644 --- a/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd +++ b/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd @@ -27,7 +27,7 @@ architecture behav of generic_sequencer_15_tb is constant QUEUE_EN : boolean := true; constant CSR_IP_ID : std_logic_vector(31 downto 0) := x"0000FF01"; - constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000010"; + constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000F10"; constant CLK_PERIOD : time := 10 ns; @@ -483,7 +483,7 @@ begin -- Check IP Version reg csr_read(CSR_IP_VER_ADDR, data); if(data /= CSR_IP_VER) then - log("ERROR: detected IP VersionID: read = 0x" & to_hstring(data) & ", expected = 0x" & to_hstring(CSR_IP_VER) & ".", VLOW); + log("ERROR: detected IP Version: read = 0x" & to_hstring(data) & ", expected = 0x" & to_hstring(CSR_IP_VER) & ".", VLOW); error_flag <= true; wait; end if;