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
zzha zzha
OpenXG-RAN
Commits
b95b95e7
Commit
b95b95e7
authored
Dec 16, 2022
by
Roberto Louro Magueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add SRS time stats in nr_ulsim
parent
44dabd73
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
1 deletion
+43
-1
openair1/PHY/defs_gNB.h
openair1/PHY/defs_gNB.h
+8
-0
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+19
-1
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+16
-0
No files found.
openair1/PHY/defs_gNB.h
View file @
b95b95e7
...
@@ -742,6 +742,14 @@ typedef struct PHY_VARS_gNB_s {
...
@@ -742,6 +742,14 @@ typedef struct PHY_VARS_gNB_s {
time_stats_t
ulsch_rbs_extraction_stats
;
time_stats_t
ulsch_rbs_extraction_stats
;
time_stats_t
ulsch_mrc_stats
;
time_stats_t
ulsch_mrc_stats
;
time_stats_t
ulsch_llr_stats
;
time_stats_t
ulsch_llr_stats
;
time_stats_t
rx_srs_stats
;
time_stats_t
generate_srs_stats
;
time_stats_t
get_srs_signal_stats
;
time_stats_t
srs_channel_estimation_stats
;
time_stats_t
srs_timing_advance_stats
;
time_stats_t
srs_report_tlv_stats
;
time_stats_t
srs_beam_report_stats
;
time_stats_t
srs_iq_matrix_stats
;
/*
/*
time_stats_t rx_dft_stats;
time_stats_t rx_dft_stats;
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
b95b95e7
...
@@ -867,6 +867,8 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -867,6 +867,8 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
if
((
srs
->
active
==
1
)
&&
(
srs
->
frame
==
frame_rx
)
&&
(
srs
->
slot
==
slot_rx
))
{
if
((
srs
->
active
==
1
)
&&
(
srs
->
frame
==
frame_rx
)
&&
(
srs
->
slot
==
slot_rx
))
{
LOG_D
(
NR_PHY
,
"(%d.%d) gNB is waiting for SRS, id = %i
\n
"
,
frame_rx
,
slot_rx
,
i
);
LOG_D
(
NR_PHY
,
"(%d.%d) gNB is waiting for SRS, id = %i
\n
"
,
frame_rx
,
slot_rx
,
i
);
start_meas
(
&
gNB
->
rx_srs_stats
);
NR_DL_FRAME_PARMS
*
frame_parms
=
&
gNB
->
frame_parms
;
NR_DL_FRAME_PARMS
*
frame_parms
=
&
gNB
->
frame_parms
;
nfapi_nr_srs_pdu_t
*
srs_pdu
=
&
srs
->
srs_pdu
;
nfapi_nr_srs_pdu_t
*
srs_pdu
=
&
srs
->
srs_pdu
;
uint8_t
N_symb_SRS
=
1
<<
srs_pdu
->
num_symbols
;
uint8_t
N_symb_SRS
=
1
<<
srs_pdu
->
num_symbols
;
...
@@ -877,10 +879,16 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -877,10 +879,16 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
int8_t
snr_per_rb
[
srs_pdu
->
bwp_size
];
int8_t
snr_per_rb
[
srs_pdu
->
bwp_size
];
int8_t
snr
;
int8_t
snr
;
start_meas
(
&
gNB
->
generate_srs_stats
);
generate_srs_nr
(
srs_pdu
,
frame_parms
,
gNB
->
nr_srs_info
[
i
]
->
srs_generated_signal
,
0
,
gNB
->
nr_srs_info
[
i
],
AMP
,
frame_rx
,
slot_rx
);
generate_srs_nr
(
srs_pdu
,
frame_parms
,
gNB
->
nr_srs_info
[
i
]
->
srs_generated_signal
,
0
,
gNB
->
nr_srs_info
[
i
],
AMP
,
frame_rx
,
slot_rx
);
stop_meas
(
&
gNB
->
generate_srs_stats
);
start_meas
(
&
gNB
->
get_srs_signal_stats
);
int
srs_est
=
nr_get_srs_signal
(
gNB
,
frame_rx
,
slot_rx
,
srs_pdu
,
gNB
->
nr_srs_info
[
i
],
srs_received_signal
);
int
srs_est
=
nr_get_srs_signal
(
gNB
,
frame_rx
,
slot_rx
,
srs_pdu
,
gNB
->
nr_srs_info
[
i
],
srs_received_signal
);
stop_meas
(
&
gNB
->
get_srs_signal_stats
);
if
(
srs_est
>=
0
)
{
if
(
srs_est
>=
0
)
{
start_meas
(
&
gNB
->
srs_channel_estimation_stats
);
nr_srs_channel_estimation
(
gNB
,
nr_srs_channel_estimation
(
gNB
,
frame_rx
,
frame_rx
,
slot_rx
,
slot_rx
,
...
@@ -893,6 +901,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -893,6 +901,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
srs_estimated_channel_time_shifted
,
srs_estimated_channel_time_shifted
,
snr_per_rb
,
snr_per_rb
,
&
snr
);
&
snr
);
stop_meas
(
&
gNB
->
srs_channel_estimation_stats
);
}
}
if
((
snr
*
10
)
<
gNB
->
srs_thres
)
{
if
((
snr
*
10
)
<
gNB
->
srs_thres
)
{
...
@@ -922,7 +931,9 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -922,7 +931,9 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
nfapi_nr_srs_indication_pdu_t
*
srs_indication
=
&
gNB
->
srs_pdu_list
[
gNB
->
UL_INFO
.
srs_ind
.
number_of_pdus
];
nfapi_nr_srs_indication_pdu_t
*
srs_indication
=
&
gNB
->
srs_pdu_list
[
gNB
->
UL_INFO
.
srs_ind
.
number_of_pdus
];
srs_indication
->
handle
=
srs_pdu
->
handle
;
srs_indication
->
handle
=
srs_pdu
->
handle
;
srs_indication
->
rnti
=
srs_pdu
->
rnti
;
srs_indication
->
rnti
=
srs_pdu
->
rnti
;
start_meas
(
&
gNB
->
srs_timing_advance_stats
);
srs_indication
->
timing_advance_offset
=
srs_est
>=
0
?
nr_est_timing_advance_srs
(
frame_parms
,
srs_estimated_channel_time
[
0
])
:
0xFFFF
;
srs_indication
->
timing_advance_offset
=
srs_est
>=
0
?
nr_est_timing_advance_srs
(
frame_parms
,
srs_estimated_channel_time
[
0
])
:
0xFFFF
;
stop_meas
(
&
gNB
->
srs_timing_advance_stats
);
srs_indication
->
timing_advance_offset_nsec
=
srs_est
>=
0
?
(
int16_t
)((((
int32_t
)
srs_indication
->
timing_advance_offset
-
31
)
*
((
int32_t
)
TC_NSEC_x32768
))
>>
15
)
:
0xFFFF
;
srs_indication
->
timing_advance_offset_nsec
=
srs_est
>=
0
?
(
int16_t
)((((
int32_t
)
srs_indication
->
timing_advance_offset
-
31
)
*
((
int32_t
)
TC_NSEC_x32768
))
>>
15
)
:
0xFFFF
;
switch
(
srs_pdu
->
srs_parameters_v4
.
usage
)
{
switch
(
srs_pdu
->
srs_parameters_v4
.
usage
)
{
case
0
:
case
0
:
...
@@ -961,8 +972,10 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -961,8 +972,10 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
srs_indication
->
report_tlv
->
tag
=
0
;
srs_indication
->
report_tlv
->
tag
=
0
;
srs_indication
->
report_tlv
->
length
=
0
;
srs_indication
->
report_tlv
->
length
=
0
;
start_meas
(
&
gNB
->
srs_report_tlv_stats
);
switch
(
srs_indication
->
srs_usage
)
{
switch
(
srs_indication
->
srs_usage
)
{
case
NR_SRS_ResourceSet__usage_beamManagement
:
{
case
NR_SRS_ResourceSet__usage_beamManagement
:
{
start_meas
(
&
gNB
->
srs_beam_report_stats
);
nfapi_nr_srs_beamforming_report_t
nr_srs_beamforming_report
;
nfapi_nr_srs_beamforming_report_t
nr_srs_beamforming_report
;
nr_srs_beamforming_report
.
prg_size
=
srs_pdu
->
beamforming
.
prg_size
;
nr_srs_beamforming_report
.
prg_size
=
srs_pdu
->
beamforming
.
prg_size
;
nr_srs_beamforming_report
.
num_symbols
=
1
<<
srs_pdu
->
num_symbols
;
nr_srs_beamforming_report
.
num_symbols
=
1
<<
srs_pdu
->
num_symbols
;
...
@@ -987,10 +1000,12 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -987,10 +1000,12 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
#endif
#endif
srs_indication
->
report_tlv
->
length
=
pack_nr_srs_beamforming_report
(
&
nr_srs_beamforming_report
,
srs_indication
->
report_tlv
->
value
,
16384
*
sizeof
(
uint32_t
));
srs_indication
->
report_tlv
->
length
=
pack_nr_srs_beamforming_report
(
&
nr_srs_beamforming_report
,
srs_indication
->
report_tlv
->
value
,
16384
*
sizeof
(
uint32_t
));
stop_meas
(
&
gNB
->
srs_beam_report_stats
);
break
;
break
;
}
}
case
NR_SRS_ResourceSet__usage_codebook
:
{
case
NR_SRS_ResourceSet__usage_codebook
:
{
start_meas
(
&
gNB
->
srs_iq_matrix_stats
);
nfapi_nr_srs_normalized_channel_iq_matrix_t
nr_srs_normalized_channel_iq_matrix
;
nfapi_nr_srs_normalized_channel_iq_matrix_t
nr_srs_normalized_channel_iq_matrix
;
nr_srs_normalized_channel_iq_matrix
.
normalized_iq_representation
=
srs_pdu
->
srs_parameters_v4
.
iq_representation
;
nr_srs_normalized_channel_iq_matrix
.
normalized_iq_representation
=
srs_pdu
->
srs_parameters_v4
.
iq_representation
;
nr_srs_normalized_channel_iq_matrix
.
num_gnb_antenna_elements
=
gNB
->
frame_parms
.
nb_antennas_rx
;
nr_srs_normalized_channel_iq_matrix
.
num_gnb_antenna_elements
=
gNB
->
frame_parms
.
nb_antennas_rx
;
...
@@ -1036,7 +1051,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -1036,7 +1051,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
srs_indication
->
report_tlv
->
length
=
pack_nr_srs_normalized_channel_iq_matrix
(
&
nr_srs_normalized_channel_iq_matrix
,
srs_indication
->
report_tlv
->
length
=
pack_nr_srs_normalized_channel_iq_matrix
(
&
nr_srs_normalized_channel_iq_matrix
,
srs_indication
->
report_tlv
->
value
,
srs_indication
->
report_tlv
->
value
,
16384
*
sizeof
(
uint32_t
));
16384
*
sizeof
(
uint32_t
));
stop_meas
(
&
gNB
->
srs_iq_matrix_stats
);
break
;
break
;
}
}
...
@@ -1048,6 +1063,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -1048,6 +1063,7 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
default:
default:
AssertFatal
(
1
==
0
,
"Invalid SRS usage
\n
"
);
AssertFatal
(
1
==
0
,
"Invalid SRS usage
\n
"
);
}
}
stop_meas
(
&
gNB
->
srs_report_tlv_stats
);
#ifdef SRS_IND_DEBUG
#ifdef SRS_IND_DEBUG
LOG_I
(
NR_PHY
,
"srs_indication->report_tlv->tag = %i
\n
"
,
srs_indication
->
report_tlv
->
tag
);
LOG_I
(
NR_PHY
,
"srs_indication->report_tlv->tag = %i
\n
"
,
srs_indication
->
report_tlv
->
tag
);
...
@@ -1060,6 +1076,8 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
...
@@ -1060,6 +1076,8 @@ int phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
gNB
->
UL_INFO
.
srs_ind
.
number_of_pdus
+=
1
;
gNB
->
UL_INFO
.
srs_ind
.
number_of_pdus
+=
1
;
srs
->
active
=
0
;
srs
->
active
=
0
;
stop_meas
(
&
gNB
->
rx_srs_stats
);
}
}
}
}
}
}
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
b95b95e7
...
@@ -1093,6 +1093,14 @@ int main(int argc, char **argv)
...
@@ -1093,6 +1093,14 @@ int main(int argc, char **argv)
reset_meas
(
&
UE
->
ulsch_rate_matching_stats
);
reset_meas
(
&
UE
->
ulsch_rate_matching_stats
);
reset_meas
(
&
UE
->
ulsch_interleaving_stats
);
reset_meas
(
&
UE
->
ulsch_interleaving_stats
);
reset_meas
(
&
UE
->
ulsch_encoding_stats
);
reset_meas
(
&
UE
->
ulsch_encoding_stats
);
reset_meas
(
&
gNB
->
rx_srs_stats
);
reset_meas
(
&
gNB
->
generate_srs_stats
);
reset_meas
(
&
gNB
->
get_srs_signal_stats
);
reset_meas
(
&
gNB
->
srs_channel_estimation_stats
);
reset_meas
(
&
gNB
->
srs_timing_advance_stats
);
reset_meas
(
&
gNB
->
srs_report_tlv_stats
);
reset_meas
(
&
gNB
->
srs_beam_report_stats
);
reset_meas
(
&
gNB
->
srs_iq_matrix_stats
);
uint32_t
errors_scrambling
[
16
]
=
{
0
};
uint32_t
errors_scrambling
[
16
]
=
{
0
};
int
n_errors
[
16
]
=
{
0
};
int
n_errors
[
16
]
=
{
0
};
...
@@ -1672,6 +1680,14 @@ int main(int argc, char **argv)
...
@@ -1672,6 +1680,14 @@ int main(int argc, char **argv)
//printStatIndent2(&gNB->ulsch_deinterleaving_stats,"ULSCH deinterleaving");
//printStatIndent2(&gNB->ulsch_deinterleaving_stats,"ULSCH deinterleaving");
//printStatIndent2(&gNB->ulsch_rate_unmatching_stats,"ULSCH rate matching rx");
//printStatIndent2(&gNB->ulsch_rate_unmatching_stats,"ULSCH rate matching rx");
//printStatIndent2(&gNB->ulsch_ldpc_decoding_stats,"ULSCH ldpc decoding");
//printStatIndent2(&gNB->ulsch_ldpc_decoding_stats,"ULSCH ldpc decoding");
printStatIndent
(
&
gNB
->
rx_srs_stats
,
"RX SRS time"
);
printStatIndent2
(
&
gNB
->
generate_srs_stats
,
"Generate SRS sequence time"
);
printStatIndent2
(
&
gNB
->
get_srs_signal_stats
,
"Get SRS signal time"
);
printStatIndent2
(
&
gNB
->
srs_channel_estimation_stats
,
"SRS channel estimation time"
);
printStatIndent2
(
&
gNB
->
srs_timing_advance_stats
,
"SRS timing advance estimation time"
);
printStatIndent2
(
&
gNB
->
srs_report_tlv_stats
,
"SRS report TLV build time"
);
printStatIndent3
(
&
gNB
->
srs_beam_report_stats
,
"SRS beam report build time"
);
printStatIndent3
(
&
gNB
->
srs_iq_matrix_stats
,
"SRS IQ matrix build time"
);
printf
(
"
\n
"
);
printf
(
"
\n
"
);
}
}
...
...
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