Commit 799f12f0 authored by Hongzhi's avatar Hongzhi

ue removing logs + using dlsch multi-thread

parent df766f81
...@@ -346,7 +346,8 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -346,7 +346,8 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
&harq_process->F); &harq_process->F);
p_decParams->Z = harq_process->Z; p_decParams->Z = harq_process->Z;
//printf("dlsch decoding nr segmentation Z %d\n", p_decParams->Z); //printf("dlsch decoding nr segmentation Z %d\n", p_decParams->Z);
//printf("Kplus %d C %d nl %d \n", harq_process->Kplus, harq_process->C, harq_process->Nl); if (!frame%100)
printf("Kplus %d C %d Z %d nl %d \n", harq_process->Kplus, harq_process->C, p_decParams->Z, harq_process->Nl);
#endif #endif
} }
...@@ -363,7 +364,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -363,7 +364,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
kc = 52; kc = 52;
} }
p_decParams->numMaxIter = 10; p_decParams->numMaxIter = 2;
Kr = p_decParams->Z*kb; Kr = p_decParams->Z*kb;
p_decParams->outMode= 0; p_decParams->outMode= 0;
...@@ -1506,7 +1507,7 @@ if (harq_process->C>1) { // wakeup worker if more than 1 segment ...@@ -1506,7 +1507,7 @@ if (harq_process->C>1) { // wakeup worker if more than 1 segment
llrProcBuf, llrProcBuf,
p_procTime); p_procTime);
if (no_iteration_ldpc > 10) if (no_iteration_ldpc > 2)
printf("Error number of iteration LPDC %d\n", no_iteration_ldpc); printf("Error number of iteration LPDC %d\n", no_iteration_ldpc);
//else //else
//printf("OK number of iteration LPDC %d\n", no_iteration_ldpc); //printf("OK number of iteration LPDC %d\n", no_iteration_ldpc);
...@@ -2010,7 +2011,7 @@ uint32_t dlsch_decoding_2thread0(void *arg) ...@@ -2010,7 +2011,7 @@ uint32_t dlsch_decoding_2thread0(void *arg)
// p_decParams->Z = 128; // p_decParams->Z = 128;
p_decParams->BG = 1; p_decParams->BG = 1;
p_decParams->R = 13; p_decParams->R = 89;
p_decParams->numMaxIter = 2; p_decParams->numMaxIter = 2;
Kr = p_decParams->Z*22; Kr = p_decParams->Z*22;
p_decParams->outMode= 0; p_decParams->outMode= 0;
...@@ -2692,7 +2693,7 @@ uint32_t dlsch_decoding_2thread1(void *arg) ...@@ -2692,7 +2693,7 @@ uint32_t dlsch_decoding_2thread1(void *arg)
exit_fun("nothing to add"); exit_fun("nothing to add");
} }
printf("2thread1 main available %d\n", proc->decoder_main_available); //printf("2thread1 main available %d\n", proc->decoder_main_available);
uint32_t wait = 0; uint32_t wait = 0;
while(proc->decoder_main_available == 0) while(proc->decoder_main_available == 0)
...@@ -3325,7 +3326,7 @@ uint32_t dlsch_decoding_2thread1(void *arg) ...@@ -3325,7 +3326,7 @@ uint32_t dlsch_decoding_2thread1(void *arg)
proc->decoder_thread_available1 = 1; proc->decoder_thread_available1 = 1;
//proc->decoder_main_available = 0; //proc->decoder_main_available = 0;
printf("2thread1 proc->instance_cnt_dlsch_td1 %d\n", proc->instance_cnt_dlsch_td1); //printf("2thread1 proc->instance_cnt_dlsch_td1 %d\n", proc->instance_cnt_dlsch_td1);
if (pthread_mutex_lock(&proc->mutex_dlsch_td1) != 0) { if (pthread_mutex_lock(&proc->mutex_dlsch_td1) != 0) {
LOG_E( PHY, "[SCHED][UE] error locking mutex for UE RXTX\n" ); LOG_E( PHY, "[SCHED][UE] error locking mutex for UE RXTX\n" );
...@@ -3336,10 +3337,10 @@ uint32_t dlsch_decoding_2thread1(void *arg) ...@@ -3336,10 +3337,10 @@ uint32_t dlsch_decoding_2thread1(void *arg)
LOG_E( PHY, "[SCHED][UE] error unlocking mutex for UE td1\n" ); LOG_E( PHY, "[SCHED][UE] error unlocking mutex for UE td1\n" );
exit_fun("noting to add"); exit_fun("noting to add");
} }
printf("end 2thread1 proc->instance_cnt_dlsch_td1 %d\n", proc->instance_cnt_dlsch_td1); //printf("end 2thread1 proc->instance_cnt_dlsch_td1 %d\n", proc->instance_cnt_dlsch_td1);
} }
printf("after 2thread1 after oai exit proc->instance_cnt_dlsch_td %d\n", proc->instance_cnt_dlsch_td1); //printf("after 2thread1 after oai exit proc->instance_cnt_dlsch_td %d\n", proc->instance_cnt_dlsch_td1);
// thread finished // thread finished
free(arg); free(arg);
return &UE_dlsch_td_retval1; return &UE_dlsch_td_retval1;
......
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
#define openair_free(y,x) free((y)) #define openair_free(y,x) free((y))
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
#define RX_NB_TH_MAX 2 #define RX_NB_TH_MAX 3
#define RX_NB_TH 2 #define RX_NB_TH 3
//#ifdef SHRLIBDEV //#ifdef SHRLIBDEV
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include "types.h" #include "types.h"
//#include "defs.h" //#include "defs.h"
#define RX_NB_TH_MAX 2 #define RX_NB_TH_MAX 3
#define RX_NB_TH 2 #define RX_NB_TH 3
#define LTE_SLOTS_PER_SUBFRAME 2 #define LTE_SLOTS_PER_SUBFRAME 2
......
...@@ -44,7 +44,7 @@ enum THREAD_INDEX { OPENAIR_THREAD_INDEX = 0, ...@@ -44,7 +44,7 @@ enum THREAD_INDEX { OPENAIR_THREAD_INDEX = 0,
#define OPENAIR_THREAD_STACK_SIZE PTHREAD_STACK_MIN //4096 //RTL_PTHREAD_STACK_MIN*6 #define OPENAIR_THREAD_STACK_SIZE PTHREAD_STACK_MIN //4096 //RTL_PTHREAD_STACK_MIN*6
//#define DLC_THREAD_STACK_SIZE 4096 //DLC stack size //#define DLC_THREAD_STACK_SIZE 4096 //DLC stack size
//#define UE_SLOT_PARALLELISATION //#define UE_SLOT_PARALLELISATION
//#define UE_DLSCH_PARALLELISATION #define UE_DLSCH_PARALLELISATION
enum openair_SCHED_STATUS { enum openair_SCHED_STATUS {
openair_SCHED_STOPPED=1, openair_SCHED_STOPPED=1,
......
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