ue autotest merge part2
This commit is contained in:
@@ -1,12 +0,0 @@
|
|||||||
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
|
|
||||||
index 07d92a1..b6a02d1 100644
|
|
||||||
--- a/cmake_targets/CMakeLists.txt
|
|
||||||
+++ b/cmake_targets/CMakeLists.txt
|
|
||||||
@@ -235,6 +235,7 @@ add_boolean_option(DEBUG_OMG False "???")
|
|
||||||
add_boolean_option(XFORMS False "This adds the possibility to see the signal oscilloscope")
|
|
||||||
add_boolean_option(PRINT_STATS False "This adds the possibility to see the status")
|
|
||||||
add_boolean_option(T_TRACER False "Activate the T tracer, a debugging/monitoring framework" )
|
|
||||||
+add_boolean_option(UE_AUTOTEST_TRACE False "Activate UE autotest specific logs")
|
|
||||||
|
|
||||||
add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
|
|
||||||
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
diff --git a/openair1/PHY/LTE_TRANSPORT/initial_sync.c b/openair1/PHY/LTE_TRANSPORT/initial_sync.c
|
|
||||||
index 663978e..b77cb1b 100644
|
|
||||||
--- a/openair1/PHY/LTE_TRANSPORT/initial_sync.c
|
|
||||||
+++ b/openair1/PHY/LTE_TRANSPORT/initial_sync.c
|
|
||||||
@@ -476,6 +476,15 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode)
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
if (ue->UE_scan_carrier == 0) {
|
|
||||||
+
|
|
||||||
+ #if UE_AUTOTEST_TRACE
|
|
||||||
+ LOG_I(PHY,"[UE %d] AUTOTEST Cell Sync : frame = %d, rx_offset %d, freq_offset %d \n",
|
|
||||||
+ ue->Mod_id,
|
|
||||||
+ ue->proc.proc_rxtx[0].frame_rx,
|
|
||||||
+ ue->rx_offset,
|
|
||||||
+ ue->common_vars.freq_offset );
|
|
||||||
+ #endif
|
|
||||||
+
|
|
||||||
if (ue->mac_enabled==1) {
|
|
||||||
LOG_I(PHY,"[UE%d] Sending synch status to higher layers\n",ue->Mod_id);
|
|
||||||
//mac_resynch();
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
|
|
||||||
index 5dc629b..353a049 100644
|
|
||||||
--- a/openair1/SCHED/phy_procedures_lte_ue.c
|
|
||||||
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
|
|
||||||
@@ -3551,6 +3551,13 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
|
|
||||||
LOG_D(PHY,"[UE %d] Calculating bitrate Frame %d: total_TBS = %d, total_TBS_last = %d, bitrate %f kbits\n",
|
|
||||||
ue->Mod_id,frame_rx,ue->total_TBS[eNB_id],
|
|
||||||
ue->total_TBS_last[eNB_id],(float) ue->bitrate[eNB_id]/1000.0);
|
|
||||||
+
|
|
||||||
+ #if UE_AUTOTEST_TRACE
|
|
||||||
+ if ((frame_rx % 100 == 0)) {
|
|
||||||
+ LOG_I(PHY,"[UE %d] AUTOTEST Metric : UE_DLSCH_BITRATE = %5.2f kbps (frame = %d) \n", ue->Mod_id, (float) ue->bitrate[eNB_id]/1000.0, frame_rx);
|
|
||||||
+ }
|
|
||||||
+ #endif
|
|
||||||
+
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
|
|
||||||
index 5dc629b..4d31ad3 100644
|
|
||||||
--- a/openair1/SCHED/phy_procedures_lte_ue.c
|
|
||||||
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
|
|
||||||
@@ -3347,6 +3347,22 @@ int phy_procedures_UE_RX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
|
|
||||||
|
|
||||||
// first slot has been processed (FFTs + Channel Estimation, PCFICH/PHICH/PDCCH)
|
|
||||||
|
|
||||||
+ #if UE_AUTOTEST_TRACE
|
|
||||||
+ if ( (frame_rx % 10 == 0) && (subframe_rx == 0)) {
|
|
||||||
+ printf("AUTOTEST Metric : UE_FREQ_OFFSET = %d Hz (frame = %d) \n", ue->common_vars.freq_offset, frame_rx);
|
|
||||||
+ printf("AUTOTEST Metric : UE_RX_OFFSET = %d (frame = %d) \n", ue->rx_offset, frame_rx);
|
|
||||||
+
|
|
||||||
+ printf("AUTOTEST Metric : RRC Measurments RSRP[0] %.2f dBm/RE, RSSI %.2f dBm, RSRQ[0] %.2f dB, N0 %d dBm/RE, NF %.1f dB (frame = %d)\n",
|
|
||||||
+ 10*log10(ue->measurements.rsrp[0])-ue->rx_total_gain_dB,
|
|
||||||
+ 10*log10(ue->measurements.rssi)-ue->rx_total_gain_dB,
|
|
||||||
+ 10*log10(ue->measurements.rsrq[0]),
|
|
||||||
+ ue->measurements.n0_power_tot_dBm,
|
|
||||||
+ (double)ue->measurements.n0_power_tot_dBm+132.24,
|
|
||||||
+ frame_rx);
|
|
||||||
+ }
|
|
||||||
+ #endif
|
|
||||||
+
|
|
||||||
+
|
|
||||||
// do procedures for C-RNTI
|
|
||||||
if (ue->dlsch[eNB_id][0]->active == 1) {
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_PROC, VCD_FUNCTION_IN);
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
|
|
||||||
index 25e9a1c..0b04bb7 100755
|
|
||||||
--- a/cmake_targets/build_oai
|
|
||||||
+++ b/cmake_targets/build_oai
|
|
||||||
@@ -54,6 +54,7 @@ BUILD_DOXYGEN=0
|
|
||||||
T_TRACER="False"
|
|
||||||
DISABLE_HARDWARE_DEPENDENCY="False"
|
|
||||||
CMAKE_BUILD_TYPE=""
|
|
||||||
+UE_AUTOTEST_TRACE="False"
|
|
||||||
trap handle_ctrl_c INT
|
|
||||||
|
|
||||||
function print_help() {
|
|
||||||
@@ -130,6 +131,8 @@ Options
|
|
||||||
Enables the T tracer.
|
|
||||||
--disable-hardware-dependency
|
|
||||||
Disable HW dependency during installation
|
|
||||||
+--ue-autotest-trace
|
|
||||||
+ Enable specific traces for UE autotest framework
|
|
||||||
Usage (first build):
|
|
||||||
oaisim (eNB + UE): ./build_oai -I --oaisim -x --install-system-files
|
|
||||||
Eurecom EXMIMO + COTS UE : ./build_oai -I --eNB -x --install-system-files
|
|
||||||
@@ -285,6 +288,10 @@ function main() {
|
|
||||||
echo_info "Disabling hardware dependency for compiling software"
|
|
||||||
DISABLE_HARDWARE_DEPENDENCY="True"
|
|
||||||
shift 1;;
|
|
||||||
+ --ue-autotest-trace)
|
|
||||||
+ UE_AUTOTEST_TRACE="True"
|
|
||||||
+ echo_info "Enabling autotest specific trace for UE"
|
|
||||||
+ shift 1;;
|
|
||||||
-h | --help)
|
|
||||||
print_help
|
|
||||||
exit 1;;
|
|
||||||
@@ -457,6 +464,7 @@ function main() {
|
|
||||||
echo "set (DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )" >>$cmake_file
|
|
||||||
echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )" >>$cmake_file
|
|
||||||
echo "set ( T_TRACER $T_TRACER )" >> $cmake_file
|
|
||||||
+ echo "set (UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE)" >> $cmake_file
|
|
||||||
echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
|
|
||||||
cd $DIR/$lte_build_dir/build
|
|
||||||
cmake ..
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -972,11 +972,6 @@ unsigned char phy_threegpplte_turbo_decoder8(short *y,
|
|||||||
} else
|
} else
|
||||||
n2 = n;
|
n2 = n;
|
||||||
|
|
||||||
if(n2<256)
|
|
||||||
{
|
|
||||||
printf("phy_threegpplte_turbo_decoder8 : frame length < 256\n");
|
|
||||||
return 255;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (iind=0; iind < 188 && f1f2mat[iind].nb_bits != n; iind++);
|
for (iind=0; iind < 188 && f1f2mat[iind].nb_bits != n; iind++);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user