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
spbro
OpenXG-RAN
Commits
9cc53a43
Commit
9cc53a43
authored
Mar 13, 2024
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
invalidPrintfArgType_uint
parent
8b728a45
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
23 deletions
+39
-23
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
+4
-4
openair1/PHY/MODULATION/nr_modulation.c
openair1/PHY/MODULATION/nr_modulation.c
+2
-2
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+7
-3
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
+3
-3
openair1/PHY/TOOLS/oai_dfts.c
openair1/PHY/TOOLS/oai_dfts.c
+2
-2
openair1/PHY/TOOLS/oai_dfts_neon.c
openair1/PHY/TOOLS/oai_dfts_neon.c
+15
-3
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+5
-5
No files found.
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_decoder_offload.c
View file @
9cc53a43
...
...
@@ -344,7 +344,7 @@ static int add_dev(uint8_t dev_id, struct rte_bbdev_info *info)
for
(
queue_id
=
0
;
queue_id
<
nb_queues
;
++
queue_id
)
{
ret
=
rte_bbdev_queue_configure
(
dev_id
,
queue_id
,
&
qconf
);
if
(
ret
==
0
)
{
printf
(
"Found LDCP encoding queue (id=%
u
) at prio%u on dev%u
\n
"
,
queue_id
,
qconf
.
priority
,
dev_id
);
printf
(
"Found LDCP encoding queue (id=%
d
) at prio%u on dev%u
\n
"
,
queue_id
,
qconf
.
priority
,
dev_id
);
qconf
.
priority
++
;
//ret = rte_bbdev_queue_configure(ad->dev_id, queue_id, &qconf);
ad
->
enc_queue
=
queue_id
;
...
...
@@ -359,7 +359,7 @@ static int add_dev(uint8_t dev_id, struct rte_bbdev_info *info)
for
(
queue_id
++
;
queue_id
<
nb_queues
;
++
queue_id
)
{
ret
=
rte_bbdev_queue_configure
(
dev_id
,
queue_id
,
&
qconf
);
if
(
ret
==
0
)
{
printf
(
"Found LDCP decoding queue (id=%
u
) at prio%u on dev%u
\n
"
,
queue_id
,
qconf
.
priority
,
dev_id
);
printf
(
"Found LDCP decoding queue (id=%
d
) at prio%u on dev%u
\n
"
,
queue_id
,
qconf
.
priority
,
dev_id
);
qconf
.
priority
++
;
//ret = rte_bbdev_queue_configure(ad->dev_id, queue_id, &qconf);
ad
->
dec_queue
=
queue_id
;
...
...
@@ -957,8 +957,8 @@ int32_t LDPCinit()
// Set number of queues based on number of initialized cores (-l option) and driver
// capabilities
TEST_ASSERT_SUCCESS
(
add_dev
(
dev_id
,
&
info
),
"Failed to setup bbdev"
);
TEST_ASSERT_SUCCESS
(
rte_bbdev_stats_reset
(
dev_id
),
"Failed to reset stats of bbdev %
u
"
,
dev_id
);
TEST_ASSERT_SUCCESS
(
rte_bbdev_start
(
dev_id
),
"Failed to start bbdev %
u
"
,
dev_id
);
TEST_ASSERT_SUCCESS
(
rte_bbdev_stats_reset
(
dev_id
),
"Failed to reset stats of bbdev %
d
"
,
dev_id
);
TEST_ASSERT_SUCCESS
(
rte_bbdev_start
(
dev_id
),
"Failed to start bbdev %
d
"
,
dev_id
);
//the previous calls have populated this global variable (beurk)
// One more global to remove, not thread safe global op_params
...
...
openair1/PHY/MODULATION/nr_modulation.c
View file @
9cc53a43
...
...
@@ -805,7 +805,7 @@ void nr_layer_precoder_simd(const int n_layers,
#ifdef DEBUG_DLSCH_PRECODING_PRINT_WITH_TRIVIAL // Print simd and trivial result, TODO: To be removed
c16_t
*
y_simd
=
(
c16_t
*
)
&
y
;
printf
(
"debug_to_be_removed re_cnt=%
u
, sc=%u, y_simd=(%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d)
\n
"
,
printf
(
"debug_to_be_removed re_cnt=%
d
, sc=%u, y_simd=(%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d)
\n
"
,
re_cnt
,
sc
,
y_simd
[
0
].
r
,
...
...
@@ -816,7 +816,7 @@ void nr_layer_precoder_simd(const int n_layers,
y_simd
[
2
].
i
,
y_simd
[
3
].
r
,
y_simd
[
3
].
i
);
printf
(
"debug_to_be_removed re_cnt=%
u
, sc=%u, y_triv=(%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d)
\n
"
,
printf
(
"debug_to_be_removed re_cnt=%
d
, sc=%u, y_triv=(%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d), (%+4d,%+4d)
\n
"
,
re_cnt
,
sc
,
y_triv
[
0
].
r
,
...
...
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
View file @
9cc53a43
...
...
@@ -175,7 +175,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, int frame, int slot)
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_PDSCH_MODULATION
,
0
);
stop_meas
(
dlsch_modulation_stats
);
#ifdef DEBUG_DLSCH
printf
(
"PDSCH Modulation: Qm %d(%
u
)
\n
"
,
Qm
,
nb_re
);
printf
(
"PDSCH Modulation: Qm %d(%
d
)
\n
"
,
Qm
,
nb_re
);
for
(
int
i
=
0
;
i
<
nb_re
;
i
+=
8
)
{
for
(
int
j
=
0
;
j
<
8
;
j
++
)
{
printf
(
"%d %d
\t
"
,
mod_symbs
[
codeWord
][
i
+
j
].
r
,
mod_symbs
[
codeWord
][
i
+
j
].
i
);
...
...
@@ -213,8 +213,12 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx, int frame, int slot)
c16_t
txdataF_precoding
[
rel15
->
nrOfLayers
][
NR_NUMBER_OF_SYMBOLS_PER_SLOT
][
frame_parms
->
ofdm_symbol_size
]
__attribute__
((
aligned
(
64
)));;
#ifdef DEBUG_DLSCH_MAPPING
printf
(
"PDSCH resource mapping started (start SC %d
\t
start symbol %d
\t
N_PRB %d
\t
nb_re %u,nb_layers %d)
\n
"
,
start_sc
,
rel15
->
StartSymbolIndex
,
rel15
->
rbSize
,
nb_re
,
rel15
->
nrOfLayers
);
printf
(
"PDSCH resource mapping started (start SC %d
\t
start symbol %d
\t
N_PRB %d
\t
nb_re %d,nb_layers %d)
\n
"
,
start_sc
,
rel15
->
StartSymbolIndex
,
rel15
->
rbSize
,
nb_re
,
rel15
->
nrOfLayers
);
#endif
start_meas
(
&
gNB
->
dlsch_resource_mapping_stats
);
...
...
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @
9cc53a43
...
...
@@ -587,7 +587,7 @@ void nr_decode_pucch1(c16_t **rxdataF,
printf
(
"
\t
[nr_generate_pucch1] mapping %s to RE
\t
amp=%d "
"
\t
ofdm_symbol_size=%d
\t
N_RB_DL=%d
\t
first_carrier_offset=%d "
"
\t
z_pucch[%d]=txptr(%
u
)=(x_n(l=%d,n=%d)=(%d,%d))
\n
"
,
"
\t
z_pucch[%d]=txptr(%
d
)=(x_n(l=%d,n=%d)=(%d,%d))
\n
"
,
l
%
2
?
"PUCCH"
:
"DM-RS"
,
amp
,
frame_parms
->
ofdm_symbol_size
,
...
...
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
View file @
9cc53a43
...
...
@@ -126,7 +126,7 @@ void nr_generate_pucch0(const PHY_VARS_NR_UE *ue,
//txptr = &txdataF[0][re_offset];
#ifdef DEBUG_NR_PUCCH_TX
printf
(
"
\t
[nr_generate_pucch0] symbol %d PRB %d (%
u)
\n
"
,
l
,
prb_offset
[
l
],
re_offset
);
printf
(
"
\t
[nr_generate_pucch0] symbol %d PRB %d (%
d)
\n
"
,
l
,
prb_offset
[
l
],
re_offset
);
#endif
c16_t
*
txdataFptr
=
txdataF
[
0
]
+
l2
*
frame_parms
->
ofdm_symbol_size
;
const
int32_t
amp
=
amp16
;
...
...
@@ -777,7 +777,7 @@ void nr_generate_pucch2(const PHY_VARS_NR_UE *ue,
#ifdef DEBUG_NR_PUCCH_TX
printf
(
"
\t
[nr_generate_pucch2] (n=%d,i=%d) mapping PUCCH to RE
\t
amp=%d
\t
ofdm_symbol_size=%d
\t
N_RB_DL=%d "
"
\t
first_carrier_offset=%d
\t
z_pucch[%d]=txptr(%
u
)=(x_n(l=%d,n=%d)=(%d,%d))
\n
"
,
"
\t
first_carrier_offset=%d
\t
z_pucch[%d]=txptr(%
d
)=(x_n(l=%d,n=%d)=(%d,%d))
\n
"
,
n
,
i
,
amp
,
...
...
@@ -801,7 +801,7 @@ void nr_generate_pucch2(const PHY_VARS_NR_UE *ue,
#ifdef DEBUG_NR_PUCCH_TX
printf
(
"
\t
[nr_generate_pucch2] (n=%d,i=%d) mapping DM-RS to RE
\t
amp=%d
\t
ofdm_symbol_size=%d
\t
N_RB_DL=%d "
"
\t
first_carrier_offset=%d
\t
z_dm-rs[%d]=txptr(%
u
)=(x_n(l=%d,n=%d)=(%d,%d))
\n
"
,
"
\t
first_carrier_offset=%d
\t
z_dm-rs[%d]=txptr(%
d
)=(x_n(l=%d,n=%d)=(%d,%d))
\n
"
,
n
,
i
,
amp
,
...
...
openair1/PHY/TOOLS/oai_dfts.c
View file @
9cc53a43
...
...
@@ -1647,7 +1647,7 @@ void dft64(int16_t *x,int16_t *y,unsigned char scale)
#ifdef D64STATS
stop_meas
(
&
ts_b
);
printf
(
"t: %ll
u cycles, d: %llu cycles, b: %llu cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
printf
(
"t: %ll
d cycles, d: %lld cycles, b: %lld cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#endif
...
...
@@ -1746,7 +1746,7 @@ void idft64(int16_t *x,int16_t *y,unsigned char scale)
#ifdef D64STATS
stop_meas
(
&
ts_b
);
printf
(
"t: %ll
u cycles, d: %llu cycles, b: %llu cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
printf
(
"t: %ll
d cycles, d: %lld cycles, b: %lld cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#endif
...
...
openair1/PHY/TOOLS/oai_dfts_neon.c
View file @
9cc53a43
...
...
@@ -1013,7 +1013,11 @@ void dft64(int16_t *x,int16_t *y,unsigned char scale)
#ifdef D64STATS
stop_meas
(
&
ts_b
);
printf
(
"t: %llu cycles, d: %llu cycles, b: %llu cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#if defined(__x86_64__) || defined(__i386__)
printf
(
"t: %lld cycles, d: %lld cycles, b: %lld cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#elif defined(__arm__) || defined(__aarch64__)
printf
(
"t: %u cycles, d: %u cycles, b: %u cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#endif
#endif
...
...
@@ -1102,7 +1106,11 @@ void idft64(int16_t *x,int16_t *y,unsigned char scale)
#ifdef D64STATS
stop_meas
(
&
ts_b
);
printf
(
"t: %llu cycles, d: %llu cycles, b: %llu cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#if defined(__x86_64__) || defined(__i386__)
printf
(
"t: %lld cycles, d: %lld cycles, b: %lld cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#elif defined(__arm__) || defined(__aarch64__)
printf
(
"t: %u cycles, d: %u cycles, b: %u cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#endif
#endif
...
...
@@ -1433,7 +1441,11 @@ void dft256(int16_t *x,int16_t *y,unsigned char scale)
#ifdef D256STATS
stop_meas
(
&
ts_b
);
printf
(
"t: %llu cycles, d: %llu cycles, b: %llu cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#if defined(__x86_64__) || defined(__i386__)
printf
(
"t: %lld cycles, d: %lld cycles, b: %lld cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#elif defined(__arm__) || defined(__aarch64__)
printf
(
"t: %u cycles, d: %u cycles, b: %u cycles
\n
"
,
ts_t
.
diff
,
ts_d
.
diff
,
ts_b
.
diff
);
#endif
#endif
if
(
scale
>
0
)
{
...
...
openair2/GNB_APP/gnb_config.c
View file @
9cc53a43
...
...
@@ -1544,7 +1544,7 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
config_get
(
config_get_if
(),
GNBSParams
,
sizeofArray
(
GNBSParams
),
NULL
);
num_gnbs
=
GNBSParams
[
GNB_ACTIVE_GNBS_IDX
].
numelt
;
AssertFatal
(
i
<
num_gnbs
,
"Failed to parse config file no %uth element in %s
\n
"
,
i
,
GNB_CONFIG_STRING_ACTIVE_GNBS
);
AssertFatal
(
i
<
num_gnbs
,
"Failed to parse config file no %dth element in %s
\n
"
,
i
,
GNB_CONFIG_STRING_ACTIVE_GNBS
);
AssertFatal
(
num_gnbs
==
1
,
"required section
\"
gNBs
\"
not in config!
\n
"
);
if
(
num_gnbs
>
0
)
{
...
...
@@ -1566,18 +1566,18 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
sprintf
(
aprefix
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
0
);
printf
(
"NRRRC %
u: Southbound Transport %s
\n
"
,
i
,
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
));
printf
(
"NRRRC %
d: Southbound Transport %s
\n
"
,
i
,
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
));
rrc
->
node_type
=
get_node_type
();
rrc
->
node_id
=
gnb_id
;
if
(
NODE_IS_CU
(
rrc
->
node_type
))
{
paramdef_t
SCTPParams
[]
=
GNBSCTPPARAMS_DESC
;
char
aprefix
[
MAX_OPTNAME_SIZE
*
2
+
8
];
sprintf
(
aprefix
,
"%s.[%
u].%s"
,
GNB_CONFIG_STRING_GNB_LIST
,
i
,
GNB_CONFIG_STRING_SCTP_CONFIG
);
sprintf
(
aprefix
,
"%s.[%
d].%s"
,
GNB_CONFIG_STRING_GNB_LIST
,
i
,
GNB_CONFIG_STRING_SCTP_CONFIG
);
config_get
(
config_get_if
(),
SCTPParams
,
sizeofArray
(
SCTPParams
),
aprefix
);
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_id[%d] %d
\n
"
,
k
,
rrc
->
node_id
);
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_id[%d] %d
\n
"
,
k
,
rrc
->
node_id
);
rrc
->
node_name
=
strdup
(
*
(
GNBParamList
.
paramarray
[
0
][
GNB_GNB_NAME_IDX
].
strptr
));
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_name[%d] %s
\n
"
,
k
,
rrc
->
node_name
);
LOG_I
(
GNB_APP
,
"F1AP: gNB_CU_name[%d] %s
\n
"
,
k
,
rrc
->
node_name
);
rrc
->
eth_params_s
.
local_if_name
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_IF_NAME_IDX
].
strptr
));
rrc
->
eth_params_s
.
my_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_LOCAL_S_ADDRESS_IDX
].
strptr
));
rrc
->
eth_params_s
.
remote_addr
=
strdup
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_REMOTE_S_ADDRESS_IDX
].
strptr
));
...
...
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