Skip to content

O
OpenXG-RAN
Commit b6d217ee authored by magounak's avatar magounak
Browse files
Options

added gsl function to compute calibration coefficients in real-time, compute... 

added gsl function to compute calibration coefficients in real-time, compute beam weights and do precoding
parent efbee833
Show whitespace changes
Inline Side-by-side
Showing with 439 additions and 30 deletions
cmake_targets/CMakeLists.txt
View file @ b6d217ee
......@@ -36,6 +36,7 @@ set (OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
set (OPENAIR3_DIR ${OPENAIR_DIR}/openair3)
set (OPENAIR_CMAKE ${OPENAIR_DIR}/cmake_targets)
set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
set (GSL_DIR /home/eurecom/gsl)
project (OpenAirInterface)
......@@ -127,7 +128,7 @@ endfunction()
#set(CMAKE_BUILD_TYPE "Debug")
if (CMAKE_BUILD_TYPE STREQUAL "")
set(CMAKE_BUILD_TYPE "Release")
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif()
message("CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
add_list_string_option(CMAKE_BUILD_TYPE "RelWithDebInfo" "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." Debug Release RelWithDebInfo MinSizeRel)
......@@ -2298,6 +2299,8 @@ if(EXISTS "/usr/include/atlas/cblas.h" OR EXISTS "/usr/include/cblas.h")
LINK_DIRECTORIES("/usr/lib64")
LINK_DIRECTORIES("/usr/lib64/atlas") #Added because atlas libraries in CentOS 7 are here!
include_directories("${GSL_DIR}/include/gsl")
if(EXISTS "/usr/lib64/libblas.so" OR EXISTS "/usr/lib/libblas.so") #Case for CentOS7
list(APPEND ATLAS_LIBRARIES blas)
......@@ -2433,6 +2436,7 @@ target_link_libraries (measurement_display minimal_lib)
# lte-softmodem is both eNB and UE implementation
###################################################
LINK_DIRECTORIES("${GSL_DIR}/lib")
add_executable(lte-softmodem
${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
${OPENAIR_TARGETS}/RT/USER/lte-enb.c
......@@ -2473,6 +2477,7 @@ target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
target_link_libraries (lte-softmodem pthread m ${CONFIG_LIB} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
target_link_libraries (lte-softmodem ${LIB_LMS_LIBRARIES})
target_link_libraries (lte-softmodem ${T_LIB})
target_link_libraries(lte-softmodem gsl gslcblas)
add_executable(cu_test
${OPENAIR2_DIR}/LAYER2/PROTO_AGENT/cu_test.c
......
openair1/PHY/INIT/lte_init.c
View file @ b6d217ee
......@@ -400,8 +400,14 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
common_vars->rxdata = (int32_t **)NULL;
common_vars->txdataF = (int32_t **)malloc16(NB_ANTENNA_PORTS_ENB*sizeof(int32_t *));
common_vars->rxdataF = (int32_t **)malloc16(64*sizeof(int32_t *));
common_vars->calib_coeffs = (int32_t **)malloc16(2*sizeof(int32_t *));
LOG_I(PHY,"[INIT] NB_ANTENNA_PORTS_ENB:%d fp->nb_antenna_ports_eNB:%d\n", NB_ANTENNA_PORTS_ENB, fp->nb_antenna_ports_eNB);
for (i=0; i<2; i++) {
common_vars->calib_coeffs[i] = (int32_t *)malloc16_clear(sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti ); // 2 RRUs
LOG_I(PHY,"[INIT] common_vars->calib_coeffs[%d] = %p (%lu bytes)\n", i,common_vars->calib_coeffs[i], fp->N_RB_UL*12*fp->symbols_per_tti*sizeof(int32_t));
}
for (i=0; i<NB_ANTENNA_PORTS_ENB; i++) {
if (i<fp->nb_antenna_ports_eNB || i==5) {
common_vars->txdataF[i] = (int32_t *)malloc16_clear(fp->ofdm_symbol_size*fp->symbols_per_tti*10*sizeof(int32_t) );
......@@ -528,6 +534,12 @@ void phy_free_lte_eNB(PHY_VARS_eNB *eNB) {
free_and_zero(common_vars->txdataF);
free_and_zero(common_vars->rxdataF);
for (i=0; i<2; i++) {
free_and_zero(common_vars->calib_coeffs[i]);
}
free_and_zero(common_vars->calib_coeffs);
// Channel estimates for SRS
for (UE_id = 0; UE_id < NUMBER_OF_UE_MAX; UE_id++) {
for (i=0; i<64; i++) {
......
openair1/PHY/INIT/lte_init_ru.c
View file @ b6d217ee
......@@ -103,11 +103,24 @@ int phy_init_RU(RU_t *ru) {
// allocate FFT output buffers after extraction (RX)
calibration->rxdataF_ext = (int32_t**)malloc16(2*sizeof(int32_t*));
calibration->drs_ch_estimates = (int32_t**)malloc16(2*sizeof(int32_t*));
calibration->rxdataF_calib = (int32_t****)malloc16(2*sizeof(int32_t***));
//calibration->rxdataF_calib = (int32_t***)malloc16(2*sizeof(int32_t**)); // 2 frames to collect calibration data
//calibration->rxdataF_calib = (int32_t**)malloc16(2*sizeof(int32_t*)); // 2 RRUs
for (i=0; i<ru->nb_rx; i++) {
calibration->rxdataF_calib[i] = (int32_t***)malloc16(2*sizeof(int32_t**)); // 2 frames to collect calibration data
for (j=0; j<2; j++) {
calibration->rxdataF_calib[i][j] = (int32_t**)malloc16(2*sizeof(int32_t*)); // 2 RRUs
for (int k=0; k<2; k++) {
calibration->rxdataF_calib[i][j][k] = (int32_t*)malloc16_clear(sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
}
}
}
for (i=0; i<ru->nb_rx; i++) {
// allocate 2 subframes of I/Q signal data (frequency)
calibration->rxdataF_ext[i] = (int32_t*)malloc16_clear(sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
LOG_I(PHY,"rxdataF_ext[%d] %p for RU %d\n",i,calibration->rxdataF_ext[i],ru->idx);
calibration->drs_ch_estimates[i] = (int32_t*)malloc16_clear(sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti);
//calibration->rxdataF_calib[i] = (int32_t*)malloc16_clear(sizeof(int32_t)*fp->N_RB_UL*12*fp->symbols_per_tti );
}
/* number of elements of an array X is computed as sizeof(X) / sizeof(X[0]) */
......@@ -138,7 +151,7 @@ int phy_init_RU(RU_t *ru) {
for (p=0; p<15; p++) {
LOG_D(PHY,"[INIT] %s() nb_antenna_ports_eNB:%d \n", __FUNCTION__, ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB);
if (p<ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB || p==5) {
if (p<ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB || p==5 || p==7 || p==8) {
LOG_D(PHY,"[INIT] %s() DO BEAM WEIGHTS nb_antenna_ports_eNB:%d nb_tx:%d\n", __FUNCTION__, ru->eNB_list[i]->frame_parms.nb_antenna_ports_eNB, ru->nb_tx);
ru->beam_weights[i][p] = (int32_t **)malloc16_clear(ru->nb_tx*sizeof(int32_t *));
......@@ -209,9 +222,11 @@ void phy_free_RU(RU_t *ru) {
for (i = 0; i < ru->nb_rx; i++) {
free_and_zero(calibration->rxdataF_ext[i]);
free_and_zero(calibration->drs_ch_estimates[i]);
free_and_zero(calibration->rxdataF_calib[i]);
}
free_and_zero(calibration->rxdataF_ext);
free_and_zero(calibration->drs_ch_estimates);
free_and_zero(calibration->rxdataF_calib);
for (i = 0; i < ru->nb_rx; i++) {
free_and_zero(ru->prach_rxsigF[i]);
......
openair1/PHY/MODULATION/compute_bf_weights.c
View file @ b6d217ee
......@@ -2,6 +2,7 @@
#include <stdint.h>
#include <stdlib.h>
#include "PHY/defs_common.h"
#include "PHY/defs_eNB.h"
int f_read(char *calibF_fname, int nb_ant, int nb_freq, int32_t **tdd_calib_coeffs){
......@@ -54,6 +55,24 @@ int compute_BF_weights(int32_t **beam_weights, int32_t **calib_dl_ch_estimates,
return 0;
}
int compute_beam_weights(int32_t **beam_weights[NUMBER_OF_eNB_MAX+1][15], int32_t **calib_coeffs, int32_t **ul_ch_estimates, PHY_VARS_eNB *eNB, int l1_id, int p, int aa, int ru_id) {
//PHY_VARS_eNB *eNB = RC.eNB[0][0];
LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
int d_f = 597;
//LOG_I(PHY,"compute_beam_weights : l1_id %d, p %d, aa %d, ru_id %d \n",l1_id,p,aa,ru_id);
//LOG_I(PHY,"(int16_t*)&beam_weights[%d][%d][%d][0] %p\n", l1_id,p,aa,(int16_t*)&beam_weights[l1_id][p][aa][0]);
//LOG_I(PHY,"[compute_beam_weights] : calib_coeffs[1][%d] : %d %d i\n",d_f,calib_coeffs[1][d_f],calib_coeffs[1][d_f+1]);
mult_cpx_vector((int16_t *)calib_coeffs[ru_id],
(int16_t*)&ul_ch_estimates[aa][0],
(int16_t*)&beam_weights[l1_id][p][aa][0],
fp->N_RB_UL*12,
15);
return 0;
}
// temporal test function
/*
void main(){
......
openair1/PHY/MODULATION/modulation_eNB.h
View file @ b6d217ee
......@@ -84,7 +84,7 @@ int estimate_DLCSI_from_ULCSI(int32_t **calib_dl_ch_estimates, int32_t **ul_ch_e
int compute_BF_weights(int32_t **beam_weights, int32_t **calib_dl_ch_estimates, PRECODE_TYPE_t precode_type, int nb_ant, int nb_freq);
int compute_beam_weights(int32_t **beam_weights[NUMBER_OF_eNB_MAX+1][15], int32_t **calib_coeffs, int32_t **ul_ch_estimates, PHY_VARS_eNB *eNB, int l1_id, int p, int aa, int ru_id);
/** @}*/
#endif
openair1/PHY/defs_RU.h
View file @ b6d217ee
......@@ -138,16 +138,41 @@ typedef struct {
typedef struct {
/// \brief Received frequency-domain signal after extraction.
/// - first index: ? [0..7] (hard coded) FIXME! accessed via \c nb_antennas_rx
/// - second index: ? [0..168*N_RB_DL[
/// - second index: ? [0..168*N_RB_DL]
int32_t **rxdataF_ext;
/// \brief Hold the channel estimates in time domain based on DRS.
/// - first index: rx antenna id [0..nb_antennas_rx[
/// - second index: ? [0..4*ofdm_symbol_size[
/// - first index: rx antenna id [0..nb_antennas_rx]
/// - second index: ? [0..4*ofdm_symbol_size]
int32_t **drs_ch_estimates_time;
/// \brief Hold the channel estimates in frequency domain based on DRS.
/// - first index: rx antenna id [0..nb_antennas_rx[
/// - second index: ? [0..12*N_RB_UL*frame_parms->symbols_per_tti[
/// - first index: rx antenna id [0..nb_antennas_rx]
/// - second index: ? [0..12*N_RB_UL*frame_parms->symbols_per_tti]
int32_t **drs_ch_estimates;
/// \brief Holds all the received data required for one calibration round in the frequency domain at calibration symbol 10/SSF1
/// \brief calibration round = required frames to collect calibration symbols from all active RRUs = number of RRUs
/// e.x. if we need to calibrate 3 RRUs, the calibration round consists of 3 frames
/// - first index: frame number
/// - second index: RRU tag
/// - third index: rx antenna id [0..nb_antennas_rx]
/// - fourth index: [0..168*N_RB_DL]
int32_t ****rxdataF_calib;
/// \brief Holds the tdd reciprocity calibration coefficients
/// - first index: tx antenna [0..nb_antennas_tx]
/// - second index: number of RRUs
/// - third index: subcarriers [0..168*N_RB_DL]
int32_t ***calib_coeffs;
/// mutex for calibration thread
pthread_mutex_t mutex_calib;
/// condition variable for calibration processing thread
pthread_cond_t cond_calib;
/// This variable is protected by mutex_calib.
int instance_cnt_calib;
// pthread structure for calibration processing thread
pthread_t pthread_calib;
// pthread attributes for calibration processing thread
pthread_attr_t attr_calib;
// calibration frame counter
int calib_frame;
} RU_CALIBRATION;
......
openair1/PHY/defs_eNB.h
View file @ b6d217ee
......@@ -86,6 +86,11 @@ typedef struct {
/// - first index: tx antenna [0..14[ where 14 is the total supported antenna ports.
/// - second index: sample [0..]
int32_t **txdataF;
/// \brief Holds the tdd reciprocity calibration coefficients
/// - first index: tx antenna [0..nb_antennas_tx]
/// - second index: number of RRUs
/// - third index: subcarriers [0..168*N_RB_DL]
int32_t **calib_coeffs;
} LTE_eNB_COMMON;
typedef struct {
......@@ -574,6 +579,8 @@ typedef struct PHY_VARS_eNB_s {
/// if ==0 enables phy only test mode
int mac_enabled;
/// enable precoding with calibration coefficients
int calib_prec_enabled;
// PDSCH Varaibles
PDSCH_CONFIG_DEDICATED pdsch_config_dedicated[NUMBER_OF_UE_MAX];
......
openair1/SCHED/ru_procedures.c
View file @ b6d217ee
......@@ -117,11 +117,11 @@ void feptx0(RU_t *ru,
fp->frame_type,ru->is_slave);
*/
int num_symb = 7;
/*
if (subframe_select(fp,subframe) == SF_S)
num_symb = fp->dl_symbols_in_S_subframe+1;
if (ru->generate_dmrs_sync == 1 && slot == 0 && subframe == 1 && aa==0) {
*/
if (ru->generate_dmrs_sync == 1 && /*slot == 2 &&*/ subframe == 1 && aa==0) {
//int32_t dmrs[ru->frame_parms.ofdm_symbol_size*14] __attribute__((aligned(32)));
//int32_t *dmrsp[2] ={dmrs,NULL}; //{&dmrs[(3-ru->frame_parms.Ncp)*ru->frame_parms.ofdm_symbol_size],NULL};
......@@ -443,12 +443,16 @@ void feptx_prec(RU_t *ru,
int l,i,aa;
PHY_VARS_eNB **eNB_list = ru->eNB_list, *eNB;
LTE_DL_FRAME_PARMS *fp;
RU_CALIBRATION *calibration = &ru->calibration;
if (ru->num_eNB == 1)
{
eNB = eNB_list[0];
//PHY_VARS_eNB *eNB = RC.eNB[0][0];
LTE_eNB_COMMON *const common_vars = &eNB->common_vars;
fp = &eNB->frame_parms;
LTE_eNB_PDCCH *pdcch_vars = &eNB->pdcch_vars[subframe&1];
LTE_eNB_SRS *srs_vars = eNB->srs_vars;
if (subframe_select(fp,subframe) == SF_UL) return;
......@@ -457,6 +461,22 @@ void feptx_prec(RU_t *ru,
for (aa=0;aa<ru->nb_tx;aa++) {
memset(ru->common.txdataF_BF[aa],0,sizeof(int32_t)*fp->ofdm_symbol_size*fp->symbols_per_tti);
for (int p=0;p<NB_ANTENNA_PORTS_ENB;p++) {
if (eNB->calib_prec_enabled==1 && (p==0 || p==5 || p==7 || p==8)) {
//LOG_I(PHY,"[feptx_prec] common_vars->calib_coeffs[%d] = %p \n",ru->idx,common_vars->calib_coeffs[ru->idx]);
//LOG_I(PHY,"feptx_prec : calib_coeffs[%d][597] : %d %d i\n",ru->idx,((int16_t*)&RC.eNB[0][0]->common_vars.calib_coeffs[ru->idx])[597], ((int16_t*)&RC.eNB[0][0]->common_vars.calib_coeffs[ru->idx])[597+1]);
compute_beam_weights(ru->beam_weights, common_vars->calib_coeffs, srs_vars->srs_ch_estimates, eNB, eNB->Mod_id, p, aa, ru->idx);
for (l=pdcch_vars->num_pdcch_symbols;l<fp->symbols_per_tti;l++) {
beam_precoding(eNB->common_vars.txdataF,
ru->common.txdataF_BF,
subframe,
fp,
ru->beam_weights,
l,
aa,
p,
eNB->Mod_id);
}
}
if (ru->do_precoding == 0) {
if (p==0)
memcpy((void*)ru->common.txdataF_BF[aa],
......@@ -639,7 +659,12 @@ void ru_fep_full_2thread(RU_t *ru,
struct timespec wait;
if ((fp->frame_type == TDD) && (subframe_select(fp,subframe) != SF_UL)) return;
if (subframe==1){
}
else if ((fp->frame_type == TDD) && (subframe_select(fp,subframe) != SF_UL)) {
return;
}
if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
......
targets/RT/USER/lte-ru.c
View file @ b6d217ee
......@@ -45,11 +45,21 @@
#include <getopt.h>
#include <sys/sysinfo.h>
#include "rt_wrapper.h"
#include </home/eurecom/gsl/include/gsl/gsl_vector.h>
#include </home/eurecom/gsl/include/gsl/gsl_complex.h>
#include </home/eurecom/gsl/include/gsl/gsl_complex_math.h>
#include </home/eurecom/gsl/include/gsl/gsl_inline.h>
#include </home/eurecom/gsl/include/gsl/gsl_eigen.h>
#include </home/eurecom/gsl/include/gsl/gsl_matrix.h>
#include </home/eurecom/gsl/include/gsl/gsl_blas.h>
#include </home/eurecom/gsl/include/gsl/gsl_linalg.h>
#define GSL_EXPORT
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include "assertions.h"
#include "msc.h"
#include "PHY/defs_eNB.h"
#include "PHY/defs_common.h"
#include "PHY/phy_extern.h"
#include "PHY/types.h"
......@@ -123,6 +133,11 @@ int connect_rau(RU_t *ru);
const char ru_states[6][9] = {"RU_IDLE","RU_CONFIG","RU_READY","RU_RUN","RU_ERROR","RU_SYNC"};
#define FRACT_BITS 15
#define FLOAT2FIXED(x) (int16_t)(round(x * (1 << FRACT_BITS)))
int32_t calib_data[1][2][2][600];
extern uint16_t sf_ahead;
#if defined(PRE_SCD_THREAD)
......@@ -219,6 +234,9 @@ void fh_if4p5_south_in(RU_t *ru,
RU_proc_t *proc = &ru->proc;
int f,sf,Ns,l,u;
RU_CALIBRATION *calibration = &ru->calibration;
PHY_VARS_eNB *eNB;
eNB = RC.eNB[0][0];
LTE_eNB_COMMON *const common_vars = &eNB->common_vars;
uint16_t packet_type;
uint32_t symbol_number=0;
uint32_t symbol_mask_full;
......@@ -261,7 +279,7 @@ void fh_if4p5_south_in(RU_t *ru,
} else if (packet_type == IF4p5_PRACH) {
// nothing in RU for RAU
}
LOG_D(PHY,"rx_fh_if4p5 for RU %d: subframe %d, sf %d, symbol mask %x\n",ru->idx,*subframe,sf,proc->symbol_mask[sf]);
LOG_D(PHY,"rx_fh_if4p5 for RU %d: subframe %d, sf %d, symbol mask %x, pulticks %d\n",ru->idx,*subframe,sf,proc->symbol_mask[sf],pultick_received);
} while(proc->symbol_mask[sf] != symbol_mask_full);
}
else {
......@@ -313,10 +331,25 @@ void fh_if4p5_south_in(RU_t *ru,
}*/
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_IF4P5_SOUTH_IN_RU+ru->idx,f);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_IF4P5_SOUTH_IN_RU+ru->idx,sf);
/*
// prepei kapws na thesw to cnt = 1 mono mia fora
if (ru->wait_cnt==5){
calib_frame = 0;
temp_frame = f;
LOG_I(PHY,"1) calib_frame %d, temp_frame %d, RRU %d\n",calib_frame,temp_frame,ru->idx);
}
*/
if (ru->is_slave==1 && ru->wait_cnt==0) RC.collect = 1;
if (ru->wait_cnt==0 && packet_type == IF4p5_PULCALIB && RC.collect==1) {
if (ru->wait_cnt==0 && packet_type == IF4p5_PULCALIB && RC.collect==1 && f>199 && ( (f%2==0 && ru->idx==1) || (f%2==1 && ru->idx==0) ) ) {
if (f%2==0) {
calibration->calib_frame = 0;
calibration->calib_frame++;
} else {
calibration->calib_frame+=2;
}
T(T_RAU_INPUT_SIGNAL, T_INT(ru->idx), T_INT(f), T_INT(sf),
T_BUFFER(&ru->common.rxdataF[0][0],
......@@ -335,6 +368,30 @@ void fh_if4p5_south_in(RU_t *ru,
Ns,
fp);
//mutex lock for wakeup signal
pthread_mutex_lock(&calibration->mutex_calib);
//check instance ==-1 then memcpy else nthing
if (calibration->instance_cnt_calib < 0) {
memcpy((void*)calib_data[0][calibration->calib_frame-1][ru->idx],
(void*)&calibration->rxdataF_ext[0][l*12*fp->N_RB_UL],
12*fp->N_RB_UL*sizeof(int32_t));
}
//wakeup calib_thread only if I have collected all the required data for calibration
if (calibration->calib_frame==2) {
calibration->calib_frame = 0;
// the thread can now be woken up
//LOG_I(PHY,"calib_thread is woken up, RU %d\n", ru->idx);
//LOG_I(PHY,"[fh_if4p5_south_in] common_vars->calib_coeffs[%d] = %p \n",ru->idx,common_vars->calib_coeffs[ru->idx]);
RC.eNB[0][0]->calib_prec_enabled = 0;
calibration->instance_cnt_calib = 0;
pthread_cond_signal(&calibration->cond_calib);
}
//mutex unlock for wakeup signal
pthread_mutex_unlock(&calibration->mutex_calib);
// OR should I call just: lte_ul_channel_estimation();
/*lte_ul_channel_estimation((PHY_VARS_eNB *)NULL,
proc,
......@@ -342,7 +399,7 @@ void fh_if4p5_south_in(RU_t *ru,
3%(fp->symbols_per_tti/2),
Ns);
*/
lte_ul_channel_estimation_RRU(fp,
/* lte_ul_channel_estimation_RRU(fp,
calibration->drs_ch_estimates,
calibration->drs_ch_estimates_time,
calibration->rxdataF_ext,
......@@ -360,13 +417,13 @@ void fh_if4p5_south_in(RU_t *ru,
T_INT(l),T_BUFFER(&calibration->drs_ch_estimates[0][l*12*fp->N_RB_UL],
12*fp->N_RB_UL*sizeof(int32_t)));
T(T_RAU_INPUT_DMRS, T_INT(ru->idx), T_INT(f), T_INT(sf),
T_BUFFER(&calibration->rxdataF_ext[0][l*12*fp->N_RB_UL],
12*fp->N_RB_UL*sizeof(int32_t)));
T(T_CALIBRATION_CHANNEL_ESTIMATES_TIME, T_INT(ru->idx), T_INT(f), T_INT(sf),
T_BUFFER(calibration->drs_ch_estimates_time[0],
fp->ofdm_symbol_size*sizeof(int32_t)));
*/
T(T_RAU_INPUT_DMRS, T_INT(ru->idx), T_INT(f), T_INT(sf),
T_BUFFER(&calibration->rxdataF_ext[0][l*12*fp->N_RB_UL],
12*fp->N_RB_UL*sizeof(int32_t)));
}
......@@ -1782,8 +1839,8 @@ static void *ru_thread_tx( void *param ) {
}
}
//printf("ru_thread_tx: Frame %d, Subframe %d: RU %d done (wait_cnt %d),RU_mask_tx %d\n",
//eNB_proc->frame_rx,eNB_proc->subframe_rx,ru->idx,ru->wait_cnt,eNB_proc->RU_mask_tx);
/* printf("ru_thread_tx: Frame %d, Subframe %d: RU %d done (wait_cnt %d),RU_mask_tx %d\n",
eNB_proc->frame_rx,eNB_proc->subframe_rx,ru->idx,ru->wait_cnt,eNB_proc->RU_mask_tx);*/
}
release_thread(&proc->mutex_FH1,&proc->instance_cnt_FH1,"ru_thread_tx");
......@@ -1791,6 +1848,235 @@ static void *ru_thread_tx( void *param ) {
}
//int calib_thread( void *param ) {
void *calib_thread(void *param) {
RU_t *ru = (RU_t *)param;
RU_CALIBRATION *calibration = &ru->calibration;
LTE_DL_FRAME_PARMS *fp = ru->frame_parms;
PHY_VARS_eNB *eNB;
eNB = RC.eNB[0][0];
LTE_eNB_COMMON *const common_vars = &eNB->common_vars;
//PHY_VARS_eNB *eNB = (PHY_VARS_eNB *)param;
//PHY_VARS_eNB *eNB = RC.eNB[0][0];
//PHY_VARS_eNB **eNB_list = *eNB;
//eNB = eNB_list[0];
//LTE_eNB_COMMON *common_vars = &eNB->common_vars;
int G = 2; // number of groups of RRUs
int N_RRUs = RC.nb_RU; // number of active RRUs
int M_i = N_RRUs/G; // number of RRUs per group
int d_f;
uint32_t N_f = 12*fp->N_RB_UL; // number of subcarriers
double y = -1; // scaled by -1
double x = 32768; // scaled by 1/pow2(15)
/*
gsl_vector_complex *drsseq0 = gsl_vector_complex_alloc(N_f);
gsl_complex Z,Z_scaled,val;
gsl_matrix_complex *P = gsl_matrix_complex_alloc(M_i,M_i);
gsl_matrix_complex *Y2_1 = gsl_matrix_complex_alloc(M_i,M_i); // y1_0
gsl_matrix_complex *Y1_2 = gsl_matrix_complex_alloc(M_i,M_i); // y0_1
gsl_vector_complex *y0_1 = gsl_vector_complex_alloc(N_f);
gsl_vector_complex *y1_0 = gsl_vector_complex_alloc(N_f);
gsl_matrix_complex *Y_P_res = gsl_matrix_complex_alloc(N_RRUs,N_RRUs);
gsl_eigen_hermv_workspace *w = gsl_eigen_hermv_alloc(N_RRUs);
gsl_vector *Y_P_eigenvalues = gsl_vector_alloc(N_RRUs);
gsl_matrix_complex *Y_P_eigenvectors = gsl_matrix_complex_alloc(N_RRUs,N_RRUs);
gsl_vector_complex *F_inv_est = gsl_vector_complex_alloc(N_RRUs);
gsl_matrix_complex *F = gsl_matrix_complex_alloc(N_RRUs,N_f);
*/
while (!oai_exit) {
if (oai_exit) break;
wait_on_condition(&calibration->mutex_calib,&calibration->cond_calib,&calibration->instance_cnt_calib,"calib_thread");
//LOG_I(PHY,"START of calib_thread : instance_cnt_calib %d\n",calibration->instance_cnt_calib);
//if (gsl_vector_complex_isnull(y1_0)==1) return;
gsl_vector_complex *drsseq0 = gsl_vector_complex_alloc(N_f);
gsl_complex Z,Z_scaled,val;
gsl_matrix_complex *P = gsl_matrix_complex_alloc(M_i,M_i);
gsl_matrix_complex *Y2_1 = gsl_matrix_complex_alloc(M_i,M_i); // y1_0
gsl_matrix_complex *Y1_2 = gsl_matrix_complex_alloc(M_i,M_i); // y0_1
gsl_vector_complex *y0_1 = gsl_vector_complex_alloc(N_f);
gsl_vector_complex *y1_0 = gsl_vector_complex_alloc(N_f);
gsl_matrix_complex *Y_P_res = gsl_matrix_complex_alloc(N_RRUs,N_RRUs);
gsl_eigen_hermv_workspace *w = gsl_eigen_hermv_alloc(N_RRUs);
gsl_vector *Y_P_eigenvalues = gsl_vector_alloc(N_RRUs);
gsl_matrix_complex *Y_P_eigenvectors = gsl_matrix_complex_alloc(N_RRUs,N_RRUs);
gsl_vector_complex *F_inv_est = gsl_vector_complex_alloc(N_RRUs);
gsl_matrix_complex *F = gsl_matrix_complex_alloc(N_RRUs,N_f);
for (d_f=0; d_f<N_f; d_f++) {
GSL_SET_COMPLEX(&Z,ul_ref_sigs_rx[0][0][23][d_f<<1],ul_ref_sigs_rx[0][0][23][1+(d_f<<1)]);
Z_scaled = gsl_complex_div_real(Z,x);
gsl_vector_complex_set(drsseq0,d_f,Z_scaled);
//printf(" pilots(%d) : %g %gi \n", d_f, GSL_REAL(gsl_vector_complex_get(drsseq0,d_f)), GSL_IMAG(gsl_vector_complex_get(drsseq0,d_f)));
/*
GSL_SET_COMPLEX(&Z,calibration->rxdataF_calib[0][0][1][d_f<<1], calibration->rxdataF_calib[0][0][1][1+(d_f<<1)]);
gsl_vector_complex_set(y0_1,d_f,Z);
//printf(" y0_1(%d) : %g %gi \n", d_f, GSL_REAL(gsl_vector_complex_get(y0_1,d_f)), GSL_IMAG(gsl_vector_complex_get(y0_1,d_f)));
GSL_SET_COMPLEX(&Z,calibration->rxdataF_calib[0][1][0][d_f<<1], calibration->rxdataF_calib[0][1][0][1+(d_f<<1)]);
gsl_vector_complex_set(y1_0,d_f,Z);
*/
//GSL_SET_COMPLEX(&Z,calib_data[0][0][1][d_f<<1], calib_data[0][0][1][1+(d_f<<1)]);
GSL_SET_COMPLEX(&Z,((int16_t*)&calib_data[0][0][1])[d_f],((int16_t*)&calib_data[0][0][1])[d_f+1]);
gsl_vector_complex_set(y0_1,d_f,Z);
//printf(" y0_1(%d) : %g %gi \n", d_f, GSL_REAL(gsl_vector_complex_get(y0_1,d_f)), GSL_IMAG(gsl_vector_complex_get(y0_1,d_f)));
//GSL_SET_COMPLEX(&Z,calib_data[0][1][0][d_f<<1], calib_data[0][1][0][1+(d_f<<1)]);
GSL_SET_COMPLEX(&Z,((int16_t*)&calib_data[0][1][0])[d_f],((int16_t*)&calib_data[0][1][0])[d_f+1]);
gsl_vector_complex_set(y1_0,d_f,Z);
//printf(" y1_0(%d) : %g %gi \n", d_f, GSL_REAL(gsl_vector_complex_get(y1_0,d_f)), GSL_IMAG(gsl_vector_complex_get(y1_0,d_f)));
}
//printf("RRU %d, y0_1(10) : %g %gi \n", ru->idx, GSL_REAL(gsl_vector_complex_get(y0_1,10)), GSL_IMAG(gsl_vector_complex_get(y0_1,10)));
//printf("RRU %d, y1_0(10) : %g %gi \n", ru->idx, GSL_REAL(gsl_vector_complex_get(y1_0,10)), GSL_IMAG(gsl_vector_complex_get(y1_0,10)));
for (int d_f=0; d_f<N_f; d_f++){
gsl_matrix_complex_set(P,0,0,gsl_vector_complex_get(drsseq0,d_f));
gsl_matrix_complex_set(Y2_1,0,0,gsl_vector_complex_get(y1_0,d_f));
gsl_matrix_complex_set(Y1_2,0,0,gsl_vector_complex_get(y0_1,d_f));
//LOG_I(PHY,"M_i %d, d_f %d, Y2_1->size1 %lu\n",M_i,d_f,Y2_1->size1);
gsl_matrix_complex *AB = gsl_matrix_complex_alloc(Y2_1->size2*P->size2,Y2_1->size1); // result from first khatri rao
gsl_matrix_complex *AB1 = gsl_matrix_complex_alloc(Y1_2->size2*P->size2,Y1_2->size1); // // result from second khatri rao
gsl_matrix_complex *Y_P = gsl_matrix_complex_alloc(AB->size1,N_RRUs);
gsl_vector_complex *P_trans_col_vec = gsl_vector_complex_alloc(P->size2);
gsl_matrix_complex *P_trans_col = gsl_matrix_complex_alloc(P->size2,1);
gsl_vector_complex *Y2_1_trans_col_vec = gsl_vector_complex_alloc(Y2_1->size2);
gsl_matrix_complex *Y2_1_trans_col = gsl_matrix_complex_alloc(Y2_1->size2,1);
gsl_vector_complex *Y1_2_trans_col_vec = gsl_vector_complex_alloc(Y1_2->size2);
gsl_matrix_complex *Y1_2_trans_col = gsl_matrix_complex_alloc(Y1_2->size2,1);
gsl_matrix_complex *ab = gsl_matrix_complex_alloc(P_trans_col->size1, Y2_1_trans_col->size1);
gsl_matrix_complex *ab1 = gsl_matrix_complex_alloc(Y1_2_trans_col->size1, P_trans_col->size1);
gsl_vector_complex *AB_col = gsl_vector_complex_alloc(AB->size1);
gsl_vector_complex *AB1_col = gsl_vector_complex_alloc(AB1->size1);
for (int i=0; i<Y2_1->size1; i++){
gsl_matrix_complex_get_row (P_trans_col_vec,P,i);
gsl_matrix_complex_set_col(P_trans_col,0,P_trans_col_vec);
gsl_matrix_complex_get_row (Y2_1_trans_col_vec,Y2_1,i);
gsl_matrix_complex_set_col(Y2_1_trans_col,0,Y2_1_trans_col_vec);
gsl_blas_zgemm(CblasNoTrans, CblasTrans, GSL_COMPLEX_ONE, P_trans_col, Y2_1_trans_col, GSL_COMPLEX_ZERO, ab);
int k = 0;
int m = 0;
while(k<AB->size1){
int l = 0;
while(l<ab->size1){
gsl_matrix_complex_set(AB,k,i,gsl_matrix_complex_get(ab,l,m));
k++;
l++;
}
m++;
}
gsl_matrix_complex_get_row (Y1_2_trans_col_vec,Y1_2,i);
gsl_matrix_complex_set_col(Y1_2_trans_col,0,Y1_2_trans_col_vec);
gsl_blas_zgemm(CblasNoTrans, CblasTrans, GSL_COMPLEX_ONE, Y1_2_trans_col, P_trans_col, GSL_COMPLEX_ZERO, ab1);
k = 0;
m = 0;
while(k<AB1->size1){
int l = 0;
while(l<ab1->size1){
gsl_matrix_complex_set(AB1,k,i,gsl_complex_mul_real(gsl_matrix_complex_get(ab1,l,m),y));
k++;
l++;
}
m++;
}
} // end for i
gsl_matrix_complex_get_col (AB_col,AB,0);
gsl_matrix_complex_set_col(Y_P,0,AB_col);
gsl_matrix_complex_get_col (AB1_col,AB1,0);
gsl_matrix_complex_set_col(Y_P,1,AB1_col);
gsl_blas_zgemm(CblasConjTrans, CblasNoTrans,
GSL_COMPLEX_ONE, Y_P, Y_P,
GSL_COMPLEX_ZERO, Y_P_res);
//printf("\n \n Y_P_res for d_f %d is: \n",d_f);
//display_mat(Y_P_res);
gsl_eigen_hermv(Y_P_res, Y_P_eigenvalues, Y_P_eigenvectors, w);
//printf("\n eigenvalues are : %f, %f\n",gsl_vector_get(Y_P_eigenvalues,0),gsl_vector_get(Y_P_eigenvalues,1));
//printf("\n \n eigenvector for d_f %d is: \n",d_f);
//display_mat(Y_P_eigenvectors);
int min_eigenindex = gsl_vector_min_index(Y_P_eigenvalues); // returns the index of the minimum value in the vector Y_P_eigenvalues
//printf(" Minimum eigenindex is %d\n",min_eigenindex);
gsl_matrix_complex_get_col (F_inv_est,Y_P_eigenvectors,min_eigenindex);
gsl_complex set_to_unit;
GSL_SET_COMPLEX(&set_to_unit,1,0);
gsl_vector_complex_set(F_inv_est,0,set_to_unit);
//for (int i=0;i<N_RRUs;i++) {
//printf(" F_inv_est(%d) : %g %gi \n",i, GSL_REAL(gsl_vector_complex_get(F_inv_est,i)), GSL_IMAG(gsl_vector_complex_get(F_inv_est,i)));
//}
gsl_matrix_complex_set_col(F,d_f,F_inv_est);
//printf("\n \n Calibration matrix(%d) : \n",d_f);
//display_mat(F);
//calibration->calib_coeffs[0][0][d_f] = gsl_matrix_complex_get(F,0,d_f);
//convert it back to fixed point
for (int k=0; k<F->size1; k++) {
if (k==0) {
//LOG_I(PHY,"[1) calib_thread[%d]] common_vars->calib_coeffs[%d] = %p \n",d_f,k,common_vars->calib_coeffs[k]);
// ((int16_t*)&RC.eNB[0][0]->common_vars.calib_coeffs[k])[d_f] = FLOAT2FIXED(1);
// ((int16_t*)&RC.eNB[0][0]->common_vars.calib_coeffs[k])[d_f+1] = FLOAT2FIXED(0);
common_vars->calib_coeffs[k][d_f] = FLOAT2FIXED(1);
common_vars->calib_coeffs[k][d_f+1] = FLOAT2FIXED(0);
//LOG_I(PHY,"[2) calib_thread[%d]] common_vars->calib_coeffs[%d] = %p \n",d_f,k,common_vars->calib_coeffs[k]);
//((int16_t*)&calib_coeffs[0][k])[d_f] = FLOAT2FIXED(1);
//((int16_t*)&calib_coeffs[0][k])[d_f+1] = FLOAT2FIXED(0);
} else {
//LOG_I(PHY,"[3) calib_thread[%d]] common_vars->calib_coeffs[%d] = %p \n",d_f,k,common_vars->calib_coeffs[k]);
val = gsl_matrix_complex_get(F,k,d_f);
//((int16_t*)&RC.eNB[0][0]->common_vars.calib_coeffs[k])[d_f] = FLOAT2FIXED(GSL_REAL(val));
//((int16_t*)&RC.eNB[0][0]->common_vars.calib_coeffs[k])[d_f+1] = FLOAT2FIXED(GSL_IMAG(val));
common_vars->calib_coeffs[k][d_f] = FLOAT2FIXED(GSL_REAL(val));
common_vars->calib_coeffs[k][d_f+1] = FLOAT2FIXED(GSL_IMAG(val));
//LOG_I(PHY,"[4) calib_thread[%d]] common_vars->calib_coeffs[%d] = %p \n",d_f,k,common_vars->calib_coeffs[k]);
//((int16_t*)calib_coeffs[0][k])[d_f] = FLOAT2FIXED(GSL_REAL(val));
//((int16_t*)calib_coeffs[0][k])[d_f+1] = FLOAT2FIXED(GSL_IMAG(val));
}
//LOG_I(PHY," gsl F[%d][%d] : %g %gi \n", k,d_f,GSL_REAL(val), GSL_IMAG(val));
/*
if (d_f==597 || d_f==598){
LOG_I(PHY,"calib_thread : calib_coeffs[%d][%d] : %d %d i\n",k,d_f,common_vars->calib_coeffs[k][d_f],common_vars->calib_coeffs[k][d_f+1]);
}
*/
}
gsl_matrix_complex_free(AB);
gsl_matrix_complex_free(AB1);
gsl_matrix_complex_free(Y_P);
gsl_vector_complex_free(P_trans_col_vec);
gsl_matrix_complex_free(P_trans_col);
gsl_vector_complex_free(Y2_1_trans_col_vec);
gsl_matrix_complex_free(Y2_1_trans_col);
gsl_vector_complex_free(Y1_2_trans_col_vec);
gsl_matrix_complex_free(Y1_2_trans_col);
gsl_matrix_complex_free(ab);
gsl_matrix_complex_free(ab1);
gsl_vector_complex_free(AB_col);
gsl_vector_complex_free(AB1_col);
} // end for d_f
//LOG_I(PHY,"[calib_thread] common_vars->calib_coeffs[%d] = %p \n",ru->idx,common_vars->calib_coeffs[ru->idx]);
calibration->instance_cnt_calib = -2;
RC.eNB[0][0]->calib_prec_enabled = 1;
gsl_vector_complex_free(drsseq0);
gsl_matrix_complex_free(P);
gsl_matrix_complex_free(Y2_1);
gsl_matrix_complex_free(Y1_2);
gsl_vector_complex_free(y0_1);
gsl_vector_complex_free(y1_0);
gsl_matrix_complex_free(Y_P_res);
gsl_eigen_hermv_free(w);
gsl_vector_free(Y_P_eigenvalues);
gsl_matrix_complex_free(Y_P_eigenvectors);
gsl_vector_complex_free(F_inv_est);
gsl_matrix_complex_free(F);
} // end while
printf( "Exiting calib_thread \n");
return NULL;
//return(0);
}
static void *ru_thread( void *param ) {
RU_t *ru = (RU_t *)param;
RU_proc_t *proc = &ru->proc;
......@@ -2369,14 +2655,17 @@ void reset_proc(RU_t *ru) {
void init_RU_proc(RU_t *ru) {
int i=0, ret;
RU_proc_t *proc;
pthread_attr_t *attr_FH=NULL, *attr_FH1=NULL, *attr_prach=NULL, *attr_asynch=NULL, *attr_synch=NULL, *attr_emulateRF=NULL, *attr_ctrl=NULL, *attr_prach_br=NULL;
RU_CALIBRATION *calibration;
pthread_attr_t *attr_FH=NULL, *attr_FH1=NULL, *attr_prach=NULL, *attr_asynch=NULL, *attr_synch=NULL, *attr_emulateRF=NULL, *attr_ctrl=NULL, *attr_prach_br=NULL, *attr_calib=NULL;
//pthread_attr_t *attr_fep=NULL;
#ifndef OCP_FRAMEWORK
LOG_I(PHY,"Initializing RU proc %d (%s,%s),\n",ru->idx,NB_functions[ru->function],NB_timing[ru->if_timing]);
#endif
proc = &ru->proc;
calibration = &ru->calibration;
memset((void *)proc,0,sizeof(RU_proc_t));
proc->ru = ru;
calibration->instance_cnt_calib = -1;
proc->instance_cnt_prach = -1;
proc->instance_cnt_synch = -1;
proc->instance_cnt_FH = -1;
......@@ -2393,6 +2682,7 @@ void init_RU_proc(RU_t *ru) {
for (i=0; i<10; i++) proc->symbol_mask[i]=0;
pthread_mutex_init( &calibration->mutex_calib, NULL);
pthread_mutex_init( &proc->mutex_prach, NULL);
pthread_mutex_init( &proc->mutex_asynch_rxtx, NULL);
pthread_mutex_init( &proc->mutex_synch,NULL);
......@@ -2429,6 +2719,7 @@ void init_RU_proc(RU_t *ru) {
pthread_cond_init( &proc->cond_rf_tx, NULL);
#endif
#ifndef DEADLINE_SCHEDULER
attr_calib = &calibration->attr_calib;
attr_FH = &proc->attr_FH;
attr_FH1 = &proc->attr_FH1;
attr_prach = &proc->attr_prach;
......@@ -2440,6 +2731,7 @@ void init_RU_proc(RU_t *ru) {
if (ru->function!=eNodeB_3GPP) pthread_create( &proc->pthread_ctrl, attr_ctrl, ru_thread_control, (void *)ru );
pthread_create( &calibration->pthread_calib, attr_calib, calib_thread, (void *)ru );
pthread_create( &proc->pthread_FH, attr_FH, ru_thread, (void *)ru );
#if defined(PRE_SCD_THREAD)
proc->instance_pre_scd = -1;
......@@ -2508,6 +2800,7 @@ void init_RU_proc(RU_t *ru) {
void kill_RU_proc(RU_t *ru) {
int ret;
RU_proc_t *proc = &ru->proc;
RU_CALIBRATION *calibration = &ru->calibration;
#if defined(PRE_SCD_THREAD)
AssertFatal((ret=pthread_mutex_lock(&proc->mutex_pre_scd))==0,"mutex_lock returns %d\n",ret);
ru->proc.instance_pre_scd = 0;
......@@ -2545,6 +2838,10 @@ void kill_RU_proc(RU_t *ru) {
proc->instance_cnt_FH = 0;
pthread_cond_signal(&proc->cond_FH);
AssertFatal((ret=pthread_mutex_unlock(&proc->mutex_FH))==0,"mutex_unlock returns %d\n",ret);
AssertFatal((ret=pthread_mutex_lock(&calibration->mutex_calib))==0,"mutex_lock returns %d\n",ret);
calibration->instance_cnt_calib = 0;
pthread_cond_signal(&calibration->cond_calib);
AssertFatal((ret=pthread_mutex_unlock(&calibration->mutex_calib))==0,"mutex_unlock returns %d\n",ret);
AssertFatal((ret=pthread_mutex_lock(&proc->mutex_FH1))==0,"mutex_lock returns %d\n",ret);
proc->instance_cnt_FH1 = 0;
pthread_cond_signal(&proc->cond_FH1);
......@@ -2853,10 +3150,14 @@ void init_RU(char *rf_config_file, clock_source_t clock_source, clock_source_t t
ru->openair0_cfg.time_source = time_source;
//ru->generate_dmrs_sync = (ru->is_slave == 0) ? 1 : 0;
if ((ru->is_slave == 0) && (ru->ota_sync_enable == 1))
//if ((ru->is_slave == 0) && (ru->ota_sync_enable == 1)) {
ru->generate_dmrs_sync = 1;
else
ru->generate_dmrs_sync = 0;
generate_ul_ref_sigs();
//ru->dmrssync = (int16_t*)malloc16_clear(ru->frame_parms.ofdm_symbol_size*2*sizeof(int16_t));
//}
//else{
// ru->generate_dmrs_sync = 0;
//}
ru->wakeup_L1_sleeptime = 2000;
ru->wakeup_L1_sleep_cnt_max = 3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment