Commit 5b13d71e authored by laurent's avatar laurent

fix bugs introduced by previous commit

parent fd5a124c
...@@ -1862,10 +1862,11 @@ void nr_pdsch_ptrs_processing(PHY_VARS_NR_UE *ue, ...@@ -1862,10 +1862,11 @@ void nr_pdsch_ptrs_processing(PHY_VARS_NR_UE *ue,
#ifdef DEBUG_DL_PTRS #ifdef DEBUG_DL_PTRS
printf("[PHY][DL][PTRS]: Rotate Symbol %2d with %d + j* %d\n", i, phase_per_symbol[i].r,phase_per_symbol[i].i); printf("[PHY][DL][PTRS]: Rotate Symbol %2d with %d + j* %d\n", i, phase_per_symbol[i].r,phase_per_symbol[i].i);
#endif #endif
rotate_cpx_vector((c16_t*)&rxdataF_comp[aarx][(i * (*nb_rb) * NR_NB_SC_PER_RB)], rotate_cpx_vector((c16_t *)&rxdataF_comp[0][aarx][(i * (*nb_rb) * NR_NB_SC_PER_RB)],
&phase_per_symbol[i], &phase_per_symbol[i],
(c16_t*)&rxdataF_comp[aarx][(i * (*nb_rb) * NR_NB_SC_PER_RB)], (c16_t *)&rxdataF_comp[0][aarx][(i * (*nb_rb) * NR_NB_SC_PER_RB)],
((*nb_rb) * NR_NB_SC_PER_RB), 15); ((*nb_rb) * NR_NB_SC_PER_RB),
15);
}// if not DMRS Symbol }// if not DMRS Symbol
}// symbol loop }// symbol loop
}// last symbol check }// last symbol check
......
...@@ -518,9 +518,8 @@ int nr_csi_rs_ri_estimation(const PHY_VARS_NR_UE *ue, ...@@ -518,9 +518,8 @@ int nr_csi_rs_ri_estimation(const PHY_VARS_NR_UE *ue,
// construct Hh x H elements // construct Hh x H elements
if(ant_rx_conjch == ant_rx_ch) { if(ant_rx_conjch == ant_rx_ch) {
nr_a_sum_b((__m128i *)&csi_rs_estimated_A_MF[port_tx_conjch][port_tx_ch][k_offset], nr_a_sum_b(
(__m128i *)&csi_rs_estimated_conjch_ch[ant_rx_conjch][port_tx_conjch][ant_rx_ch][port_tx_ch][k_offset], (c16_t *)&csi_rs_estimated_A_MF[port_tx_conjch][port_tx_ch][k_offset], (c16_t *)&csi_rs_estimated_conjch_ch[ant_rx_conjch][port_tx_conjch][ant_rx_ch][port_tx_ch][k_offset], 1);
1);
} }
} }
} }
......
...@@ -1876,12 +1876,7 @@ uint8_t nr_matrix_inverse(int32_t size, ...@@ -1876,12 +1876,7 @@ uint8_t nr_matrix_inverse(int32_t size,
if(flag) {//fixed point SIMD calc. if(flag) {//fixed point SIMD calc.
//Allocate the submatrix elements //Allocate the submatrix elements
c16_t sub_matrix_data[size - 1][size - 1][12 * nb_rb];
memset(sub_matrix_data, 0, sizeof(sub_matrix_data));
c16_t *sub_matrix[size - 1][size - 1]; c16_t *sub_matrix[size - 1][size - 1];
for (int rtx = 0; rtx < (size - 1); rtx++)
for (int ctx = 0; ctx < (size - 1); ctx++)
sub_matrix[ctx][rtx] = sub_matrix_data[ctx][rtx];
//Compute Matrix determinant //Compute Matrix determinant
nr_determin(size, nr_determin(size,
...@@ -1913,7 +1908,8 @@ uint8_t nr_matrix_inverse(int32_t size, ...@@ -1913,7 +1908,8 @@ uint8_t nr_matrix_inverse(int32_t size,
//fill out the sub matrix corresponds to this element //fill out the sub matrix corresponds to this element
for (int ridx=0;ridx<(size-1);ridx++) for (int ridx=0;ridx<(size-1);ridx++)
for (int cidx=0;cidx<(size-1);cidx++) for (int cidx=0;cidx<(size-1);cidx++)
memcpy(sub_matrix[cidx][ridx], a44[cc[cidx]][rr[ridx]], sizeof(sub_matrix_data[cidx][ridx])); // To verify
sub_matrix[cidx][ridx]=a44[cc[cidx]][rr[ridx]];
nr_determin(size - 1, // size nr_determin(size - 1, // size
sub_matrix, sub_matrix,
......
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