Skip to content

O
OpenXG-RAN
Commit 3f066dec authored by WANG Tsu-Han's avatar WANG Tsu-Han
Browse files
Options

parameter fix

parent ad28a3fe
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 23 deletions
openair1/SCHED_NR/nr_ru_procedures.c
View file @ 3f066dec
...@@ -134,6 +134,7 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) { ...@@ -134,6 +134,7 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) {
start_meas(&ru->ofdm_total_stats); start_meas(&ru->ofdm_total_stats);
if(ru->num_gNB != 0){//L1 RU on same machine if(ru->num_gNB != 0){//L1 RU on same machine
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 1 );
for(j=0; j<2; ++j){//half slot for(j=0; j<2; ++j){//half slot
for(i=0; i<ru->nb_tx; ++i){ for(i=0; i<ru->nb_tx; ++i){
if(j == 0){ if(j == 0){
...@@ -153,7 +154,7 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) { ...@@ -153,7 +154,7 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) {
feptx[i+ru->nb_tx].aa = i; feptx[i+ru->nb_tx].aa = i;
feptx[i+ru->nb_tx].index = i+ru->nb_tx; feptx[i+ru->nb_tx].index = i+ru->nb_tx;
feptx[i+ru->nb_tx].ru = ru; feptx[i+ru->nb_tx].ru = ru;
feptx[i+ru->nb_tx].symbol = fp->symbols_per_tti>>1; feptx[i+ru->nb_tx].symbol = fp->symbols_per_slot>>1;
feptx[i+ru->nb_tx].slot = slot; feptx[i+ru->nb_tx].slot = slot;
feptx[i+ru->nb_tx].nb_antenna_ports = nb_antenna_ports; feptx[i+ru->nb_tx].nb_antenna_ports = nb_antenna_ports;
feptx[i+ru->nb_tx].instance_cnt_feptx = 0; feptx[i+ru->nb_tx].instance_cnt_feptx = 0;
...@@ -239,7 +240,6 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) { ...@@ -239,7 +240,6 @@ void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx) {
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RU_TX_OFDM_MASK, proc->feptx_mask ); VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_RU_TX_OFDM_MASK, proc->feptx_mask );
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 0 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_OFDM , 0 );
//write_output
stop_meas(&ru->ofdm_total_stats); stop_meas(&ru->ofdm_total_stats);
...@@ -274,9 +274,9 @@ static void *nr_feptx_thread(void *param) { ...@@ -274,9 +274,9 @@ static void *nr_feptx_thread(void *param) {
ofdm_mask_full = (1<<(ru->nb_tx*2))-1; ofdm_mask_full = (1<<(ru->nb_tx*2))-1;
if(ru->num_gNB != 0){ if(ru->num_gNB != 0){
half_slot = feptx->half_slot;
txdataF_offset = ((slot%2)*fp->samples_per_slot_wCP); txdataF_offset = ((slot%2)*fp->samples_per_slot_wCP);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 1); ////////////precoding////////////
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+feptx->index+1 , 1);
start_meas(&ru->precoding_stats); start_meas(&ru->precoding_stats);
if (ru->nb_tx == 1) { if (ru->nb_tx == 1) {
AssertFatal(fp->N_ssb==ru->nb_tx,"Attempting to transmit %d SSB while Nb_tx = %d",fp->N_ssb,ru->nb_tx); AssertFatal(fp->N_ssb==ru->nb_tx,"Attempting to transmit %d SSB while Nb_tx = %d",fp->N_ssb,ru->nb_tx);
...@@ -284,14 +284,14 @@ static void *nr_feptx_thread(void *param) { ...@@ -284,14 +284,14 @@ static void *nr_feptx_thread(void *param) {
if ((fp->L_ssb >> p) & 0x01){ if ((fp->L_ssb >> p) & 0x01){
memcpy((void*)&ru->common.txdataF_BF[0][l*fp->ofdm_symbol_size], memcpy((void*)&ru->common.txdataF_BF[0][l*fp->ofdm_symbol_size],
(void*)&ru->gNB_list[0]->common_vars.txdataF[0][txdataF_offset + l*fp->ofdm_symbol_size], (void*)&ru->gNB_list[0]->common_vars.txdataF[0][txdataF_offset + l*fp->ofdm_symbol_size],
(fp->symbols_per_tti>>1)*fp->ofdm_symbol_size*sizeof(int32_t)); (fp->samples_per_slot_wCP>>1)*sizeof(int32_t));
} }
} }
} }
else { else {
bw = ru->beam_weights[0]; bw = ru->beam_weights[0];
txdataF = &ru->gNB_list[0]->common_vars.txdataF[0][txdataF_offset]; txdataF = &ru->gNB_list[0]->common_vars.txdataF[0][txdataF_offset];
for(i=0; i<fp->symbols_per_tti>>1; ++i){ for(i=0; i<fp->symbols_per_slot>>1; ++i){
nr_beam_precoding(&txdataF, nr_beam_precoding(&txdataF,
ru->common.txdataF_BF, ru->common.txdataF_BF,
fp, fp,
...@@ -303,15 +303,16 @@ static void *nr_feptx_thread(void *param) { ...@@ -303,15 +303,16 @@ static void *nr_feptx_thread(void *param) {
} }
} }
stop_meas(&ru->precoding_stats); stop_meas(&ru->precoding_stats);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 0); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+feptx->index+1 , 0);
////////////FEPTX////////////
start_meas(&ru->ofdm_mod_stats); start_meas(&ru->ofdm_mod_stats);
nr_feptx0(ru,slot,start,fp->symbols_per_tti>>1,aa); nr_feptx0(ru,slot,start,fp->symbols_per_slot>>1,aa);
stop_meas(&ru->ofdm_mod_stats); stop_meas(&ru->ofdm_mod_stats);
if (release_thread(&feptx->mutex_feptx,&feptx->instance_cnt_feptx,"NR feptx thread")<0) break;
AssertFatal((ret=pthread_mutex_lock(&ru->proc.mutex_feptx))==0,"mutex_lock return %d\n",ret); AssertFatal((ret=pthread_mutex_lock(&ru->proc.mutex_feptx))==0,"mutex_lock return %d\n",ret);
feptx->instance_cnt_feptx = -1;
ru->proc.feptx_mask |= 1<<(feptx->index); ru->proc.feptx_mask |= 1<<(feptx->index);
if(ru->proc.feptx_mask == ofdm_mask_full) if(ru->proc.feptx_mask == ofdm_mask_full)
AssertFatal(pthread_cond_signal(&ru->proc.cond_feptx) == 0,"ERROR pthread_cond_signal for precoding and ofdm finish\n"); AssertFatal(pthread_cond_signal(&ru->proc.cond_feptx) == 0,"ERROR pthread_cond_signal for precoding and ofdm finish\n");
...@@ -321,7 +322,7 @@ static void *nr_feptx_thread(void *param) { ...@@ -321,7 +322,7 @@ static void *nr_feptx_thread(void *param) {
}// if L1 RU on same machine }// if L1 RU on same machine
else{ else{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 1); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+feptx->index+1 , 1);
start_meas(&ru->precoding_stats); start_meas(&ru->precoding_stats);
if (ru->nb_tx == 1) { if (ru->nb_tx == 1) {
AssertFatal(fp->N_ssb==ru->nb_tx,"Attempting to transmit %d SSB while Nb_tx = %d",fp->N_ssb,ru->nb_tx); AssertFatal(fp->N_ssb==ru->nb_tx,"Attempting to transmit %d SSB while Nb_tx = %d",fp->N_ssb,ru->nb_tx);
...@@ -345,7 +346,7 @@ static void *nr_feptx_thread(void *param) { ...@@ -345,7 +346,7 @@ static void *nr_feptx_thread(void *param) {
nb_antenna_ports); nb_antenna_ports);
} }
stop_meas(&ru->precoding_stats); stop_meas(&ru->precoding_stats);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 0); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC+feptx->index+1 , 0);
start_meas(&ru->ofdm_mod_stats); start_meas(&ru->ofdm_mod_stats);
...@@ -406,7 +407,7 @@ void nr_init_feptx_thread(RU_t *ru) { ...@@ -406,7 +407,7 @@ void nr_init_feptx_thread(RU_t *ru) {
RU_feptx_t *feptx = proc->feptx; RU_feptx_t *feptx = proc->feptx;
int i = 0; int i = 0;
for(i=0; i<16; i++){ for(i=0; i<(ru->nb_tx*2); i++){
feptx[i].instance_cnt_feptx = -1; feptx[i].instance_cnt_feptx = -1;
pthread_mutex_init( &feptx[i].mutex_feptx, NULL); pthread_mutex_init( &feptx[i].mutex_feptx, NULL);
......
targets/RT/USER/gNB_usrp.gtkw
View file @ 3f066dec
[*] [*]
[*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI [*] GTKWave Analyzer v3.3.61 (w)1999-2014 BSI
[*] Fri Sep 6 15:01:30 2019 [*] Tue Dec 17 15:31:51 2019
[*] [*]
[dumpfile] "/tmp/gNB_prec.vcd" [dumpfile] "/tmp/gNB.vcd"
[dumpfile_mtime] "Fri Sep 6 14:59:50 2019" [dumpfile_mtime] "Tue Dec 17 15:25:49 2019"
[dumpfile_size] 13106022 [dumpfile_size] 6343431
[savefile] "/homes/wangts/openairinterface5g/targets/RT/USER/gNB_usrp.gtkw" [savefile] "/home/wangts/openairinterface5g/targets/RT/USER/gNB_usrp.gtkw"
[timestart] 2183320000 [timestart] 1517712000
[size] 1920 1018 [size] 1920 1018
[pos] -1 -1 [pos] -9 -33
*-18.423141 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 *-19.276148 1518358451 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
[sst_width] 386 [sst_width] 386
[signals_width] 344 [signals_width] 344
[sst_expanded] 1 [sst_expanded] 1
...@@ -60,9 +60,11 @@ functions.phy_procedures_ru_feprx0 ...@@ -60,9 +60,11 @@ functions.phy_procedures_ru_feprx0
functions.phy_procedures_ru_feprx1 functions.phy_procedures_ru_feprx1
functions.phy_procedures_ru_feptx_ofdm0 functions.phy_procedures_ru_feptx_ofdm0
functions.phy_procedures_ru_feptx_ofdm1 functions.phy_procedures_ru_feptx_ofdm1
functions.phy_procedures_ru_feptx_ofdm2
functions.phy_procedures_ru_feptx_prec0 functions.phy_procedures_ru_feptx_prec0
functions.phy_procedures_ru_feptx_prec1 functions.phy_procedures_ru_feptx_prec1
@23 functions.phy_procedures_ru_feptx_prec2
@22
variables.ru_tx_ofdm_mask[63:0] variables.ru_tx_ofdm_mask[63:0]
[pattern_trace] 1 [pattern_trace] 1
[pattern_trace] 0 [pattern_trace] 0
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