Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
littleBu
OpenXG-RAN
Commits
d68a8b51
Commit
d68a8b51
authored
2 months ago
by
Laurent THOMAS
Committed by
Robert Schmidt
2 months ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused PHY_MEX compile option
parent
0f970326
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
117 deletions
+25
-117
CMakeLists.txt
CMakeLists.txt
+2
-26
openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
+2
-14
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
+2
-17
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
+2
-14
openair1/PHY/defs_L1_NB_IoT.h
openair1/PHY/defs_L1_NB_IoT.h
+6
-10
openair1/PHY/defs_UE.h
openair1/PHY/defs_UE.h
+6
-27
openair1/PHY/defs_nr_UE.h
openair1/PHY/defs_nr_UE.h
+5
-9
No files found.
CMakeLists.txt
View file @
d68a8b51
...
...
@@ -509,7 +509,6 @@ add_integer_option(MAX_NUM_CCs 1 "????" ON)
add_boolean_option
(
SMBV False
"Rohde&Schwarz SMBV100A vector signal generator"
ON
)
add_boolean_option
(
DEBUG_PHY False
"Enable PHY layer debugging options"
ON
)
add_boolean_option
(
DEBUG_PHY_PROC False
"Enable debugging of PHY layer procedures"
ON
)
add_boolean_option
(
MEX False
"Enabling compilation with mex"
ON
)
##########################
# NAS LAYER OPTIONS
...
...
@@ -895,6 +894,7 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/ulsch_coding.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/rar_tools_ue.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/initial_sync.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/slot_fep.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/slot_fep_mbsfn.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/ul_7_5_kHz_ue.c
...
...
@@ -1024,8 +1024,6 @@ if (${SMBV})
set
(
PHY_SRC
"
${
PHY_SRC
}
${
OPENAIR1_DIR
}
/PHY/TOOLS/smbv.c"
)
endif
(
${
SMBV
}
)
set
(
PHY_SRC_UE
${
PHY_SRC_UE
}
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
)
add_library
(
PHY_COMMON
${
PHY_SRC_COMMON
}
)
target_link_libraries
(
PHY_COMMON PRIVATE shlib_loader
)
add_dependencies
(
PHY_COMMON dfts
)
...
...
@@ -1061,28 +1059,6 @@ target_link_libraries(PHY_NR_UE PRIVATE asn1_nr_rrc_hdrs nr_phy_common nr_common
add_library
(
PHY_RU
${
PHY_SRC_RU
}
)
target_link_libraries
(
PHY_RU PRIVATE asn1_lte_rrc_hdrs UTIL
)
#Library for mex functions
#########################3
set
(
PHY_MEX_UE
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/linear_preprocessing_rec.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/log2_approx.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/lte_mcs.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/get_pmi.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/dB_routines.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/pmch_common.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cadd_vv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cmult_sv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cmult_vv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/signal_energy.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/simde_operations.c
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
${
OPENAIR1_DIR
}
/PHY/LTE_ESTIMATION/lte_ue_measurements.c
)
add_library
(
PHY_MEX
${
PHY_MEX_UE
}
)
target_link_libraries
(
PHY_MEX PRIVATE asn1_lte_rrc_hdrs UTIL
)
#Layer 2 library
#####################
set
(
MAC_DIR
${
OPENAIR2_DIR
}
/LAYER2/MAC
)
...
...
@@ -2212,7 +2188,7 @@ if (${T_TRACER})
SECURITY SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB
MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB
PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
PHY_MEX
PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU
L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap
CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB
dfts config_internals nr_common
)
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
View file @
d68a8b51
...
...
@@ -54,10 +54,6 @@
#include <string.h>
#endif
#ifdef MEX
#include "mex.h"
#endif
#include "PHY/sse_intrin.h"
//#define DEBUG_LOGMAP
...
...
@@ -837,19 +833,11 @@ void init_td16avx2(void)
for
(
ind
=
0
;
ind
<
188
;
ind
++
)
{
n
=
f1f2mat
[
ind
].
nb_bits
;
base_interleaver
=
il_tb
+
f1f2mat
[
ind
].
beg_index
;
#ifdef MEX
// This is needed for the Mex implementation to make the memory persistent
pi2tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi5tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi4tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi6tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
#else
base_interleaver
=
il_tb
+
f1f2mat
[
ind
].
beg_index
;
pi2tab16avx2
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi5tab16avx2
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi4tab16avx2
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi6tab16avx2
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
#endif
pi6tab16avx2
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
// fprintf(fdavx2,"Interleaver index %d\n",ind);
for
(
i
=
i2
=
0
;
i2
<
8
;
i2
++
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
View file @
d68a8b51
...
...
@@ -52,12 +52,6 @@
#include <string.h>
#endif
#ifdef MEX
#include "mex.h"
#endif
//#define DEBUG_LOGMAP
#ifdef DEBUG_LOGMAP
#define print_shorts(s,x) fprintf(fdsse4,"%s %d,%d,%d,%d,%d,%d,%d,%d\n",s,(x)[0],(x)[1],(x)[2],(x)[3],(x)[4],(x)[5],(x)[6],(x)[7])
#endif
...
...
@@ -933,20 +927,11 @@ void init_td16(void) {
for
(
ind
=
0
;
ind
<
188
;
ind
++
)
{
n
=
f1f2mat
[
ind
].
nb_bits
;
base_interleaver
=
il_tb
+
f1f2mat
[
ind
].
beg_index
;
#ifdef MEX
// This is needed for the Mex implementation to make the memory persistent
pi2tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi5tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi4tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi6tab16
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
#else
base_interleaver
=
il_tb
+
f1f2mat
[
ind
].
beg_index
;
pi2tab16
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi5tab16
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi4tab16
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi6tab16
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
#endif
pi6tab16
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
for
(
i
=
i2
=
0
;
i2
<
8
;
i2
++
)
{
j
=
i2
;
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
View file @
d68a8b51
...
...
@@ -50,10 +50,6 @@
#include <string.h>
#endif
#ifdef MEX
#include "mex.h"
#endif
#include "common/ran_context.h"
#define SHUFFLE16(a, b, c, d, e, f, g, h) \
...
...
@@ -858,19 +854,11 @@ void init_td8(void) {
for
(
ind
=
0
;
ind
<
188
;
ind
++
)
{
n
=
f1f2mat
[
ind
].
nb_bits
;
base_interleaver
=
il_tb
+
f1f2mat
[
ind
].
beg_index
;
#ifdef MEX
// This is needed for the Mex implementation to make the memory persistent
pi2tab8
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi5tab8
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi4tab8
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
pi6tab8
[
ind
]
=
mxMalloc
((
n
+
8
)
*
sizeof
(
int
));
#else
base_interleaver
=
il_tb
+
f1f2mat
[
ind
].
beg_index
;
pi2tab8
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi5tab8
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi4tab8
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
pi6tab8
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
#endif
pi6tab8
[
ind
]
=
malloc
((
n
+
8
)
*
sizeof
(
int
));
if
((
n
&
15
)
>
0
)
{
n2
=
n
+
8
;
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_L1_NB_IoT.h
View file @
d68a8b51
...
...
@@ -45,17 +45,13 @@
#include "defs_eNB.h"
//#include <complex.h>
#include "assertions.h"
#ifdef MEX
#define msg mexPrintf
#else
#if ENABLE_RAL
#include "collection/hashtable/hashtable.h"
#include "COMMON/ral_messages_types.h"
#include "UTIL/queue.h"
#endif
#include "common/utils/LOG/log.h"
#define msg(aRGS...) LOG_D(PHY, ##aRGS)
#if ENABLE_RAL
#include "collection/hashtable/hashtable.h"
#include "COMMON/ral_messages_types.h"
#include "UTIL/queue.h"
#endif
#include "common/utils/LOG/log.h"
#define msg(aRGS...) LOG_D(PHY, ##aRGS)
//use msg in the real-time thread context
#define msg_nrt printf
//use msg_nrt in the non real-time context (for initialization, ...)
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_UE.h
View file @
d68a8b51
...
...
@@ -76,34 +76,13 @@
#define stop_UE_TIMING(a)
#endif
#ifdef MEX
#include "mex.h"
#define msg mexPrintf
#undef LOG_D
#undef LOG_E
#undef LOG_I
#undef LOG_N
#undef LOG_T
#undef LOG_W
#undef LOG_M
#define LOG_D(x, ...) mexPrintf(__VA_ARGS__)
#define LOG_E(x, ...) mexPrintf(__VA_ARGS__)
#define LOG_I(x, ...) mexPrintf(__VA_ARGS__)
#define LOG_N(x, ...) mexPrintf(__VA_ARGS__)
#define LOG_T(x, ...) mexPrintf(__VA_ARGS__)
#define LOG_W(x, ...) mexPrintf(__VA_ARGS__)
#define LOG_M(x, ...) mexPrintf(__VA_ARGS__)
#else
#if ENABLE_RAL
#include "collection/hashtable/hashtable.h"
#include "COMMON/ral_messages_types.h"
#include "UTIL/queue.h"
#endif
#include "common/utils/LOG/log.h"
#define msg(aRGS...) LOG_D(PHY, ##aRGS)
#if ENABLE_RAL
#include "collection/hashtable/hashtable.h"
#include "COMMON/ral_messages_types.h"
#include "UTIL/queue.h"
#endif
#include "common/utils/LOG/log.h"
#define msg(aRGS...) LOG_D(PHY, ##aRGS)
/// Context data structure for RX/TX portion of subframe processing
typedef
struct
{
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_nr_UE.h
View file @
d68a8b51
...
...
@@ -56,16 +56,12 @@
#include "actor.h"
//#include "openair1/SCHED_NR_UE/defs.h"
#ifdef MEX
#define msg mexPrintf
#else
#if ENABLE_RAL
#include "common/utils/hashtable/hashtable.h"
#include "COMMON/ral_messages_types.h"
#include "UTIL/queue.h"
#endif
#define msg(aRGS...) LOG_D(PHY, ##aRGS)
#if ENABLE_RAL
#include "common/utils/hashtable/hashtable.h"
#include "COMMON/ral_messages_types.h"
#include "UTIL/queue.h"
#endif
#define msg(aRGS...) LOG_D(PHY, ##aRGS)
// use msg in the real-time thread context
#define msg_nrt printf
// use msg_nrt in the non real-time context (for initialization, ...)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment