From 5eff5d378a4740a4183a13c51831d744173c5eff Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Thu, 6 May 2021 16:45:32 +0200
Subject: [PATCH] processed review comments
---
libraries/dsp/st/hdllib.cfg | 3 ++-
libraries/dsp/st/src/vhdl/st_xsq.vhd | 4 ----
libraries/dsp/st/src/vhdl/st_xsq_arr.vhd | 3 ---
.../dsp/st/{src/vhdl/st_pkg.vhd => tb/vhdl/tb_st_pkg.vhd} | 8 ++++----
libraries/dsp/st/tb/vhdl/tb_st_xsq.vhd | 2 +-
5 files changed, 7 insertions(+), 13 deletions(-)
rename libraries/dsp/st/{src/vhdl/st_pkg.vhd => tb/vhdl/tb_st_pkg.vhd} (96%)
diff --git a/libraries/dsp/st/hdllib.cfg b/libraries/dsp/st/hdllib.cfg
index e1d6eb86e1..faba09d3db 100644
--- a/libraries/dsp/st/hdllib.cfg
+++ b/libraries/dsp/st/hdllib.cfg
@@ -5,7 +5,6 @@ hdl_lib_uses_sim =
hdl_lib_technology =
synth_files =
- src/vhdl/st_pkg.vhd
src/vhdl/st_acc.vhd
src/vhdl/st_ctrl.vhd
src/vhdl/st_calc.vhd
@@ -17,6 +16,8 @@ synth_files =
src/vhdl/st_histogram_reg.vhd
src/vhdl/mms_st_histogram.vhd
src/vhdl/st_histogram_8_april.vhd
+
+ tb/vhdl/tb_st_pkg.vhd
test_bench_files =
tb/vhdl/tb_st_acc.vhd
diff --git a/libraries/dsp/st/src/vhdl/st_xsq.vhd b/libraries/dsp/st/src/vhdl/st_xsq.vhd
index 3075113a00..997e13c1b2 100644
--- a/libraries/dsp/st/src/vhdl/st_xsq.vhd
+++ b/libraries/dsp/st/src/vhdl/st_xsq.vhd
@@ -49,7 +49,6 @@ USE dp_lib.dp_stream_pkg.ALL;
USE technology_lib.technology_select_pkg.ALL;
ENTITY st_xsq IS
GENERIC (
- g_technology : NATURAL := c_tech_select_default;
g_nof_signal_inputs : NATURAL := 2;
g_nof_crosslets : NATURAL := 1;
g_in_data_w : NATURAL := 18; -- width of the data to be accumulated
@@ -143,7 +142,6 @@ BEGIN
---------------------------------------------------------------
st_calc : ENTITY work.st_calc
GENERIC MAP (
- g_technology => g_technology,
g_nof_mux => 1,
g_nof_stat => c_nof_statistics,
g_in_dat_w => g_in_data_w,
@@ -199,7 +197,6 @@ BEGIN
-- ram for real values
stat_reg_re : ENTITY common_lib.common_ram_crw_crw_ratio
GENERIC MAP (
- g_technology => g_technology,
g_ram_a => c_mm_ram,
g_ram_b => c_stat_ram,
g_init_file => "UNUSED"
@@ -229,7 +226,6 @@ BEGIN
-- ram for imaginary values
stat_reg_im : ENTITY common_lib.common_ram_crw_crw_ratio
GENERIC MAP (
- g_technology => g_technology,
g_ram_a => c_mm_ram,
g_ram_b => c_stat_ram,
g_init_file => "UNUSED"
diff --git a/libraries/dsp/st/src/vhdl/st_xsq_arr.vhd b/libraries/dsp/st/src/vhdl/st_xsq_arr.vhd
index 08b1ad4f84..b4445b2022 100644
--- a/libraries/dsp/st/src/vhdl/st_xsq_arr.vhd
+++ b/libraries/dsp/st/src/vhdl/st_xsq_arr.vhd
@@ -31,10 +31,8 @@ USE common_lib.common_pkg.ALL;
USE common_lib.common_mem_pkg.ALL;
USE common_lib.common_field_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL;
-USE technology_lib.technology_select_pkg.ALL;
ENTITY st_xsq_arr IS
GENERIC (
- g_technology : NATURAL := c_tech_select_default;
g_nof_streams : NATURAL := 1;
g_nof_crosslets : NATURAL := 1;
g_nof_signal_inputs : NATURAL := 2;
@@ -73,7 +71,6 @@ BEGIN
gen_xsq : FOR I IN 0 TO g_nof_streams-1 GENERATE
st_xsq : ENTITY work.st_xsq
GENERIC MAP (
- g_technology => g_technology,
g_nof_signal_inputs => g_nof_signal_inputs,
g_nof_crosslets => g_nof_crosslets,
g_in_data_w => g_in_data_w,
diff --git a/libraries/dsp/st/src/vhdl/st_pkg.vhd b/libraries/dsp/st/tb/vhdl/tb_st_pkg.vhd
similarity index 96%
rename from libraries/dsp/st/src/vhdl/st_pkg.vhd
rename to libraries/dsp/st/tb/vhdl/tb_st_pkg.vhd
index c9014472ab..7d6c17284f 100644
--- a/libraries/dsp/st/src/vhdl/st_pkg.vhd
+++ b/libraries/dsp/st/tb/vhdl/tb_st_pkg.vhd
@@ -25,13 +25,13 @@ USE IEEE.std_logic_1164.ALL;
USE IEEE.numeric_std.ALL;
USE common_lib.common_pkg.ALL;
-PACKAGE st_pkg IS
+PACKAGE tb_st_pkg IS
FUNCTION func_st_calculate_expected_xsq(a_re, a_im, b_re, b_im : t_integer_arr; N_crosslets, N_int : NATURAL) RETURN t_integer_arr;
-END st_pkg;
+END tb_st_pkg;
-PACKAGE BODY st_pkg IS
+PACKAGE BODY tb_st_pkg IS
FUNCTION func_st_calculate_expected_xsq(a_re, a_im, b_re, b_im : t_integer_arr; N_crosslets, N_int : NATURAL) RETURN t_integer_arr IS
CONSTANT c_N_s : NATURAL := a_re'LENGTH/N_crosslets;
@@ -51,4 +51,4 @@ PACKAGE BODY st_pkg IS
RETURN v_exp_xsq;
END;
-END st_pkg;
+END tb_st_pkg;
diff --git a/libraries/dsp/st/tb/vhdl/tb_st_xsq.vhd b/libraries/dsp/st/tb/vhdl/tb_st_xsq.vhd
index d68727989f..8bb8ecc753 100644
--- a/libraries/dsp/st/tb/vhdl/tb_st_xsq.vhd
+++ b/libraries/dsp/st/tb/vhdl/tb_st_xsq.vhd
@@ -47,7 +47,7 @@ USE mm_lib.mm_file_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL;
USE diag_lib.diag_pkg.ALL;
USE dp_lib.tb_dp_pkg.ALL;
-USE work.st_pkg.ALL;
+USE work.tb_st_pkg.ALL;
ENTITY tb_st_xsq IS
GENERIC(
--
GitLab