From 65afed6df0f591e5892f91e07117a54f6ea34882 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Tue, 19 Jan 2021 08:04:33 +0100
Subject: [PATCH] Move tb_wpfb_unit_dev_wg to tb_verify_pfb_wg in seperate
verify_pfb_lib, to try both Apertif wpfb and Lofar1 pfb2 without creating
mutual lib dependencies between wpfb_lib and pfb2_lib.
---
libraries/dsp/verify_pfb/hdllib.cfg | 27 +++++++++++++++++++
.../tb_tb_verify_pfb_wg.vhd} | 0
.../tb_verify_pfb_wg.txt} | 0
.../tb_verify_pfb_wg.vhd} | 0
libraries/dsp/wpfb/hdllib.cfg | 7 +++--
5 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 libraries/dsp/verify_pfb/hdllib.cfg
rename libraries/dsp/{wpfb/tb/vhdl/tb_tb_wpfb_unit_dev_wg.vhd => verify_pfb/tb_tb_verify_pfb_wg.vhd} (100%)
rename libraries/dsp/{wpfb/tb/vhdl/tb_wpfb_unit_dev_wg.txt => verify_pfb/tb_verify_pfb_wg.txt} (100%)
rename libraries/dsp/{wpfb/tb/vhdl/tb_wpfb_unit_dev_wg.vhd => verify_pfb/tb_verify_pfb_wg.vhd} (100%)
diff --git a/libraries/dsp/verify_pfb/hdllib.cfg b/libraries/dsp/verify_pfb/hdllib.cfg
new file mode 100644
index 0000000000..c4b5bc7556
--- /dev/null
+++ b/libraries/dsp/verify_pfb/hdllib.cfg
@@ -0,0 +1,27 @@
+hdl_lib_name = verify_pfb
+hdl_library_clause_name = verify_pfb_lib
+hdl_lib_uses_synth = common mm diag dp rTwoSDF st fft filter pft2 pfb2 wpfb
+hdl_lib_uses_sim =
+hdl_lib_technology =
+
+synth_files =
+
+test_bench_files =
+ tb/vhdl/tb_verify_pfb_wg.vhd
+ tb/vhdl/tb_tb_verify_pfb_wg.vhd
+
+regression_test_vhdl =
+ tb/vhdl/tb_verify_pfb_wg.vhd
+
+[modelsim_project_file]
+modelsim_copy_files =
+ # Note: path $RADIOHDL_WORK is equivalent to relative path ../../../
+ # APERTIF wpfb
+ ../filter/src/hex data # PFIR filter coefficients
+ ../wpfb/tb/data data
+ # LOFAR1 pfs + pft2
+ $RADIOHDL_WORK/applications/lofar1/pfs/src/data data # FIR filter coefficients
+ $RADIOHDL_WORK/applications/lofar1/pft2/src/data data # FFT twiddle factors
+
+[quartus_project_file]
+
diff --git a/libraries/dsp/wpfb/tb/vhdl/tb_tb_wpfb_unit_dev_wg.vhd b/libraries/dsp/verify_pfb/tb_tb_verify_pfb_wg.vhd
similarity index 100%
rename from libraries/dsp/wpfb/tb/vhdl/tb_tb_wpfb_unit_dev_wg.vhd
rename to libraries/dsp/verify_pfb/tb_tb_verify_pfb_wg.vhd
diff --git a/libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_dev_wg.txt b/libraries/dsp/verify_pfb/tb_verify_pfb_wg.txt
similarity index 100%
rename from libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_dev_wg.txt
rename to libraries/dsp/verify_pfb/tb_verify_pfb_wg.txt
diff --git a/libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_dev_wg.vhd b/libraries/dsp/verify_pfb/tb_verify_pfb_wg.vhd
similarity index 100%
rename from libraries/dsp/wpfb/tb/vhdl/tb_wpfb_unit_dev_wg.vhd
rename to libraries/dsp/verify_pfb/tb_verify_pfb_wg.vhd
diff --git a/libraries/dsp/wpfb/hdllib.cfg b/libraries/dsp/wpfb/hdllib.cfg
index 2a5f3013a8..a001a269f5 100644
--- a/libraries/dsp/wpfb/hdllib.cfg
+++ b/libraries/dsp/wpfb/hdllib.cfg
@@ -12,8 +12,6 @@ synth_files =
test_bench_files =
tb/vhdl/tb_wpfb_unit.vhd
tb/vhdl/tb_wpfb_unit_dev.vhd
- tb/vhdl/tb_wpfb_unit_dev_wg.vhd
- tb/vhdl/tb_tb_wpfb_unit_dev_wg.vhd
tb/vhdl/tb_mmf_wpfb_unit.vhd
tb/vhdl/tb_wpfb_unit_wide.vhd
tb/vhdl/tb_tb_wpfb_unit_wide.vhd
@@ -25,12 +23,13 @@ regression_test_vhdl =
[modelsim_project_file]
modelsim_copy_files =
+ # Note: path $RADIOHDL_WORK is equivalent to relative path ../../../
modelsim/wave_tb_mmf_wpfb_unit.do .
../filter/src/hex data
tb/data data
- $RADIOHDL_WORK/applications/lofar2/designs/lofar2_unb2b_filterbank/src/data data
+ ../../base/diag/src/data data # WG
# LOFAR1 pfs + pft2
- $RADIOHDL_WORK/applications/lofar1/pfs/src/data data # PFIR filter coefficients
+ $RADIOHDL_WORK/applications/lofar1/pfs/src/data data # FIR filter coefficients
$RADIOHDL_WORK/applications/lofar1/pft2/src/data data # Twiddle factors
[quartus_project_file]
--
GitLab