includes: Minor changes and fixes

Signed-off-by: Istvan-Zsolt Szekely <[email protected]>
analogdevicesinc · Nov 5, 2024 · a9d14db · a9d14db
1 parent 28bbead
commit a9d14db
Show file tree

Hide file tree

Showing 40 changed files with 183 additions and 176 deletions.
diff --git a/library/includes/Makeinclude_axi b/library/includes/Makeinclude_axi
@@ -3,6 +3,6 @@
 ####################################################################################
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/vip/amd/m_axi_sequencer.sv
-SV_DEPS += ../../../library/vip/amd/s_axi_sequencer.sv
-SV_DEPS += ../../../library/regmaps/reg_accessor.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/vip/amd/m_axi_sequencer.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/vip/amd/s_axi_sequencer.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/reg_accessor.sv
diff --git a/library/includes/Makeinclude_axis b/library/includes/Makeinclude_axis
@@ -3,5 +3,5 @@
 ####################################################################################
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/vip/amd/m_axis_sequencer.sv
-SV_DEPS += ../../../library/vip/amd/s_axis_sequencer.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/vip/amd/m_axis_sequencer.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/vip/amd/s_axis_sequencer.sv
diff --git a/library/includes/Makeinclude_common b/library/includes/Makeinclude_common
@@ -3,13 +3,13 @@
 ####################################################################################
 
 # Makeincludes
-include $(TB_PATH)/library/includes/Makeinclude_axi
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axi
 
 # All test-bench dependencies except test programs
-SV_DEPS += $(TB_PATH)/library/utilities/utils.svh
-SV_DEPS += $(TB_PATH)/library/utilities/logger_pkg.sv
-SV_DEPS += $(TB_PATH)/library/utilities/test_harness_env.sv
-SV_DEPS += $(TB_PATH)/library/drivers/common/watchdog.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/utilities/utils.svh
+SV_DEPS += $(TB_LIBRARY_PATH)/utilities/logger_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/utilities/test_harness_env.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/common/watchdog.sv
 
 SV_DEPS += system_tb.sv
 

diff --git a/library/includes/Makeinclude_data_offload b/library/includes/Makeinclude_data_offload
@@ -3,8 +3,8 @@
 ####################################################################################
 
 # Makeincludes
-include ../../../library/includes/Makeinclude_regmap
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_regmap
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/drivers/data_offload/data_offload_api.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_data_offload_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/data_offload/data_offload_api.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_data_offload_pkg.sv
diff --git a/library/includes/Makeinclude_dmac b/library/includes/Makeinclude_dmac
@@ -3,9 +3,9 @@
 ####################################################################################
 
 # Makeincludes
-include ../../../library/includes/Makeinclude_regmap
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_regmap
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/drivers/dmac/dma_trans.sv
-SV_DEPS += ../../../library/drivers/dmac/dmac_api.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_dmac_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/dmac/dma_trans.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/dmac/dmac_api.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_dmac_pkg.sv
diff --git a/library/includes/Makeinclude_jesd b/library/includes/Makeinclude_jesd
@@ -3,12 +3,12 @@
 ####################################################################################
 
 # Makeincludes
-include ../../../library/includes/Makeinclude_regmap
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_regmap
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/drivers/jesd/adi_jesd204_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_jesd_rx_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_jesd_tx_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_jesd_tpl_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/jesd/adi_jesd204_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_jesd_rx_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_jesd_tx_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_jesd_tpl_pkg.sv
 
-ENV_DEPS += ../../../library/drivers/jesd/jesd_exerciser.tcl
+ENV_DEPS += $(TB_LIBRARY_PATH)/drivers/jesd/jesd_exerciser.tcl
diff --git a/library/includes/Makeinclude_regmap b/library/includes/Makeinclude_regmap
@@ -3,6 +3,6 @@
 ####################################################################################
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/regmaps/reg_accessor.sv
-SV_DEPS += ../../../library/regmaps/adi_peripheral_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/reg_accessor.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_peripheral_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_pkg.sv
diff --git a/library/includes/Makeinclude_scoreboard b/library/includes/Makeinclude_scoreboard
@@ -3,7 +3,7 @@
 ####################################################################################
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/drivers/common/mailbox.sv
-SV_DEPS += ../../../library/drivers/common/scoreboard.sv
-SV_DEPS += ../../../library/drivers/common/scoreboard_pack.sv
-SV_DEPS += ../../../library/drivers/common/x_monitor.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/common/mailbox.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/common/scoreboard.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/common/scoreboard_pack.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/common/x_monitor.sv
diff --git a/library/includes/Makeinclude_spi_engine b/library/includes/Makeinclude_spi_engine
@@ -3,12 +3,12 @@
 ####################################################################################
 
 # Makeincludes
