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
Michael Black
OpenXG-RAN
Commits
79f8d16d
Commit
79f8d16d
authored
2 years ago
by
Jaroslava Fiedlerova
Committed by
Robert Schmidt
2 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename T1 offload lib and conditional compilation
parent
c8aceea4
Branches unavailable
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
2023.w09
2023.w08
2023.w08b
2023.w07
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
27 deletions
+20
-27
CMakeLists.txt
CMakeLists.txt
+18
-25
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
+1
-1
openair1/PHY/CODING/nrLDPC_load.c
openair1/PHY/CODING/nrLDPC_load.c
+1
-1
No files found.
CMakeLists.txt
View file @
79f8d16d
...
...
@@ -618,26 +618,19 @@ target_link_libraries(benetel_5g PRIVATE asn1_nr_rrc asn1_lte_rrc)
# LDPC offload library
##########################################################
# there is no generic way to test for T1 Offload, it simply comes with the
# shared object
if
(
EXISTS
"/usr/local/lib64/librte_pmd_hpac_sdfec_pmd.so"
)
set
(
T1_OFFLOAD_FOUND TRUE
)
else
()
set
(
T1_OFFLOAD_FOUND FALSE
)
add_boolean_option
(
ENABLE_LDPC_T1 OFF
"Build support for LDPC Offload to T1 library"
)
if
(
ENABLE_LDPC_T1
)
pkg_check_modules
(
LIBDPDK_T1 REQUIRED libdpdk=20.05.0
)
find_library
(
T1 NAMES rte_pmd_hpac_sdfec_pmd REQUIRED
)
if
(
NOT T1
)
message
(
FATAL_ERROR
"Library rte_pmd_hpac_sdfec_pmd for T1 offload not found"
)
endif
()
add_library
(
ldpc_t1 MODULE
${
OPENAIR1_DIR
}
/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
)
set_target_properties
(
ldpc_t1 PROPERTIES COMPILE_FLAGS
"-DALLOW_EXPERIMENTAL_API"
)
target_compile_options
(
ldpc_t1 PRIVATE
${
LIBDPDK_T1_CFLAGS
}
)
target_link_libraries
(
ldpc_t1
${
LIBDPDK_T1_LDFLAGS
}
${
T1
}
)
endif
()
if
(
T1_OFFLOAD_FOUND
)
message
(
STATUS
"T1 Offload support detected"
)
set
(
ENV{PKG_CONFIG_PATH}
"$ENV{PKG_CONFIG_PATH}:/usr/local/lib64/pkgconfig/"
)
pkg_search_module
(
LIBDPDK REQUIRED libdpdk=20.05.0
)
add_library
(
ldpc_offload MODULE
${
OPENAIR1_DIR
}
/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
)
set_target_properties
(
ldpc_offload PROPERTIES COMPILE_FLAGS
"-DALLOW_EXPERIMENTAL_API"
)
target_compile_options
(
ldpc_offload PRIVATE
${
LIBDPDK_CFLAGS
}
)
target_link_libraries
(
ldpc_offload
${
LIBDPDK_LDFLAGS
}
rte_pmd_hpac_sdfec_pmd
"-Wl,-rpath /usr/local/lib64"
)
else
()
message
(
STATUS
"No T1 Offload support detected"
)
endif
()
##########################################################
include_directories
(
"
${
OPENAIR_DIR
}
/radio/COMMON"
)
...
...
@@ -2384,11 +2377,11 @@ target_link_libraries(nr-softmodem PRIVATE ${LIB_LMS_LIBRARIES})
target_link_libraries
(
nr-softmodem PRIVATE
${
T_LIB
}
)
target_link_libraries
(
nr-softmodem PRIVATE asn1_nr_rrc asn1_lte_rrc
)
add_dependencies
(
nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc
)
add_dependencies
(
nr-softmodem ldpc_orig ldpc_optim ldpc_optim8seg ldpc
)
if
(
T1_OFFLOAD_FOUND
)
add_dependencies
(
nr-softmodem ldpc_offload
)
endif
()
if
(
ENABLE_LDPC_T1
)
add_dependencies
(
nr-softmodem ldpc_t1
)
endif
()
# force the generation of ASN.1 so that we don't need to wait during the build
target_link_libraries
(
nr-softmodem PRIVATE
...
...
@@ -2634,9 +2627,9 @@ add_executable(nr_ulsim
${
SHLIB_LOADER_SOURCES
}
)
if
(
T1_OFFLOAD_FOUND
)
add_dependencies
(
nr_ulsim ldpc_offload
)
endif
()
if
(
ENABLE_LDPC_T1
)
add_dependencies
(
nr_ulsim ldpc_t1
)
endif
()
target_link_libraries
(
nr_ulsim PRIVATE
-Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR MAC_NR_COMMON lte_rrc nr_rrc CONFIG_LIB L2_LTE_NR L2_NR HASHTABLE x2ap SECU_CN ngap NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB -lz -Wl,--end-group
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
View file @
79f8d16d
...
...
@@ -1434,7 +1434,7 @@ int32_t nrLDPC_decod_offload(t_nrLDPC_dec_params* p_decParams, uint8_t harq_pid,
argv_re
[
1
]
=
"-l"
;
argv_re
[
2
]
=
"31"
;
argv_re
[
3
]
=
"-w"
;
argv_re
[
4
]
=
"
81
:00.0"
;
argv_re
[
4
]
=
"
b0
:00.0"
;
argv_re
[
5
]
=
"--file-prefix=b6"
;
argv_re
[
6
]
=
"--"
;
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/nrLDPC_load.c
View file @
79f8d16d
...
...
@@ -75,7 +75,7 @@ int load_nrLDPClib_offload(void) {
loader_shlibfunc_t
shlib_decoffload_fdesc
;
shlib_decoffload_fdesc
.
fname
=
"nrLDPC_decod_offload"
;
int
ret
=
load_module_shlib
(
"ldpc_
offload
"
,
&
shlib_decoffload_fdesc
,
1
,
NULL
);
int
ret
=
load_module_shlib
(
"ldpc_
t1
"
,
&
shlib_decoffload_fdesc
,
1
,
NULL
);
AssertFatal
(
(
ret
>=
0
),
"Error loading ldpc decoder offload"
);
nrLDPC_decoder_offload
=
(
nrLDPC_decoffloadfunc_t
)
shlib_decoffload_fdesc
.
fptr
;
...
...
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