From 601cef1e77f65cf8fe55d7ba5a4c3ba02932412f Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 13 Jan 2023 13:34:52 +0000 Subject: [PATCH] CORE-798 Make EL GIP Library FPGA Vendor Independent. Make common library versioned --- generic_ip/common/1/sim/files.tcl | 24 +++++++++---------- generic_ip/common/1/sim/tb_async_fifo.vhd | 8 +++---- generic_ip/common/1/sim/tb_dp_ram.vhd | 6 ++--- generic_ip/common/1/sim/tb_rw_dp_ram.vhd | 6 ++--- generic_ip/common/1/sim/tb_sync_fifo.vhd | 8 +++---- generic_ip/common/1/src/queue_and_delay_1.vhd | 4 ++-- .../19/src/generic_sequencer_19.vhd | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/generic_ip/common/1/sim/files.tcl b/generic_ip/common/1/sim/files.tcl index fda0d84..720ed9c 100644 --- a/generic_ip/common/1/sim/files.tcl +++ b/generic_ip/common/1/sim/files.tcl @@ -1,18 +1,18 @@ ../../0/src/common_pkg.vhd ../../0/src/sync_pulse.vhd -../../1/src/vendor_pkg.vhd -../src/altera/alt_async_fifo.vhd -../src/inferred/inferred_async_fifo.vhd -../src/shim/async_fifo.vhd +../../1/src/vendor_pkg_1.vhd +../src/altera/alt_async_fifo_1.vhd +../src/inferred/inferred_async_fifo_1.vhd +../src/shim/async_fifo_1.vhd tb_async_fifo.vhd -../src/altera/alt_sync_fifo.vhd -../src/inferred/inferred_sync_fifo.vhd -../src/shim/sync_fifo.vhd +../src/altera/alt_sync_fifo_1.vhd +../src/inferred/inferred_sync_fifo_1.vhd +../src/shim/sync_fifo_1.vhd tb_sync_fifo.vhd -../src/inferred/inferred_dpram.vhd -../src/altera/alt_dp_ram.vhd -../src/shim/dp_ram.vhd +../src/inferred/inferred_dpram_1.vhd +../src/altera/alt_dp_ram_1.vhd +../src/shim/dp_ram_1.vhd tb_dp_ram.vhd -../src/altera/alt_rw_dp_ram.vhd -../src/shim/rw_dp_ram.vhd +../src/altera/alt_rw_dp_ram_1.vhd +../src/shim/rw_dp_ram_1.vhd tb_rw_dp_ram.vhd diff --git a/generic_ip/common/1/sim/tb_async_fifo.vhd b/generic_ip/common/1/sim/tb_async_fifo.vhd index 08fdaaf..d01cc6b 100644 --- a/generic_ip/common/1/sim/tb_async_fifo.vhd +++ b/generic_ip/common/1/sim/tb_async_fifo.vhd @@ -64,7 +64,7 @@ architecture sim of tb_async_fifo is --}}} --{{{ - component async_fifo + component async_fifo_1 generic ( DATA_WIDTH : natural range 1 to 256 := 32; DEPTH : natural range 2 to 131072 := 64; @@ -96,7 +96,7 @@ architecture sim of tb_async_fifo is --shared variable test_array : mem; begin --{{{ - c_alt_async_fifo : async_fifo -- altera version + c_alt_async_fifo : async_fifo_1 -- altera version generic map ( DEVICE_FAMILY => ALT_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, @@ -119,7 +119,7 @@ begin --}}} --{{{ - c_xil_async_fifo : async_fifo -- xilinx version + c_xil_async_fifo : async_fifo_1 -- xilinx version generic map ( DEVICE_FAMILY => XIL_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, @@ -142,7 +142,7 @@ begin --}}} --{{{ - c_efx_async_fifo : async_fifo -- efinix version + c_efx_async_fifo : async_fifo_1 -- efinix version generic map ( DEVICE_FAMILY => EFX_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, diff --git a/generic_ip/common/1/sim/tb_dp_ram.vhd b/generic_ip/common/1/sim/tb_dp_ram.vhd index 5872a48..52639b6 100644 --- a/generic_ip/common/1/sim/tb_dp_ram.vhd +++ b/generic_ip/common/1/sim/tb_dp_ram.vhd @@ -48,7 +48,7 @@ architecture sim of tb_dp_ram is signal docheck : boolean := false; --}}} --{{{ - component dp_ram + component dp_ram_1 generic ( DATA_WIDTH : natural range 1 to 256 := 32; DEPTH : natural range 2 to 131072 := 128; @@ -70,7 +70,7 @@ architecture sim of tb_dp_ram is begin --{{{ - c_alt_dp_ram : dp_ram -- altera version + c_alt_dp_ram : dp_ram_1 -- altera version generic map ( DEVICE_FAMILY => ALT_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, @@ -89,7 +89,7 @@ begin --}}} --{{{ - c_xil_dp_ram : dp_ram -- xilinx version + c_xil_dp_ram : dp_ram_1 -- xilinx version generic map ( DEVICE_FAMILY => XIL_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, diff --git a/generic_ip/common/1/sim/tb_rw_dp_ram.vhd b/generic_ip/common/1/sim/tb_rw_dp_ram.vhd index ef997bc..f36ee23 100644 --- a/generic_ip/common/1/sim/tb_rw_dp_ram.vhd +++ b/generic_ip/common/1/sim/tb_rw_dp_ram.vhd @@ -49,7 +49,7 @@ architecture sim of tb_rw_dp_ram is signal docheck : boolean := false; --}}} --{{{ - component rw_dp_ram + component rw_dp_ram_1 generic ( DATA_WIDTH : natural range 1 to 256 := 32; DEPTH : natural range 2 to 131072 := 128; @@ -74,7 +74,7 @@ architecture sim of tb_rw_dp_ram is begin --{{{ - c_alt_rw_dp_ram : rw_dp_ram -- altera version + c_alt_rw_dp_ram : rw_dp_ram_1 -- altera version generic map ( DEVICE_FAMILY => ALT_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, @@ -96,7 +96,7 @@ begin --}}} --{{{ - c_xil_rw_dp_ram : rw_dp_ram -- xilinx version + c_xil_rw_dp_ram : rw_dp_ram_1 -- xilinx version generic map ( DEVICE_FAMILY => XIL_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, diff --git a/generic_ip/common/1/sim/tb_sync_fifo.vhd b/generic_ip/common/1/sim/tb_sync_fifo.vhd index 8bb4eab..45fd802 100644 --- a/generic_ip/common/1/sim/tb_sync_fifo.vhd +++ b/generic_ip/common/1/sim/tb_sync_fifo.vhd @@ -74,7 +74,7 @@ architecture sim of tb_sync_fifo is signal docheck : boolean; --}}} --{{{ - component sync_fifo + component sync_fifo_1 generic ( DATA_WIDTH : natural range 1 to 256 := 32; DEPTH : natural range 1 to 131072 := 64; @@ -111,7 +111,7 @@ architecture sim of tb_sync_fifo is --shared variable test_array : mem; begin --{{{ - c_alt_sync_fifo : sync_fifo -- altera version + c_alt_sync_fifo : sync_fifo_1 -- altera version generic map ( DEVICE_FAMILY => ALT_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, @@ -138,7 +138,7 @@ begin --}}} --{{{ - c_xil_sync_fifo : sync_fifo -- xilinx version + c_xil_sync_fifo : sync_fifo_1 -- xilinx version generic map ( DEVICE_FAMILY => XIL_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, @@ -165,7 +165,7 @@ begin --}}} --{{{ - c_efx_sync_fifo : sync_fifo -- xilinx version + c_efx_sync_fifo : sync_fifo_1 -- xilinx version generic map ( DEVICE_FAMILY => EFX_DEVICE_FAMILY, DATA_WIDTH => DATA_WIDTH, diff --git a/generic_ip/common/1/src/queue_and_delay_1.vhd b/generic_ip/common/1/src/queue_and_delay_1.vhd index 361e513..bd0fc44 100644 --- a/generic_ip/common/1/src/queue_and_delay_1.vhd +++ b/generic_ip/common/1/src/queue_and_delay_1.vhd @@ -51,7 +51,7 @@ end queue_and_delay_1; architecture RTL of queue_and_delay_1 is - component sync_fifo + component sync_fifo_1 generic ( DATA_WIDTH : natural range 1 to 256 := 32; DEPTH : natural range 1 to 131072 := 64; @@ -107,7 +107,7 @@ begin -- RTL end if; end process pInputEdgeDetect; - iENTRY_QUEUE: sync_fifo + iENTRY_QUEUE: sync_fifo_1 generic map( DATA_WIDTH => 32, DEPTH => QUEUE_SIZE, diff --git a/generic_ip/generic_sequencer/19/src/generic_sequencer_19.vhd b/generic_ip/generic_sequencer/19/src/generic_sequencer_19.vhd index 69d1c5c..e174cc0 100644 --- a/generic_ip/generic_sequencer/19/src/generic_sequencer_19.vhd +++ b/generic_ip/generic_sequencer/19/src/generic_sequencer_19.vhd @@ -345,7 +345,7 @@ begin -- Dual-Port Memory buffer ----------------------------------------------------------------------------- - iRAM : entity work.rw_dp_ram + iRAM : entity work.rw_dp_ram_1 generic map( DATA_WIDTH => 32, DEPTH => SEQ_DEPTH,