-include ../../../library/includes/Makeinclude_regmap
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_regmap
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/vip/adi/spi_vip/adi_spi_vip_pkg.sv
-SV_DEPS += ../../../library/vip/adi/spi_vip/s_spi_sequencer.sv
-SV_DEPS += ../../../library/drivers/spi_engine/spi_engine_instr_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_spi_engine_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/vip/adi/spi_vip/adi_spi_vip_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/vip/adi/spi_vip/s_spi_sequencer.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/spi_engine/spi_engine_instr_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_spi_engine_pkg.sv
 
 SIM_LIB_DEPS += spi_vip
diff --git a/library/includes/Makeinclude_tdd b/library/includes/Makeinclude_tdd
@@ -3,8 +3,8 @@
 ####################################################################################
 
 # Makeincludes
-include ../../../library/includes/Makeinclude_regmap
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_regmap
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/regmaps/adi_regmap_tdd_gen_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_tdd_trans_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_tdd_gen_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_tdd_trans_pkg.sv
diff --git a/library/includes/Makeinclude_xcvr b/library/includes/Makeinclude_xcvr
@@ -3,8 +3,8 @@
 ####################################################################################
 
 # Makeincludes
-include ../../../library/includes/Makeinclude_regmap
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_regmap
 
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/drivers/xcvr/adi_xcvr_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_xcvr_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/drivers/xcvr/adi_xcvr_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_xcvr_pkg.sv
diff --git a/library/vip/adi/spi_vip/Makefile b/library/vip/adi/spi_vip/Makefile
@@ -9,7 +9,7 @@ include ../../../../scripts/make_tb_path
 
 LIBRARY_NAME := adi_spi_vip
 
-GENERIC_DEPS += $(ADI_HDL_DIR)/testbenches/library/utilities/utils.svh
+GENERIC_DEPS += $(TB_LIBRARY_PATH)/utilities/utils.svh
 GENERIC_DEPS += adi_spi_vip_pkg.sv
 GENERIC_DEPS += spi_vip_if.sv
 GENERIC_DEPS += adi_spi_vip.sv

diff --git a/scripts/make_tb_path b/scripts/make_tb_path
@@ -6,3 +6,4 @@
 ADI_HDL_DIR := $(subst /testbenches/scripts/make_tb_path,,$(abspath $(lastword $(MAKEFILE_LIST))))
 HDL_LIBRARY_PATH := $(ADI_HDL_DIR)/library/
 TB_PATH := $(ADI_HDL_DIR)/testbenches/
+TB_LIBRARY_PATH := $(TB_PATH)/library/
diff --git a/testbenches/ip/axi_tdd/Makefile b/testbenches/ip/axi_tdd/Makefile
@@ -6,8 +6,8 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-#include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_tdd
+#include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_tdd
 
 # Remaining test-bench dependencies except test programs
 LIB_DEPS += axi_tdd

diff --git a/testbenches/ip/axis_sequencers/Makefile b/testbenches/ip/axis_sequencers/Makefile
@@ -4,8 +4,10 @@
 ####################################################################################
 ####################################################################################
 
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
+# Makeincludes
+include ../../../scripts/make_tb_path
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
 
 # Remaining test-bench dependencies except test programs
 SV_DEPS += environment.sv

diff --git a/testbenches/ip/base/Makefile b/testbenches/ip/base/Makefile
@@ -6,7 +6,7 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
 
 # Remaining test-bench dependencies except test programs
 SV_DEPS += environment.sv

diff --git a/testbenches/ip/data_offload/Makefile b/testbenches/ip/data_offload/Makefile
@@ -6,8 +6,8 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
 
 # Remaining test-bench dependencies except test programs
 SV_DEPS += do_scoreboard.sv

diff --git a/testbenches/ip/data_offload_2/Makefile b/testbenches/ip/data_offload_2/Makefile
@@ -4,8 +4,10 @@
 ####################################################################################
 ####################################################################################
 
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
+# Makeincludes
+include ../../../scripts/make_tb_path
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
 
 # Remaining test-bench dependencies except test programs
 SV_DEPS += do_scoreboard.sv

diff --git a/testbenches/ip/dma_loopback/Makefile b/testbenches/ip/dma_loopback/Makefile
@@ -4,9 +4,11 @@
 ####################################################################################
 ####################################################################################
 
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
-include $(TB_PATH)/library/includes/Makeinclude_dmac
+# Makeincludes
+include ../../../scripts/make_tb_path
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
 
 # Remaining test-bench dependencies except test programs
 LIB_DEPS += axi_dmac

diff --git a/testbenches/ip/dma_sg/Makefile b/testbenches/ip/dma_sg/Makefile
@@ -4,9 +4,9 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
-include $(TB_PATH)/library/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
 
 # Remaining test-bench dependencies except test programs
 LIB_DEPS += axi_dmac

