pregenerate dci locations

srslte/include/srslte/ue/ue_dl.h

@@ -60,6 +60,18 @@
 
 #include "srslte/config.h"
 
+
+#define MAX_CANDIDATES_UE  16 // From 36.213 Table 9.1.1-1
+#define MAX_CANDIDATES_COM 6 // From 36.213 Table 9.1.1-1
+#define MAX_CANDIDATES (MAX_CANDIDATES_UE + MAX_CANDIDATES_COM)   
+
+
+typedef struct {
+  srslte_dci_format_t format; 
+  srslte_dci_location_t loc[MAX_CANDIDATES];
+  uint32_t nof_locations; 
+} dci_blind_search_t; 
+
 typedef struct SRSLTE_API {
   srslte_pcfich_t pcfich;
   srslte_pdcch_t pdcch;
@@ -85,7 +97,10 @@ typedef struct SRSLTE_API {
   uint64_t nof_detected; 
 
   uint16_t current_rnti;
+  dci_blind_search_t current_ss_ue[3][10];
+  dci_blind_search_t current_ss_common[3];
   srslte_dci_location_t last_location;
+  srslte_dci_location_t last_location_ul;
   
   srslte_dci_msg_t pending_ul_dci_msg; 
   uint16_t pending_ul_dci_rnti; 

srslte/lib/enb/enb_dl.c

@@ -37,7 +37,7 @@
 #define CURRENT_SLOTLEN_RE SRSLTE_SLOT_LEN_RE(q->cell.nof_prb, q->cell.cp)
 #define CURRENT_SFLEN_RE SRSLTE_SF_LEN_RE(q->cell.nof_prb, q->cell.cp)
 
-#define SRSLTE_ENB_RF_AMP 0.8
+#define SRSLTE_ENB_RF_AMP 0.5
 
 int srslte_enb_dl_init(srslte_enb_dl_t *q, srslte_cell_t cell, uint32_t nof_rnti)
 {

srslte/lib/enb/enb_ul.c

@@ -73,7 +73,7 @@ int srslte_enb_ul_init(srslte_enb_ul_t *q, srslte_cell_t cell,
       fprintf(stderr, "Error initiating FFT\n");
       goto clean_exit;
     }
-    srslte_ofdm_set_normalize(&q->fft, true);
+    srslte_ofdm_set_normalize(&q->fft, false);
     srslte_ofdm_set_freq_shift(&q->fft, -0.5);
 
     if (srslte_pucch_init(&q->pucch, q->cell)) {

srslte/lib/phch/test/pdcch_file_test.c

@@ -34,8 +34,6 @@
 
 char *input_file_name = NULL;
 
-#define MAX_CANDIDATES 16
-
 srslte_cell_t cell = {
   6,            // cell.cell.cell.nof_prb
   1,            // cell.cell.nof_ports

srslte/lib/phch/test/pdcch_test_mex.c

@@ -36,7 +36,6 @@
 #define INPUT   prhs[2]
 #define NOF_INPUTS 3
 
-#define MAX_CANDIDATES 16
 
 
 srslte_dci_format_t ue_formats[] = {SRSLTE_DCI_FORMAT1A,SRSLTE_DCI_FORMAT1}; // SRSLTE_DCI_FORMAT1B should go here also

srslte/lib/phch/test/pdsch_pdcch_file_test.c

@@ -32,8 +32,6 @@
 
 #include "srslte/srslte.h"
 
-#define MAX_CANDIDATES 16
-
 char *input_file_name = NULL;
 
 srslte_cell_t cell = {

srslte/lib/ue/ue_dl.c

@@ -37,7 +37,6 @@
 #define CURRENT_SLOTLEN_RE SRSLTE_SLOT_LEN_RE(q->cell.nof_prb, q->cell.cp)
 #define CURRENT_SFLEN_RE SRSLTE_SF_LEN_RE(q->cell.nof_prb, q->cell.cp)
 
-#define MAX_LOCATIONS  64
 
 static srslte_dci_format_t ue_formats[] = {SRSLTE_DCI_FORMAT1A, SRSLTE_DCI_FORMAT1}; // Only TM1 and TM2 are currently supported 
 const uint32_t nof_ue_formats = 2; 
@@ -159,6 +158,15 @@ void srslte_ue_dl_free(srslte_ue_dl_t *q) {
  */
 void srslte_ue_dl_set_rnti(srslte_ue_dl_t *q, uint16_t rnti) {
   srslte_pdsch_set_rnti(&q->pdsch, rnti);
+  
+  // Compute UE-specific and Common search space for this RNTI
+  for (int cfi=0;cfi<3;cfi++) {
+    for (int sf_idx=0;sf_idx<10;sf_idx++) {
+      q->current_ss_ue[cfi][sf_idx].nof_locations = srslte_pdcch_ue_locations(&q->pdcch, q->current_ss_ue[cfi][sf_idx].loc, MAX_CANDIDATES_UE, sf_idx, cfi, rnti);              
+    }
+    q->current_ss_common[cfi].nof_locations = srslte_pdcch_common_locations(&q->pdcch, q->current_ss_common[cfi].loc, MAX_CANDIDATES_COM, cfi);
+  }  
+  
   q->current_rnti = rnti; 
 }
 
@@ -325,15 +333,6 @@ uint32_t srslte_ue_dl_get_ncce(srslte_ue_dl_t *q) {
   return q->last_location.ncce; 
 }
 
-#define MAX_CANDIDATES_UE  16 // From 36.213 Table 9.1.1-1
-#define MAX_CANDIDATES_COM 6 // From 36.213 Table 9.1.1-1
-#define MAX_CANDIDATES (MAX_CANDIDATES_UE + MAX_CANDIDATES_COM)   
-typedef struct {
-  srslte_dci_format_t format; 
-  srslte_dci_location_t loc[MAX_CANDIDATES];
-  uint32_t nof_locations; 
-} dci_blind_search_t; 
-
 static int dci_blind_search(srslte_ue_dl_t *q, dci_blind_search_t *search_space, uint16_t rnti, srslte_dci_msg_t *dci_msg) 
 {
   int ret = SRSLTE_ERROR; 
@@ -354,10 +353,15 @@ static int dci_blind_search(srslte_ue_dl_t *q, dci_blind_search_t *search_space,
         {
           q->pending_ul_dci_rnti = crc_rem; 
           memcpy(&q->pending_ul_dci_msg, dci_msg, sizeof(srslte_dci_msg_t));          
+          memcpy(&q->last_location_ul, &search_space->loc[i], sizeof(srslte_dci_location_t));          
         // Else if we found it, save location and leave
         } else if (dci_msg->format == search_space->format) {
           ret = 1; 
-          memcpy(&q->last_location, &search_space->loc[i], sizeof(srslte_dci_location_t));          
+          if (search_space->format == SRSLTE_DCI_FORMAT0) {
+            memcpy(&q->last_location_ul, &search_space->loc[i], sizeof(srslte_dci_location_t));          
+          } else {
+            memcpy(&q->last_location, &search_space->loc[i], sizeof(srslte_dci_location_t));          
+          }
         } 
       }
       i++; 
@@ -380,10 +384,16 @@ int srslte_ue_dl_find_ul_dci(srslte_ue_dl_t *q, uint32_t cfi, uint32_t sf_idx, u
     
     // Configure and run DCI blind search 
     dci_blind_search_t search_space; 
-    search_space.format = SRSLTE_DCI_FORMAT0; 
+    dci_blind_search_t *current_ss = &search_space;
-    search_space.nof_locations = srslte_pdcch_ue_locations(&q->pdcch, search_space.loc, MAX_CANDIDATES_UE, sf_idx, cfi, rnti);        
+     if (q->current_rnti == rnti) {
+      current_ss = &q->current_ss_ue[cfi-1][sf_idx];
+    } else {
+      // If locations are not pre-generated, generate them now
+      current_ss->nof_locations = srslte_pdcch_ue_locations(&q->pdcch, current_ss->loc, MAX_CANDIDATES_UE, sf_idx, cfi, rnti);        
+    }    
+    current_ss->format = SRSLTE_DCI_FORMAT0; 
     INFO("Searching UL C-RNTI in %d ue locations\n", search_space.nof_locations);
-    return dci_blind_search(q, &search_space, rnti, dci_msg);
+    return dci_blind_search(q, current_ss, rnti, dci_msg);
   } else {
     return 0; 
   }
@@ -428,25 +438,36 @@ static int find_dl_dci_type_siprarnti(srslte_ue_dl_t *q, uint32_t cfi, uint16_t
 static int find_dl_dci_type_crnti(srslte_ue_dl_t *q, uint32_t cfi, uint32_t sf_idx, uint16_t rnti, srslte_dci_msg_t *dci_msg)
 {
   int ret = SRSLTE_SUCCESS; 
+  dci_blind_search_t search_space; 
+  dci_blind_search_t *current_ss = &search_space;
   
   // Search UE-specific search space 
-  dci_blind_search_t search_space; 
+  if (q->current_rnti == rnti) {
-  search_space.nof_locations = srslte_pdcch_ue_locations(&q->pdcch, search_space.loc, MAX_CANDIDATES_UE, sf_idx, cfi, rnti);    
+    current_ss = &q->current_ss_ue[cfi-1][sf_idx];
-  INFO("Searching DL C-RNTI in %d ue locations, %d formats\n", search_space.nof_locations, nof_ue_formats);
+  } else {
+    // If locations are not pre-generated, generate them now
+    current_ss->nof_locations = srslte_pdcch_ue_locations(&q->pdcch, current_ss->loc, MAX_CANDIDATES_UE, sf_idx, cfi, rnti);        
+  }
+  INFO("Searching DL C-RNTI in %d ue locations, %d formats\n", current_ss->nof_locations, nof_ue_formats);
   for (int f=0;f<nof_ue_formats;f++) {
-    search_space.format = ue_formats[f];   
+    current_ss->format = ue_formats[f];   
-    if ((ret = dci_blind_search(q, &search_space, rnti, dci_msg))) {
+    if ((ret = dci_blind_search(q, current_ss, rnti, dci_msg))) {
       return ret; 
     }
   }
   
   // Search Format 1A in the Common SS also
-  search_space.format = SRSLTE_DCI_FORMAT1A; 
+  if (q->current_rnti == rnti) {
-  search_space.nof_locations = srslte_pdcch_common_locations(&q->pdcch, search_space.loc, MAX_CANDIDATES_COM, cfi);
+    current_ss = &q->current_ss_common[cfi-1];
+  } else {
+    // If locations are not pre-generated, generate them now
+    current_ss->nof_locations = srslte_pdcch_common_locations(&q->pdcch, current_ss->loc, MAX_CANDIDATES_COM, cfi);
+  }
   // Search for RNTI only if there is room for the common search space 
-  if (search_space.nof_locations > 0) {    
+  if (current_ss->nof_locations > 0) {    
-    INFO("Searching DL C-RNTI in %d ue locations, format 1A\n", search_space.nof_locations, nof_ue_formats);
+    current_ss->format = SRSLTE_DCI_FORMAT1A; 
-    return dci_blind_search(q, &search_space, rnti, dci_msg);   
+    INFO("Searching DL C-RNTI in %d ue locations, format 1A\n", current_ss->nof_locations, nof_ue_formats);
+    return dci_blind_search(q, current_ss, rnti, dci_msg);   
   }
   return SRSLTE_SUCCESS; 
 }