Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
lizhongxiao
OpenXG UE
Commits
34bf8099
Commit
34bf8099
authored
Mar 20, 2017
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
integration fix: let dlsim compile again
Same as previous commit
41dda3d3
but for dlsim.
parent
ff382c25
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
9 deletions
+14
-9
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+14
-9
No files found.
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
34bf8099
...
...
@@ -57,6 +57,8 @@
PHY_VARS_eNB
*
eNB
;
PHY_VARS_UE
*
UE
;
double
cpuf
;
int
otg_enabled
=
0
;
/*the following parameters are used to control the processing times calculations*/
double
t_tx_max
=
-
1000000000
;
/*!< \brief initial max process time for tx */
...
...
@@ -1409,6 +1411,8 @@ int main(int argc, char **argv)
#endif
printf
(
"Detected cpu_freq %f GHz
\n
"
,
cpu_freq_GHz
);
cpuf
=
cpu_freq_GHz
;
//signal(SIGSEGV, handler);
//signal(SIGABRT, handler);
...
...
@@ -2259,7 +2263,8 @@ int main(int argc, char **argv)
reset_meas
(
&
UE
->
dlsch_channel_estimation_stats
);
reset_meas
(
&
UE
->
dlsch_freq_offset_estimation_stats
);
reset_meas
(
&
UE
->
rx_dft_stats
);
reset_meas
(
&
UE
->
dlsch_decoding_stats
);
reset_meas
(
&
UE
->
dlsch_decoding_stats
[
0
]);
reset_meas
(
&
UE
->
dlsch_decoding_stats
[
1
]);
reset_meas
(
&
UE
->
dlsch_turbo_decoding_stats
);
reset_meas
(
&
UE
->
dlsch_deinterleaving_stats
);
reset_meas
(
&
UE
->
dlsch_rate_unmatching_stats
);
...
...
@@ -2708,7 +2713,7 @@ int main(int argc, char **argv)
double
t_rx
=
(
double
)
UE
->
phy_proc_rx
[
subframe
&
0x1
].
p_time
/
cpu_freq_GHz
/
1000
.
0
;
double
t_rx_fft
=
(
double
)
UE
->
ofdm_demod_stats
.
p_time
/
cpu_freq_GHz
/
1000
.
0
;
double
t_rx_demod
=
(
double
)
UE
->
dlsch_rx_pdcch_stats
.
p_time
/
cpu_freq_GHz
/
1000
.
0
;
double
t_rx_dec
=
(
double
)
UE
->
dlsch_decoding_stats
.
p_time
/
cpu_freq_GHz
/
1000
.
0
;
double
t_rx_dec
=
(
double
)
UE
->
dlsch_decoding_stats
[
subframe
&
1
]
.
p_time
/
cpu_freq_GHz
/
1000
.
0
;
if
(
t_tx
>
t_tx_max
)
t_tx_max
=
t_tx
;
...
...
@@ -2921,12 +2926,12 @@ int main(int argc, char **argv)
printf
(
"|__ Statistcs std: %fus median %fus q1 %fus q3 %fus
\n
"
,
std_phy_proc_rx_demod
,
rx_demod_median
,
rx_demod_q1
,
rx_demod_q3
);
printf
(
"DLSCH unscrambling time :%f us (%d trials)
\n
"
,(
double
)
UE
->
dlsch_unscrambling_stats
.
diff
/
UE
->
dlsch_unscrambling_stats
.
trials
/
cpu_freq_GHz
/
1000
.
0
,
UE
->
dlsch_unscrambling_stats
.
trials
);
std_phy_proc_rx_dec
=
sqrt
((
double
)
UE
->
dlsch_decoding_stats
.
diff_square
/
pow
(
cpu_freq_GHz
,
2
)
/
pow
(
1000
,
2
)
/
UE
->
dlsch_decoding_stats
.
trials
-
pow
((
double
)
UE
->
dlsch_decoding_stats
.
diff
/
UE
->
dlsch_decoding_stats
.
trials
/
cpu_freq_GHz
/
1000
,
2
));
std_phy_proc_rx_dec
=
sqrt
((
double
)
UE
->
dlsch_decoding_stats
[
subframe
&
1
]
.
diff_square
/
pow
(
cpu_freq_GHz
,
2
)
/
pow
(
1000
,
2
)
/
UE
->
dlsch_decoding_stats
[
subframe
&
1
].
trials
-
pow
((
double
)
UE
->
dlsch_decoding_stats
[
subframe
&
1
].
diff
/
UE
->
dlsch_decoding_stats
[
subframe
&
1
]
.
trials
/
cpu_freq_GHz
/
1000
,
2
));
printf
(
"DLSCH Decoding time (%02.2f Mbit/s, avg iter %1.2f) :%f us (%d trials, max %f)
\n
"
,
eNB
->
dlsch
[
0
][
0
]
->
harq_processes
[
0
]
->
TBS
/
1000
.
0
,(
double
)
avg_iter
/
iter_trials
,
(
double
)
UE
->
dlsch_decoding_stats
.
diff
/
UE
->
dlsch_decoding_stats
.
trials
/
cpu_freq_GHz
/
1000
.
0
,
UE
->
dlsch_decoding_stats
.
trials
,
(
double
)
UE
->
dlsch_decoding_stats
.
max
/
cpu_freq_GHz
/
1000
.
0
);
(
double
)
UE
->
dlsch_decoding_stats
[
subframe
&
1
].
diff
/
UE
->
dlsch_decoding_stats
[
subframe
&
1
].
trials
/
cpu_freq_GHz
/
1000
.
0
,
UE
->
dlsch_decoding_stats
[
subframe
&
1
]
.
trials
,
(
double
)
UE
->
dlsch_decoding_stats
[
subframe
&
1
]
.
max
/
cpu_freq_GHz
/
1000
.
0
);
printf
(
"|__ Statistcs std: %fus median %fus q1 %fus q3 %fus
\n
"
,
std_phy_proc_rx_dec
,
rx_dec_median
,
rx_dec_q1
,
rx_dec_q3
);
printf
(
"|__ DLSCH Rate Unmatching :%f us (%d trials)
\n
"
,
(
double
)
UE
->
dlsch_rate_unmatching_stats
.
diff
/
UE
->
dlsch_rate_unmatching_stats
.
trials
/
cpu_freq_GHz
/
1000
.
0
,
UE
->
dlsch_rate_unmatching_stats
.
trials
);
...
...
@@ -3114,7 +3119,7 @@ int main(int argc, char **argv)
UE
->
dlsch_rx_pdcch_stats
.
trials
,
UE
->
dlsch_llr_stats
.
trials
,
UE
->
dlsch_unscrambling_stats
.
trials
,
UE
->
dlsch_decoding_stats
.
trials
UE
->
dlsch_decoding_stats
[
subframe
&
1
]
.
trials
);
fprintf
(
time_meas_fd
,
"%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;"
,
get_time_meas_us
(
&
eNB
->
phy_proc_tx
),
...
...
@@ -3127,7 +3132,7 @@ int main(int argc, char **argv)
get_time_meas_us
(
&
UE
->
dlsch_rx_pdcch_stats
),
3
*
get_time_meas_us
(
&
UE
->
dlsch_llr_stats
),
get_time_meas_us
(
&
UE
->
dlsch_unscrambling_stats
),
get_time_meas_us
(
&
UE
->
dlsch_decoding_stats
)
get_time_meas_us
(
&
UE
->
dlsch_decoding_stats
[
subframe
&
1
]
)
);
//fprintf(time_meas_fd,"eNB_PROC_TX_STD;eNB_PROC_TX_MAX;eNB_PROC_TX_MIN;eNB_PROC_TX_MED;eNB_PROC_TX_Q1;eNB_PROC_TX_Q3;eNB_PROC_TX_DROPPED;\n");
fprintf
(
time_meas_fd
,
"%f;%f;%f;%f;%f;%f;%d;"
,
std_phy_proc_tx
,
t_tx_max
,
t_tx_min
,
tx_median
,
tx_q1
,
tx_q3
,
n_tx_dropped
);
...
...
@@ -3167,7 +3172,7 @@ int main(int argc, char **argv)
UE->dlsch_rx_pdcch_stats.trials,
UE->dlsch_llr_stats.trials,
UE->dlsch_unscrambling_stats.trials,
UE->dlsch_decoding_stats.trials);
UE->dlsch_decoding_stats
[subframe&1]
.trials);
*/
printf
(
"[passed] effective rate : %f (%2.1f%%,%f)): log and break
\n
"
,
rate
*
effective_rate
,
100
*
effective_rate
,
rate
);
break
;
...
...
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