From 61cb2bcc5ae7e667f173b6945a504a95fad32c86 Mon Sep 17 00:00:00 2001
From: Romain Beurdouche <romain.beurdouche@eurecom.fr>
Date: Thu, 19 Dec 2024 14:35:48 +0000
Subject: [PATCH] fix(nrLDPC_coding_segment): Reorganize segment and xdma
 CMakeFiles.txt to avoid redundant compilation

---
 CMakeLists.txt                                |  7 +------
 .../nrLDPC_coding_segment/CMakeLists.txt      | 21 +++++++++++++++----
 .../nrLDPC_coding_segment}/nrLDPC_load.c      |  0
 .../nrLDPC_coding_xdma/CMakeLists.txt         |  8 ++++---
 4 files changed, 23 insertions(+), 13 deletions(-)
 rename openair1/PHY/CODING/{ => nrLDPC_coding/nrLDPC_coding_segment}/nrLDPC_load.c (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a3bca4ab7..15e79dcd72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -772,10 +772,6 @@ set(PHY_TURBOIF
   ${OPENAIR1_DIR}/PHY/CODING/coding_load.c
 )
 
-set(PHY_NR_CODINGIF
-  ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_load.c
-)
-
 set(PHY_NRLDPC_CODINGIF
   ${OPENAIR1_DIR}/PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface_load.c
 )
@@ -2058,12 +2054,11 @@ target_link_libraries(smallblocktest PRIVATE
 
 
 add_executable(ldpctest
-   ${PHY_NR_CODINGIF}
    ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c
    )
 target_link_libraries(ldpctest PRIVATE
   -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON -Wl,--end-group
-  m pthread dl shlib_loader ${T_LIB}
+  m pthread dl shlib_loader ${T_LIB} nr_coding_segment_utils
   )
 
 add_executable(nr_dlschsim
diff --git a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt
index 52de22b05f..99ac2279eb 100644
--- a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt
+++ b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/CMakeLists.txt
@@ -1,9 +1,22 @@
-add_library(ldpc MODULE
-  nrLDPC_coding_segment_decoder.c
-  nrLDPC_coding_segment_encoder.c
-  ${PHY_NR_CODINGIF}
+add_library(nr_coding_segment_utils OBJECT
+  nrLDPC_load.c
   nr_rate_matching.c
 )
+
+add_library(nr_coding_segment_decoder OBJECT
+  nrLDPC_coding_segment_decoder.c
+)
+
+add_library(nr_coding_segment_encoder OBJECT
+  nrLDPC_coding_segment_encoder.c
+)
+
+add_library(ldpc MODULE)
+target_link_libraries(ldpc PRIVATE
+  nr_coding_segment_decoder
+  nr_coding_segment_encoder
+  nr_coding_segment_utils
+)
 set_target_properties(ldpc PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 add_dependencies(nr-softmodem ldpc)
diff --git a/openair1/PHY/CODING/nrLDPC_load.c b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_load.c
similarity index 100%
rename from openair1/PHY/CODING/nrLDPC_load.c
rename to openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_segment/nrLDPC_load.c
diff --git a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt
index 8c357c75d4..4cc6421e3f 100644
--- a/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt
+++ b/openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_xdma/CMakeLists.txt
@@ -10,11 +10,13 @@ if (ENABLE_LDPC_XDMA)
   add_library(ldpc_xdma MODULE
               nrLDPC_coding_xdma_offload.c
               nrLDPC_coding_xdma.c
-              ../nrLDPC_coding_segment/nrLDPC_coding_segment_encoder.c
-              ../../nrLDPC_load.c
-              ../nrLDPC_coding_segment/nr_rate_matching.c
   )
   target_include_directories(ldpc_xdma PRIVATE ../nrLDPC_coding_segment)
+
+  target_link_libraries(ldpc_xdma PRIVATE
+    nr_coding_segment_encoder
+    nr_coding_segment_utils
+  )
   set_target_properties(ldpc_xdma PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
   add_dependencies(nr-softmodem ldpc_xdma)