Skip to content

Commit e70e6da

Browse files
committed
phy: refactor signal processor tests
Use the component-specific libraries instead of the big, general one.
1 parent 8b01892 commit e70e6da

39 files changed

+61
-56
lines changed

tests/unittests/phy/upper/channel_processors/pdcch/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ target_link_libraries(pdcch_processor_unittest srsran_channel_processors srslog)
1616
add_test(pdcch_processor_unittest pdcch_processor_unittest)
1717
target_include_directories(pdcch_processor_unittest PRIVATE
1818
${CMAKE_SOURCE_DIR}/tests/unittests/phy/support
19-
${CMAKE_SOURCE_DIR}/tests/unittests/phy/upper/signal_processors)
19+
${CMAKE_SOURCE_DIR}/tests/unittests/phy/upper/signal_processors/pdcch)
2020

2121
if (USE_PHY_TESTVECTORS)
2222
add_executable(pdcch_encoder_test pdcch_encoder_test.cpp)

tests/unittests/phy/upper/channel_processors/pdsch/pdsch_encoder_test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "srsran/hal/dpdk/dpdk_eal_factory.h"
1818
#include "srsran/hal/phy/upper/channel_processors/hw_accelerator_factories.h"
1919
#include "srsran/hal/phy/upper/channel_processors/hw_accelerator_pdsch_enc_factory.h"
20+
#include "srsran/srslog/srslog.h"
2021
#endif // HWACC_PDSCH_ENABLED
2122
#include <getopt.h>
2223

tests/unittests/phy/upper/channel_processors/pdsch/pdsch_processor_unittest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
#include "../../../support/resource_grid_test_doubles.h"
12-
#include "../../signal_processors/dmrs_pdsch_processor_test_doubles.h"
12+
#include "../../signal_processors/pdsch/dmrs_pdsch_processor_test_doubles.h"
1313
#include "../../signal_processors/ptrs/ptrs_pdsch_generator_test_doubles.h"
1414
#include "pdsch_encoder_test_doubles.h"
1515
#include "pdsch_modulator_test_doubles.h"

tests/unittests/phy/upper/channel_processors/pucch/pucch_processor_format1_unittest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
#include "../../../support/resource_grid_test_doubles.h"
12-
#include "../../signal_processors/dmrs_pucch_estimator_test_doubles.h"
12+
#include "../../signal_processors/pucch/dmrs_pucch_estimator_test_doubles.h"
1313
#include "../uci/uci_decoder_test_doubles.h"
1414
#include "pucch_detector_test_doubles.h"
1515
#include "srsran/phy/upper/channel_processors/pucch/pucch_processor.h"

tests/unittests/phy/upper/channel_processors/pusch/pusch_processor_unittest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "../../../support/resource_grid_test_doubles.h"
1212
#include "../../rx_buffer_test_doubles.h"
13-
#include "../../signal_processors/dmrs_pusch_estimator_test_doubles.h"
13+
#include "../../signal_processors/pusch/dmrs_pusch_estimator_test_doubles.h"
1414
#include "../uci/uci_decoder_test_doubles.h"
1515
#include "pusch_decoder_test_doubles.h"
1616
#include "pusch_demodulator_test_doubles.h"

tests/unittests/phy/upper/channel_processors/ssb/ssb_processor_unittest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
*/
1010

1111
#include "../../../support/resource_grid_test_doubles.h"
12-
#include "../../signal_processors/dmrs_pbch_processor_doubles.h"
13-
#include "../../signal_processors/pss_processor_doubles.h"
14-
#include "../../signal_processors/sss_processor_doubles.h"
12+
#include "../../signal_processors/ssb/dmrs_pbch_processor_doubles.h"
13+
#include "../../signal_processors/ssb/pss_processor_doubles.h"
14+
#include "../../signal_processors/ssb/sss_processor_doubles.h"
1515
#include "pbch_encoder_doubles.h"
1616
#include "pbch_modulator_doubles.h"
1717
#include "srsran/phy/upper/channel_processors/ssb/ssb_processor.h"

tests/unittests/phy/upper/downlink_processor_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "channel_processors/pdcch/pdcch_processor_test_doubles.h"
1515
#include "channel_processors/pdsch/pdsch_processor_test_doubles.h"
1616
#include "channel_processors/ssb/ssb_processor_test_doubles.h"
17-
#include "signal_processors/nzp_csi_rs_generator_test_doubles.h"
17+
#include "signal_processors/nzp_csi_rs/nzp_csi_rs_generator_test_doubles.h"
1818
#include "signal_processors/prs/prs_generator_test_doubles.h"
1919
#include "upper_phy_rg_gateway_test_doubles.h"
2020
#include "srsran/ran/precoding/precoding_codebooks.h"

tests/unittests/phy/upper/signal_processors/CMakeLists.txt

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,58 @@ set(TEST_DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}/test_data)
1111

1212
set_directory_properties(PROPERTIES LABELS "phy")
1313

