includes: Updated dma_flock

Signed-off-by: Istvan-Zsolt Szekely <[email protected]>
analogdevicesinc · Nov 22, 2024 · 1aaf49b · 1aaf49b
1 parent f29d2cc
commit 1aaf49b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 41 deletions.
diff --git a/library/includes/Makeinclude_dmac b/library/includes/Makeinclude_dmac
@@ -9,3 +9,5 @@ include $(TB_LIBRARY_PATH)/includes/Makeinclude_regmap
 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
+
+SIM_LIB_DEPS := io_vip
diff --git a/library/vip/adi/io_vip/Makefile b/library/vip/adi/io_vip/Makefile
@@ -3,6 +3,9 @@
 ## Auto-generated, do not modify!
 ####################################################################################
 
+# Makeincludes
+include ../../../../scripts/make_tb_path
+
 LIBRARY_NAME := io_vip
 
 GENERIC_DEPS += io_vip.sv
@@ -11,4 +14,4 @@ GENERIC_DEPS += io_vip_if.sv
 XILINX_DEPS += io_vip_ip.tcl
 XILINX_DEPS += io_vip_pkg.ttcl
 
-include ../../../../../library/scripts/library.mk
+include $(HDL_LIBRARY_PATH)/scripts/library.mk
diff --git a/testbenches/ip/dma_flock/Makefile b/testbenches/ip/dma_flock/Makefile
@@ -4,32 +4,17 @@
 ####################################################################################
 ####################################################################################
 
+# Makeincludes
+include ../../../scripts/make_tb_path
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_common
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_dmac
+include $(TB_LIBRARY_PATH)/includes/Makeinclude_axis
+
 # All test-bench dependencies except test programs
-SV_DEPS += ../../../library/utilities/utils.svh
-SV_DEPS += ../../../library/drivers/dmac/dma_trans.sv
-SV_DEPS += ../../../library/utilities/logger_pkg.sv
-SV_DEPS += ../../../library/regmaps/reg_accessor.sv
-SV_DEPS += ../../../library/vip/amd/m_axis_sequencer.sv
-SV_DEPS += ../../../library/vip/amd/s_axis_sequencer.sv
-SV_DEPS += ../../../library/vip/amd/m_axi_sequencer.sv
-SV_DEPS += ../../../library/vip/amd/s_axi_sequencer.sv
-SV_DEPS += ../../../library/drivers/dmac/dmac_api.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_pkg.sv
-SV_DEPS += ../../../library/regmaps/adi_regmap_dmac_pkg.sv
-SV_DEPS += ../../../library/drivers/dmac/dma_trans.sv
-SV_DEPS += ../../../library/utilities/test_harness_env.sv
-SV_DEPS += ../../../library/regmaps/adi_peripheral_pkg.sv
 SV_DEPS += environment.sv
 SV_DEPS += scoreboard.sv
-SV_DEPS += system_tb.sv
-
-ENV_DEPS += system_project.tcl
-ENV_DEPS += system_bd.tcl
-ENV_DEPS +=../../../scripts/adi_sim.tcl
-ENV_DEPS +=../../../scripts/run_sim.tcl
 
 LIB_DEPS := axi_dmac
-SIM_LIB_DEPS := io_vip
 
 # default test program
 TP := test_program
@@ -47,7 +32,7 @@ TESTS += cfg2_fsync:test_program
 TESTS += cfg2_fsync:test_program_frame_delay
 TESTS += cfg3_fsync_autorun:test_program_frame_delay
 
-include ../../../scripts/project-sim.mk
+include $(ADI_TB_DIR)/scripts/project-sim.mk
 
 # usage :
 #

diff --git a/testbenches/ip/dma_flock/system_bd.tcl b/testbenches/ip/dma_flock/system_bd.tcl
@@ -33,7 +33,7 @@
 # ***************************************************************************
 # ***************************************************************************
 
-source ../../../../scripts/adi_env.tcl
+global ad_project_params
 
 global m_dma_cfg
 global s_dma_cfg

diff --git a/testbenches/ip/dma_flock/system_project.tcl b/testbenches/ip/dma_flock/system_project.tcl
@@ -1,6 +1,4 @@
 source ../../../scripts/adi_sim.tcl
-source ../../../../scripts/adi_env.tcl
-source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
 if {$argc < 1} {
   puts "Expecting at least one argument that specifies the test configuration"
@@ -18,27 +16,15 @@ set project_name [file rootname $cfg_file]
 # Create the project
 adi_sim_project_xilinx $project_name "xcvu9p-flga2104-2L-e"
 
+source $ad_tb_dir/library/includes/sp_include_dmac.tcl
+source $ad_tb_dir/library/includes/sp_include_axis.tcl
+
 # Add test files to the project
 adi_sim_project_files [list \
-  "../../../library/utilities/utils.svh" \
-  "../../../library/drivers/dmac/dma_trans.sv" \
-  "../../../library/utilities/logger_pkg.sv" \
-  "../../../library/regmaps/reg_accessor.sv" \
-  "../../../library/vip/amd/m_axis_sequencer.sv" \
-  "../../../library/vip/amd/s_axis_sequencer.sv" \
-  "../../../library/vip/amd/m_axi_sequencer.sv" \
-  "../../../library/vip/amd/s_axi_sequencer.sv" \
-  "../../../library/drivers/dmac/dmac_api.sv" \
-  "../../../library/regmaps/adi_regmap_pkg.sv" \
-  "../../../library/regmaps/adi_regmap_dmac_pkg.sv" \
-  "../../../library/drivers/dmac/dma_trans.sv" \
-  "../../../library/utilities/test_harness_env.sv" \
-  "../../../library/regmaps/adi_peripheral_pkg.sv" \
   "scoreboard.sv" \
   "environment.sv" \
   "tests/test_program.sv" \
   "tests/test_program_frame_delay.sv" \
-  "system_tb.sv" \
 ]
 
 #set a default test program