diff --git a/testbenches/ip/hbm/Makefile b/testbenches/ip/hbm/Makefile
@@ -6,9 +6,9 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
-include $(TB_PATH)/library/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
 
 # Remaining test-bench dependencies except test programs
 LIB_DEPS += axi_dmac

diff --git a/testbenches/ip/i3c_controller/Makefile b/testbenches/ip/i3c_controller/Makefile
@@ -6,11 +6,11 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
 
 # Remaining test-bench dependencies except test programs
-ENV_DEPS += ../$(TB_PATH)/library/util_cdc/sync_bits.v
-ENV_DEPS += ../$(TB_PATH)/library/common/ad_edge_detect.v
+ENV_DEPS += $(HDL_LIBRARY_PATH)/util_cdc/sync_bits.v
+ENV_DEPS += $(HDL_LIBRARY_PATH)/common/ad_edge_detect.v
 
 LIB_DEPS += axi_sysid
 LIB_DEPS += i3c_controller/i3c_controller_host_interface

diff --git a/testbenches/ip/jesd_loopback/Makefile b/testbenches/ip/jesd_loopback/Makefile
@@ -6,15 +6,15 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_dmac
-include $(TB_PATH)/library/includes/Makeinclude_jesd
-include $(TB_PATH)/library/includes/Makeinclude_xcvr
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_jesd
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_xcvr
 
 # Remaining test-bench dependencies except test programs
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_dac_pkg.sv
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_common_pkg.sv
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_adc_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_dac_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_common_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_adc_pkg.sv
 
 LIB_DEPS += jesd204/ad_ip_jesd204_tpl_dac
 LIB_DEPS += jesd204/axi_jesd204_tx

diff --git a/testbenches/ip/jesd_loopback_64b/Makefile b/testbenches/ip/jesd_loopback_64b/Makefile
@@ -6,15 +6,15 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_dmac
-include $(TB_PATH)/library/includes/Makeinclude_jesd
-include $(TB_PATH)/library/includes/Makeinclude_xcvr
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_jesd
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_xcvr
 
 # Remaining test-bench dependencies except test programs
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_dac_pkg.sv
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_common_pkg.sv
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_adc_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_dac_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_common_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_adc_pkg.sv
 
 LIB_DEPS += jesd204/ad_ip_jesd204_tpl_dac
 LIB_DEPS += jesd204/axi_jesd204_tx

diff --git a/testbenches/ip/scoreboard/Makefile b/testbenches/ip/scoreboard/Makefile
@@ -6,11 +6,11 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
-include $(TB_PATH)/library/includes/Makeinclude_scoreboard
-include $(TB_PATH)/library/includes/Makeinclude_dmac
-include $(TB_PATH)/library/includes/Makeinclude_data_offload
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_scoreboard
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_data_offload
 
 # Remaining test-bench dependencies except test programs
 SV_DEPS += environment.sv

diff --git a/testbenches/ip/spi_engine/Makefile b/testbenches/ip/spi_engine/Makefile
@@ -6,18 +6,18 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
-include $(TB_PATH)/library/includes/Makeinclude_dmac
-include $(TB_PATH)/library/includes/Makeinclude_spi_engine
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_spi_engine
 
 # Remaining test-bench dependencies except test programs
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_clkgen_pkg.sv
-SV_DEPS += $(TB_PATH)/library/regmaps/adi_regmap_pwm_gen_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_clkgen_pkg.sv
+SV_DEPS += $(TB_LIBRARY_PATH)/regmaps/adi_regmap_pwm_gen_pkg.sv
 SV_DEPS += spi_environment.sv
 
-ENV_DEPS += ../$(TB_PATH)/library/util_cdc/sync_bits.v
-ENV_DEPS += ../$(TB_PATH)/library/common/ad_edge_detect.v
+ENV_DEPS += $(HDL_LIBRARY_PATH)/util_cdc/sync_bits.v
+ENV_DEPS += $(HDL_LIBRARY_PATH)/common/ad_edge_detect.v
 
 LIB_DEPS += axi_clkgen
 LIB_DEPS += axi_pwm_gen

diff --git a/testbenches/ip/util_pack/Makefile b/testbenches/ip/util_pack/Makefile
@@ -6,10 +6,10 @@
 
 # Makeincludes
 include ../../../scripts/make_tb_path
-include $(TB_PATH)/library/includes/Makeinclude_common
-include $(TB_PATH)/library/includes/Makeinclude_axis
-include $(TB_PATH)/library/includes/Makeinclude_scoreboard
-include $(TB_PATH)/library/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_scoreboard
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
 
 # Remaining test-bench dependencies except test programs
 SV_DEPS += environment.sv