14-
add_executable(pss_processor_test pss_processor_test.cpp)
15-
target_link_libraries(pss_processor_test srsran_signal_processors srsvec srslog)
14+
add_executable(pss_processor_test ssb/pss_processor_test.cpp)
15+
target_link_libraries(pss_processor_test srsran_ssb_generators srsvec srslog)
1616
add_test(pss_processor_test pss_processor_test)
1717

18-
add_executable(sss_processor_test sss_processor_test.cpp)
19-
target_link_libraries(sss_processor_test srsran_signal_processors srsvec srslog)
18+
add_executable(sss_processor_test ssb/sss_processor_test.cpp)
19+
target_link_libraries(sss_processor_test srsran_ssb_generators srsvec srslog)
2020
add_test(sss_processor_test sss_processor_test)
2121

2222
add_executable(prs_generator_validator_test prs/prs_generator_validator_test.cpp)
23-
target_link_libraries(prs_generator_validator_test srsran_signal_processors srsvec srsran_sequence_generators srsran_channel_precoder srslog gtest gtest_main)
23+
target_link_libraries(prs_generator_validator_test srsran_prs_generator srsran_ran srsvec srsran_sequence_generators srsran_channel_precoder srslog gtest gtest_main)
2424
add_test(prs_generator_validator_test prs_generator_validator_test)
2525

2626
if (USE_PHY_TESTVECTORS)
2727
add_executable(prs_generator_vectortest prs/prs_generator_vectortest.cpp)
28-
target_link_libraries(prs_generator_vectortest srsran_signal_processors srsvec srsran_sequence_generators srsran_channel_precoder srslog gtest gtest_main)
28+
target_link_libraries(prs_generator_vectortest srsran_prs_generator srsran_ran srsvec srsran_sequence_generators srsran_channel_precoder srslog gtest gtest_main)
2929
add_test_vector(prs_generator_vectortest prs/prs_generator_test_data.tar.gz "")
3030

3131
add_executable(ptrs_pdsch_generator_vectortest ptrs/ptrs_pdsch_generator_vectortest.cpp)
32-
target_link_libraries(ptrs_pdsch_generator_vectortest srsran_signal_processors srsvec srsran_sequence_generators srsran_channel_precoder srslog gtest gtest_main)
32+
target_link_libraries(ptrs_pdsch_generator_vectortest srsran_ptrs_generator srsran_ran srsran_phy_support
33+
srsvec srsran_sequence_generators srsran_channel_precoder srslog gtest gtest_main)
3334
add_test_vector(ptrs_pdsch_generator_vectortest ptrs/ptrs_pdsch_generator_test_data.tar.gz "")
3435

3536
add_executable(srs_estimator_test
3637
srs/srs_estimator_logger_test.cpp
3738
srs/srs_estimator_validator_test.cpp
3839
srs/srs_estimator_vectortest.cpp)
39-
target_link_libraries(srs_estimator_test srsran_signal_processors srsvec srsran_sequence_generators srslog gtest gtest_main)
40+
target_link_libraries(srs_estimator_test srsran_srs_estimator srsran_dft srsran_phy_support srsvec srsran_sequence_generators srslog gtest gtest_main)
4041
add_test_vector(srs_estimator_test srs/srs_estimator_test_data.tar.gz "")
4142

42-
add_executable(dmrs_pbch_processor_test dmrs_pbch_processor_test.cpp)
43-
target_link_libraries(dmrs_pbch_processor_test srsran_signal_processors srsvec srsran_sequence_generators srslog)
44-
add_test_vector(dmrs_pbch_processor_test dmrs_pbch_processor_test_data.tar.gz "")
43+
add_executable(dmrs_pbch_processor_test ssb/dmrs_pbch_processor_test.cpp)
44+
target_link_libraries(dmrs_pbch_processor_test srsran_ssb_generators srsvec srsran_sequence_generators srslog)
45+
add_test_vector(dmrs_pbch_processor_test ssb/dmrs_pbch_processor_test_data.tar.gz "")
4546

46-
add_executable(dmrs_pdcch_processor_test dmrs_pdcch_processor_test.cpp)
47-
target_link_libraries(dmrs_pdcch_processor_test srsran_signal_processors srsvec srsran_sequence_generators srslog srsran_channel_precoder)
47+
add_executable(dmrs_pdcch_processor_test pdcch/dmrs_pdcch_processor_test.cpp)
48+
target_link_libraries(dmrs_pdcch_processor_test srsran_dmrs_pdcch srsran_ran srsran_phy_support srsvec srsran_sequence_generators srslog srsran_channel_precoder)
4849
add_test(dmrs_pdcch_processor_test dmrs_pdcch_processor_test)
49-
add_test_vector(dmrs_pdcch_processor_test dmrs_pdcch_processor_test_data.tar.gz "")
50+
add_test_vector(dmrs_pdcch_processor_test pdcch/dmrs_pdcch_processor_test_data.tar.gz "")
5051

51-
add_executable(dmrs_pdsch_processor_test dmrs_pdsch_processor_test.cpp)
52-
target_link_libraries(dmrs_pdsch_processor_test srsran_signal_processors srsvec srsran_sequence_generators srslog srsran_channel_precoder)
53-
add_test_vector(dmrs_pdsch_processor_test dmrs_pdsch_processor_test_data.tar.gz "")
52+
add_executable(dmrs_pdsch_processor_test pdsch/dmrs_pdsch_processor_test.cpp)
53+
target_link_libraries(dmrs_pdsch_processor_test srsran_dmrs_pdsch srsran_ran srsran_phy_support srsvec srsran_sequence_generators srslog srsran_channel_precoder)
54+
add_test_vector(dmrs_pdsch_processor_test pdsch/dmrs_pdsch_processor_test_data.tar.gz "")
5455

55-
add_executable(dmrs_pucch_estimator_test dmrs_pucch_estimator_test.cpp)
56-
target_link_libraries(dmrs_pucch_estimator_test srsran_signal_processors srsvec srsran_sequence_generators srslog srsran_support gtest gtest_main)
57-
add_test_vector(dmrs_pucch_estimator_test dmrs_pucch_estimator_test_data.tar.gz "")
56+
add_executable(dmrs_pucch_estimator_test pucch/dmrs_pucch_estimator_test.cpp)
57+
target_link_libraries(dmrs_pucch_estimator_test srsran_dmrs_pucch srsran_channel_estimator srsran_dft srsvec
58+
srsran_sequence_generators srslog srsran_support gtest gtest_main)
59+
add_test_vector(dmrs_pucch_estimator_test pucch/dmrs_pucch_estimator_test_data.tar.gz "")
5860

59-
add_executable(dmrs_pusch_estimator_test dmrs_pusch_estimator_test.cpp)
61+
add_executable(dmrs_pusch_estimator_test pusch/dmrs_pusch_estimator_test.cpp)
6062
target_link_libraries(dmrs_pusch_estimator_test
61-
srsran_signal_processors
63+
srsran_dmrs_pusch
64+
srsran_channel_estimator
65+
srsran_dft
6266
srsran_sequence_generators
6367
srsran_phy_support
6468
srsran_pusch_processor
@@ -67,15 +71,15 @@ if (USE_PHY_TESTVECTORS)
6771
gtest
6872
gtest_main
6973
)
70-
add_test_vector(dmrs_pusch_estimator_test dmrs_pusch_estimator_test_data.tar.gz "")
74+
add_test_vector(dmrs_pusch_estimator_test pusch/dmrs_pusch_estimator_test_data.tar.gz "")
7175

72-
add_executable(nzp_csi_rs_generator_test nzp_csi_rs_generator_test.cpp)
73-
target_link_libraries(nzp_csi_rs_generator_test srsran_signal_processors srsvec srsran_sequence_generators srslog
74-
srsran_upper_phy_support gtest gtest_main srsran_channel_precoder)
76+
add_executable(nzp_csi_rs_generator_test nzp_csi_rs/nzp_csi_rs_generator_test.cpp)
77+
target_link_libraries(nzp_csi_rs_generator_test srsran_nzp_csi_rs_generator srsvec srsran_sequence_generators srslog
78+
srsran_upper_phy_support srsran_phy_support gtest gtest_main srsran_channel_precoder)
7579
add_test(nzp_csi_rs_generator_test nzp_csi_rs_generator_test)
76-
add_test_vector(nzp_csi_rs_generator_test nzp_csi_rs_generator_test_data.tar.gz "")
80+
add_test_vector(nzp_csi_rs_generator_test nzp_csi_rs/nzp_csi_rs_generator_test_data.tar.gz "")
7781

78-
add_executable(port_channel_estimator_test port_channel_estimator_test.cpp)
79-
target_link_libraries(port_channel_estimator_test srsran_signal_processors srsran_pusch_processor srslog gtest gtest_main)
80-
add_test_vector(port_channel_estimator_test port_channel_estimator_test_data.tar.gz "")
82+
add_executable(port_channel_estimator_test channel_estimator/port_channel_estimator_test.cpp)
83+
target_link_libraries(port_channel_estimator_test srsran_channel_estimator srsran_pusch_processor srsran_dft srslog gtest gtest_main)
84+
add_test_vector(port_channel_estimator_test channel_estimator/port_channel_estimator_test_data.tar.gz "")
8185
endif (USE_PHY_TESTVECTORS)

tests/unittests/phy/upper/signal_processors/port_channel_estimator_test_data.h renamed to tests/unittests/phy/upper/signal_processors/channel_estimator/port_channel_estimator_test_data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// This file was generated using the following MATLAB class on 03-07-2025 (seed 0):
1414
// + "srsChEstimatorUnittest.m"
1515

16-
#include "../../support/resource_grid_test_doubles.h"
16+
#include "../../../support/resource_grid_test_doubles.h"
1717
#include "srsran/phy/upper/signal_processors/channel_estimator/port_channel_estimator.h"
1818
#include "srsran/phy/upper/signal_processors/channel_estimator/port_channel_estimator_parameters.h"
1919
#include "srsran/support/file_vector.h"

0 commit comments

Comments
 (0)