5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved PDSCH reception

Browse Source
master
ismagom 9 years ago
parent e9387b05f2
commit 88cd40420a
28 changed files with 277 additions and 132 deletions
Show Stats Download Patch File Download Diff File

4
matlab/tests/dlsch_test.m
Unescape Escape View File

@ -4,8 +4,8 @@ pdschConfig=struct('Modulation','64QAM','RV',0,'TxScheme','Port0');
addpath('../../build/srslte/lib/phch/test') addpath('../../build/srslte/lib/phch/test')
TBs=19848; TBs=36696;
e_bits=38460; e_bits=41400;
error=zeros(size(TBs)); error=zeros(size(TBs));
for i=1:length(TBs) for i=1:length(TBs)
trblkin=randi(2,TBs(i),1)-1; trblkin=randi(2,TBs(i),1)-1;

15
matlab/tests/pdsch_bler.m
Unescape Escape View File

@ -6,11 +6,11 @@
recordedSignal=[]; recordedSignal=[];
Npackets = 8; Npackets = 3;
SNR_values = linspace(10.5,13,4); SNR_values = linspace(12,16,4);
%% Choose RMC %% Choose RMC
[waveform,rgrid,rmccFgOut] = lteRMCDLTool('R.6',[1;0;0;1]); [waveform,rgrid,rmccFgOut] = lteRMCDLTool('R.9',[1;0;0;1]);
waveform = sum(waveform,2); waveform = sum(waveform,2);
if ~isempty(recordedSignal) if ~isempty(recordedSignal)
@ -79,6 +79,7 @@ for snr_idx=1:length(SNR_values)
frame_rx = lteOFDMDemodulate(rmccFgOut, rxWaveform); frame_rx = lteOFDMDemodulate(rmccFgOut, rxWaveform);
for sf_idx=0:Nsf for sf_idx=0:Nsf
%sf_idx=9;
subframe_rx=frame_rx(:,sf_idx*14+1:(sf_idx+1)*14); subframe_rx=frame_rx(:,sf_idx*14+1:(sf_idx+1)*14);
rmccFgOut.NSubframe=sf_idx; rmccFgOut.NSubframe=sf_idx;
rmccFgOut.TotSubframes=1; rmccFgOut.TotSubframes=1;
@ -95,11 +96,14 @@ for snr_idx=1:length(SNR_values)
%% Same with srsLTE %% Same with srsLTE
if (rmccFgOut.PDSCH.TrBlkSizes(sf_idx+1) > 0) if (rmccFgOut.PDSCH.TrBlkSizes(sf_idx+1) > 0)
[dec2, data, pdschRx, pdschSymbols2, deb] = srslte_pdsch(rmccFgOut, rmccFgOut.PDSCH, ... [dec2, data, pdschRx, pdschSymbols2, cws2, cb9, temp] = srslte_pdsch(rmccFgOut, rmccFgOut.PDSCH, ...
rmccFgOut.PDSCH.TrBlkSizes(sf_idx+1), ... rmccFgOut.PDSCH.TrBlkSizes(sf_idx+1), ...
subframe_rx); subframe_rx);
else else
dec2 = 1; dec2 = 1;
end
if (~dec2)
fprintf('Error in sf=%d\n',sf_idx);
end end
decoded_srslte(snr_idx) = decoded_srslte(snr_idx)+dec2; decoded_srslte(snr_idx) = decoded_srslte(snr_idx)+dec2;
end end
@ -120,7 +124,6 @@ if (length(SNR_values)>1)
ylabel('BLER') ylabel('BLER')
axis([min(SNR_values) max(SNR_values) 1/Npackets/(Nsf+1) 1]) axis([min(SNR_values) max(SNR_values) 1/Npackets/(Nsf+1) 1])
else else
disp(decoded) fprintf('Matlab: %d OK\nsrsLTE: %d OK\n',decoded, decoded_srslte);
disp(decoded_srslte)
end end

4
matlab/tests/prach_test.m
Unescape Escape View File

@ -1,10 +1,10 @@
clear clear
ueConfig=struct('NULRB',6,'DuplexMode','FDD','CyclicPrefix','Normal'); ueConfig=struct('NULRB',6,'DuplexMode','FDD','CyclicPrefix','Normal');
prachConfig=struct('Format',0,'SeqIdx',0,'PreambleIdx',0,'CyclicShiftIdx',0,'HighSpeed',0,'TimingOffset',0,'FreqIdx',0,'FreqOffset',0); prachConfig=struct('Format',0,'SeqIdx',0,'PreambleIdx',0,'CyclicShiftIdx',0,'HighSpeed',0,'TimingOffset',0,'FreqIdx',0,'FreqOffset',8);
addpath('../../build/srslte/lib/phch/test') addpath('../../build/srslte/lib/phch/test')
NULRB=[6 15 25 50 100]; NULRB=[100];
% FreqIdx, FreqOffset and TimeOffset need to be tested % FreqIdx, FreqOffset and TimeOffset need to be tested

5
mex/include/srslte/mex/mexutils.h
Unescape Escape View File

@ -63,6 +63,11 @@ SRSLTE_API int mexutils_write_f(float *buffer,
uint32_t nr, uint32_t nr,
uint32_t nc); uint32_t nc);
SRSLTE_API int mexutils_write_s(short *buffer,
mxArray **ptr,
uint32_t nr,
uint32_t nc);
SRSLTE_API int mexutils_write_cf(cf_t *buffer, SRSLTE_API int mexutils_write_cf(cf_t *buffer,
mxArray **ptr, mxArray **ptr,
uint32_t nr, uint32_t nr,

12
mex/lib/mexutils.c
Unescape Escape View File

@ -166,6 +166,18 @@ int mexutils_write_f(float *buffer, mxArray **ptr, uint32_t nr, uint32_t nc) {
} }
} }
int mexutils_write_s(short *buffer, mxArray **ptr, uint32_t nr, uint32_t nc) {
*ptr = mxCreateDoubleMatrix(nr, nc, mxREAL);
if (*ptr) {
double *outr = mxGetPr(*ptr);
for (int i=0;i<nr*nc;i++) {
outr[i] = (double) buffer[i];
}
return nc*nr;
} else {
return -1;
}
}
int mexutils_write_uint8(uint8_t *buffer, mxArray **ptr, uint32_t nr, uint32_t nc) { int mexutils_write_uint8(uint8_t *buffer, mxArray **ptr, uint32_t nr, uint32_t nc) {
*ptr = mxCreateNumericMatrix(nr, nc, mxUINT8_CLASS, mxREAL); *ptr = mxCreateNumericMatrix(nr, nc, mxUINT8_CLASS, mxREAL);

14
srslte/examples/pdsch_ue.c
Unescape Escape View File

@ -79,7 +79,8 @@ typedef struct {
uint32_t time_offset; uint32_t time_offset;
int force_N_id_2; int force_N_id_2;
uint16_t rnti; uint16_t rnti;
char *input_file_name; char *input_file_name;
int file_offset;
uint32_t file_nof_prb; uint32_t file_nof_prb;
uint32_t file_nof_ports; uint32_t file_nof_ports;
uint32_t file_cell_id; uint32_t file_cell_id;
@ -105,6 +106,7 @@ void args_default(prog_args_t *args) {
args->file_nof_prb = 25; args->file_nof_prb = 25;
args->file_nof_ports = 1; args->file_nof_ports = 1;
args->file_cell_id = 0; args->file_cell_id = 0;
args->file_offset = 0;
args->uhd_args = ""; args->uhd_args = "";
args->uhd_freq = -1.0; args->uhd_freq = -1.0;
args->uhd_freq_offset = 0.0; args->uhd_freq_offset = 0.0;
@ -116,7 +118,7 @@ void args_default(prog_args_t *args) {
} }
void usage(prog_args_t *args, char *prog) { void usage(prog_args_t *args, char *prog) {
printf("Usage: %s [agpPcildDnruv] -f rx_frequency (in Hz) | -i input_file\n", prog); printf("Usage: %s [agpPOcildDnruv] -f rx_frequency (in Hz) | -i input_file\n", prog);
#ifndef DISABLE_UHD #ifndef DISABLE_UHD
printf("\t-a UHD args [Default %s]\n", args->uhd_args); printf("\t-a UHD args [Default %s]\n", args->uhd_args);
printf("\t-g UHD fix RX gain [Default AGC]\n"); printf("\t-g UHD fix RX gain [Default AGC]\n");
@ -125,6 +127,7 @@ void usage(prog_args_t *args, char *prog) {
printf("\t UHD is disabled. CUHD library not available\n"); printf("\t UHD is disabled. CUHD library not available\n");
#endif #endif
printf("\t-i input_file [Default USRP]\n"); printf("\t-i input_file [Default USRP]\n");
printf("\t-O offset samples for input file [Default %d]\n", args->file_offset);
printf("\t-p nof_prb for input file [Default %d]\n", args->file_nof_prb); printf("\t-p nof_prb for input file [Default %d]\n", args->file_nof_prb);
printf("\t-P nof_ports for input file [Default %d]\n", args->file_nof_ports); printf("\t-P nof_ports for input file [Default %d]\n", args->file_nof_ports);
printf("\t-c cell_id for input file [Default %d]\n", args->file_cell_id); printf("\t-c cell_id for input file [Default %d]\n", args->file_cell_id);
@ -149,7 +152,7 @@ void usage(prog_args_t *args, char *prog) {
void parse_args(prog_args_t *args, int argc, char **argv) { void parse_args(prog_args_t *args, int argc, char **argv) {
int opt; int opt;
args_default(args); args_default(args);
while ((opt = getopt(argc, argv, "aoglipPcCtdDnvrfuUsS")) != -1) { while ((opt = getopt(argc, argv, "aoglipPcOCtdDnvrfuUsS")) != -1) {
switch (opt) { switch (opt) {
case 'i': case 'i':
args->input_file_name = argv[optind]; args->input_file_name = argv[optind];
@ -160,6 +163,9 @@ void parse_args(prog_args_t *args, int argc, char **argv) {
case 'P': case 'P':
args->file_nof_ports = atoi(argv[optind]); args->file_nof_ports = atoi(argv[optind]);
break; break;
case 'O':
args->file_offset = atoi(argv[optind]);
break;
case 'c': case 'c':
args->file_cell_id = atoi(argv[optind]); args->file_cell_id = atoi(argv[optind]);
break; break;
@ -368,7 +374,7 @@ int main(int argc, char **argv) {
cell.nof_ports = prog_args.file_nof_ports; cell.nof_ports = prog_args.file_nof_ports;
cell.nof_prb = prog_args.file_nof_prb; cell.nof_prb = prog_args.file_nof_prb;
if (srslte_ue_sync_init_file(&ue_sync, prog_args.file_nof_prb, prog_args.input_file_name)) { if (srslte_ue_sync_init_file(&ue_sync, prog_args.file_nof_prb, prog_args.input_file_name, prog_args.file_offset)) {
fprintf(stderr, "Error initiating ue_sync\n"); fprintf(stderr, "Error initiating ue_sync\n");
exit(-1); exit(-1);
} }

6
srslte/include/srslte/fec/rm_turbo.h
Unescape Escape View File

@ -83,6 +83,12 @@ SRSLTE_API int srslte_rm_turbo_rx_lut(int16_t *input,
uint32_t cb_idx, uint32_t cb_idx,
uint32_t rv_idx); uint32_t rv_idx);
SRSLTE_API int srslte_rm_turbo_rx_lut_simd(int16_t *input,
int16_t *output,
uint32_t in_len,
uint32_t cb_idx,
uint32_t rv_idx);
/* High-level API */ /* High-level API */
typedef struct SRSLTE_API { typedef struct SRSLTE_API {

5
srslte/include/srslte/phch/sch.h
Unescape Escape View File

@ -47,9 +47,6 @@
#include "srslte/phch/pusch_cfg.h" #include "srslte/phch/pusch_cfg.h"
#include "srslte/phch/uci.h" #include "srslte/phch/uci.h"
#define SRSLTE_PDSCH_MAX_TDEC_ITERS 4
#ifndef SRSLTE_RX_NULL #ifndef SRSLTE_RX_NULL
#define SRSLTE_RX_NULL 10000 #define SRSLTE_RX_NULL 10000
#endif #endif
@ -80,6 +77,8 @@ typedef struct SRSLTE_API {
srslte_uci_cqi_pusch_t uci_cqi; srslte_uci_cqi_pusch_t uci_cqi;
uint8_t temp_data[6000];
} srslte_sch_t; } srslte_sch_t;
SRSLTE_API int srslte_sch_init(srslte_sch_t *q); SRSLTE_API int srslte_sch_init(srslte_sch_t *q);

3
srslte/include/srslte/ue/ue_sync.h
Unescape Escape View File

@ -123,7 +123,8 @@ SRSLTE_API int srslte_ue_sync_init(srslte_ue_sync_t *q,
SRSLTE_API int srslte_ue_sync_init_file(srslte_ue_sync_t *q, SRSLTE_API int srslte_ue_sync_init_file(srslte_ue_sync_t *q,
uint32_t nof_prb, uint32_t nof_prb,
char *file_name); char *file_name,
int offset);
SRSLTE_API void srslte_ue_sync_free(srslte_ue_sync_t *q); SRSLTE_API void srslte_ue_sync_free(srslte_ue_sync_t *q);

4
srslte/include/srslte/utils/bit.h
Unescape Escape View File

@ -43,7 +43,7 @@
SRSLTE_API void srslte_bit_interleave(uint8_t *input, SRSLTE_API void srslte_bit_interleave(uint8_t *input,
uint8_t *output, uint8_t *output,
uint32_t *interleaver, uint16_t *interleaver,
uint32_t nof_bits); uint32_t nof_bits);
SRSLTE_API void srslte_bit_copy(uint8_t *dst, SRSLTE_API void srslte_bit_copy(uint8_t *dst,
@ -54,7 +54,7 @@ SRSLTE_API void srslte_bit_copy(uint8_t *dst,
SRSLTE_API void srslte_bit_interleave_w_offset(uint8_t *input, SRSLTE_API void srslte_bit_interleave_w_offset(uint8_t *input,
uint8_t *output, uint8_t *output,
uint32_t *interleaver, uint16_t *interleaver,
uint32_t nof_bits, uint32_t nof_bits,
uint32_t w_offset); uint32_t w_offset);

4
srslte/lib/common/src/phy_common.c
Unescape Escape View File

@ -35,9 +35,7 @@
#include "srslte/common/phy_common.h" #include "srslte/common/phy_common.h"
#include "srslte/common/sequence.h" #include "srslte/common/sequence.h"
#define USE_REDUCED_SAMPLING_RATES
//#define USE_REDUCED_SAMPLING_RATES
/* Returns true if the structure pointed by cell has valid parameters /* Returns true if the structure pointed by cell has valid parameters

119
srslte/lib/fec/src/rm_turbo.c
Unescape Escape View File

@ -37,6 +37,12 @@
#include "srslte/utils/vector.h" #include "srslte/utils/vector.h"
#include "srslte/fec/cbsegm.h" #include "srslte/fec/cbsegm.h"
//#define HAVE_SIMD
#ifdef HAVE_SIMD
#include <xmmintrin.h>
#include <tmmintrin.h>
#endif
#define NCOLS 32 #define NCOLS 32
#define NROWS_MAX NCOLS #define NROWS_MAX NCOLS
@ -44,15 +50,18 @@
static uint8_t RM_PERM_TC[NCOLS] = { 0, 16, 8, 24, 4, 20, 12, 28, 2, 18, 10, 26, static uint8_t RM_PERM_TC[NCOLS] = { 0, 16, 8, 24, 4, 20, 12, 28, 2, 18, 10, 26,
6, 22, 14, 30, 1, 17, 9, 25, 5, 21, 13, 29, 3, 19, 11, 27, 7, 23, 15, 31 }; 6, 22, 14, 30, 1, 17, 9, 25, 5, 21, 13, 29, 3, 19, 11, 27, 7, 23, 15, 31 };
static uint32_t interleaver_systematic_bits[SRSLTE_NOF_TC_CB_SIZES][6148]; // 4 tail bits /* Align tables to 16-byte boundary */
static uint32_t interleaver_parity_bits[SRSLTE_NOF_TC_CB_SIZES][2*6148];
static uint32_t deinterleaver[SRSLTE_NOF_TC_CB_SIZES][4][3*6148]; static uint16_t interleaver_systematic_bits[192][6160]; // 4 tail bits
static uint32_t k0_vec[SRSLTE_NOF_TC_CB_SIZES][4][2]; static uint16_t interleaver_parity_bits[192][2*6160];
static uint16_t deinterleaver[192][4][18448];
static int k0_vec[SRSLTE_NOF_TC_CB_SIZES][4][2];
static bool rm_turbo_tables_generated = false; static bool rm_turbo_tables_generated = false;
static uint32_t temp_table1[3*6176], temp_table2[3*6176];
void srslte_rm_turbo_gentable_systematic(uint32_t *table_bits, uint32_t k0_vec[4][2], uint32_t nrows, int ndummy) { static uint16_t temp_table1[3*6176], temp_table2[3*6176];
void srslte_rm_turbo_gentable_systematic(uint16_t *table_bits, int k0_vec[4][2], uint32_t nrows, int ndummy) {
bool last_is_null=true; bool last_is_null=true;
int k_b=0, buff_idx=0; int k_b=0, buff_idx=0;
@ -77,7 +86,7 @@ void srslte_rm_turbo_gentable_systematic(uint32_t *table_bits, uint32_t k0_vec[4
} }
} }
void srslte_rm_turbo_gentable_parity(uint32_t *table_parity, uint32_t k0_vec[4][2], int offset, uint32_t nrows, int ndummy) { void srslte_rm_turbo_gentable_parity(uint16_t *table_parity, int k0_vec[4][2], int offset, uint16_t nrows, int ndummy) {
bool last_is_null=true; bool last_is_null=true;
int k_b=0, buff_idx0=0; int k_b=0, buff_idx0=0;
@ -123,7 +132,7 @@ void srslte_rm_turbo_gentable_parity(uint32_t *table_parity, uint32_t k0_vec[4][
void srslte_rm_turbo_gentable_receive(uint32_t *table, uint32_t cb_len, uint32_t rv_idx) void srslte_rm_turbo_gentable_receive(uint16_t *table, uint32_t cb_len, uint32_t rv_idx)
{ {
int nrows = (uint32_t) (cb_len / 3 - 1) / NCOLS + 1; int nrows = (uint32_t) (cb_len / 3 - 1) / NCOLS + 1;
@ -134,7 +143,7 @@ void srslte_rm_turbo_gentable_receive(uint32_t *table, uint32_t cb_len, uint32_t
/* Undo bit collection. Account for dummy bits */ /* Undo bit collection. Account for dummy bits */
int N_cb = 3*nrows*NCOLS; int N_cb = 3*nrows*NCOLS;
int k0 = nrows*(2*(uint32_t) ceilf((float) N_cb/(float) (8*nrows))*rv_idx+2); int k0 = nrows*(2*(uint16_t) ceilf((float) N_cb/(float) (8*nrows))*rv_idx+2);
int kidx; int kidx;
int K_p = nrows * NCOLS; int K_p = nrows * NCOLS;
@ -214,7 +223,7 @@ void srslte_rm_turbo_gentables() {
} }
for (int i=0;i<4;i++) { for (int i=0;i<4;i++) {
k0_vec[cb_idx][i][0] = nrows * (2 * (uint32_t) ceilf((float) (3*K_p) / (float) (8 * nrows)) * i + 2); k0_vec[cb_idx][i][0] = nrows * (2 * (uint16_t) ceilf((float) (3*K_p) / (float) (8 * nrows)) * i + 2);
k0_vec[cb_idx][i][1] = -1; k0_vec[cb_idx][i][1] = -1;
} }
srslte_rm_turbo_gentable_systematic(interleaver_systematic_bits[cb_idx], k0_vec[cb_idx], nrows, ndummy); srslte_rm_turbo_gentable_systematic(interleaver_systematic_bits[cb_idx], k0_vec[cb_idx], nrows, ndummy);
@ -241,10 +250,11 @@ int srslte_rm_turbo_tx_lut(uint8_t *w_buff, uint8_t *systematic, uint8_t *parity
/* Sub-block interleaver (5.1.4.1.1) and bit collection */ /* Sub-block interleaver (5.1.4.1.1) and bit collection */
if (rv_idx == 0) { if (rv_idx == 0) {
// Systematic bits // Systematic bits
srslte_bit_interleave(systematic, w_buff, interleaver_systematic_bits[cb_idx], in_len/3); srslte_bit_interleave(systematic, w_buff, interleaver_systematic_bits[cb_idx], in_len/3);
// Parity bits // Parity bits
srslte_bit_interleave_w_offset(parity, &w_buff[in_len/24], interleaver_parity_bits[cb_idx], 2*in_len/3, 4); srslte_bit_interleave_w_offset(parity, &w_buff[in_len/24], interleaver_parity_bits[cb_idx], 2*in_len/3, 4);
} }
@ -252,7 +262,6 @@ int srslte_rm_turbo_tx_lut(uint8_t *w_buff, uint8_t *systematic, uint8_t *parity
/* Bit selection and transmission 5.1.4.1.2 */ /* Bit selection and transmission 5.1.4.1.2 */
int w_len = 0; int w_len = 0;
int r_ptr = k0_vec[cb_idx][rv_idx][1]; int r_ptr = k0_vec[cb_idx][rv_idx][1];
while (w_len < out_len) { while (w_len < out_len) {
int cp_len = out_len - w_len; int cp_len = out_len - w_len;
if (cp_len + r_ptr >= in_len) { if (cp_len + r_ptr >= in_len) {
@ -274,13 +283,84 @@ int srslte_rm_turbo_tx_lut(uint8_t *w_buff, uint8_t *systematic, uint8_t *parity
int srslte_rm_turbo_rx_lut(int16_t *input, int16_t *output, uint32_t in_len, uint32_t cb_idx, uint32_t rv_idx) int srslte_rm_turbo_rx_lut(int16_t *input, int16_t *output, uint32_t in_len, uint32_t cb_idx, uint32_t rv_idx)
{ {
#ifndef HAVE_SIMD
if (rv_idx < 4 && cb_idx < SRSLTE_NOF_TC_CB_SIZES) { if (rv_idx < 4 && cb_idx < SRSLTE_NOF_TC_CB_SIZES) {
uint32_t out_len = 3*srslte_cbsegm_cbsize(cb_idx)+12; uint32_t out_len = 3*srslte_cbsegm_cbsize(cb_idx)+12;
uint32_t *deinter = deinterleaver[cb_idx][rv_idx]; uint16_t *deinter = deinterleaver[cb_idx][rv_idx];
for (int i=0;i<in_len;i++) { for (int i=0;i<in_len;i++) {
//printf("i=%d=%d goes to %d\n", i%out_len, input[i], deinter[i%out_len]);
output[deinter[i%out_len]] += input[i];
}
return 0;
} else {
printf("Invalid inputs rv_idx=%d, cb_idx=%d\n", rv_idx, cb_idx);
return SRSLTE_ERROR_INVALID_INPUTS;
}
#else
return srslte_rm_turbo_rx_lut_simd(input, output, in_len, cb_idx, rv_idx);
#endif
}
#ifdef HAVE_SIMD
static void print128_num(__m128i var)
{
int16_t *val = (int16_t*) &var;//can also use uint16_t instead of 16_t
printf("Numerical: %d %d %d %d %d %d %d %d \n",
val[0], val[1], val[2], val[3], val[4], val[5],
val[6], val[7]);
}
int srslte_rm_turbo_rx_lut_simd(int16_t *input, int16_t *output, uint32_t in_len, uint32_t cb_idx, uint32_t rv_idx)
{
if (rv_idx < 4 && cb_idx < SRSLTE_NOF_TC_CB_SIZES) {
uint32_t out_len = 3*srslte_cbsegm_cbsize(cb_idx)+12;
uint16_t *deinter = deinterleaver[cb_idx][rv_idx];
const __m128i* xPtr = (const __m128i*) input;
const __m128i* lutPtr = (const __m128i*) deinter;
printf("\nin_len=%d, out_len=%d\n", in_len, out_len);
srslte_vec_fprint_s(stdout, input, in_len);
__m128i xVal, lutVal;
int intCnt = 8;
int nwrapps = 0;
for (int i=0;i<in_len/8-1-nwrapps/2;i++) {
xVal = _mm_loadu_si128(xPtr);
lutVal = _mm_load_si128(lutPtr);
for (int j=0;j<8;j++) {
int16_t x = (int16_t) _mm_extract_epi16(xVal, j);
uint16_t l = (uint16_t) _mm_extract_epi16(lutVal, j);
output[l] += x;
}
printf("x: "); print128_num(xVal);
printf("l: "); print128_num(lutVal);
xPtr ++;
lutPtr ++;
intCnt += 8;
if (intCnt >= out_len) {
/* Copy last elements */
for (int j=nwrapps*out_len+intCnt-8;j<(nwrapps+1)*out_len;j++) {
printf("coping element %d (in=%d)\n", j, input[j]);
output[deinter[j]] += input[j];
}
/* And wrap pointers */
nwrapps++;
printf("--- Wrapping: intCnt=%d, nwrap=%d\n",intCnt, nwrapps);
intCnt = 8;
xPtr = (const __m128i*) &input[nwrapps*out_len];
lutPtr = (const __m128i*) deinter;
}
}
for (int i=8*(in_len/8-1)+(((8*(in_len/8))%out_len)%8);i<in_len;i++) {
printf("copying i=%d, val=%d, t=%d\n",i, input[i],deinter[i%out_len]);
output[deinter[i%out_len]] += input[i]; output[deinter[i%out_len]] += input[i];
} }
return 0; return 0;
} else { } else {
printf("Invalid inputs rv_idx=%d, cb_idx=%d\n", rv_idx, cb_idx); printf("Invalid inputs rv_idx=%d, cb_idx=%d\n", rv_idx, cb_idx);
@ -288,6 +368,9 @@ int srslte_rm_turbo_rx_lut(int16_t *input, int16_t *output, uint32_t in_len, uin
} }
} }
#endif
@ -335,7 +418,7 @@ int srslte_rm_turbo_tx(uint8_t *w_buff, uint32_t w_buff_len, uint8_t *input, uin
return -1; return -1;
} }
nrows = (uint32_t) (in_len / 3 - 1) / NCOLS + 1; nrows = (uint16_t) (in_len / 3 - 1) / NCOLS + 1;
K_p = nrows * NCOLS; K_p = nrows * NCOLS;
if (3 * K_p > w_buff_len) { if (3 * K_p > w_buff_len) {
fprintf(stderr, fprintf(stderr,
@ -385,7 +468,7 @@ int srslte_rm_turbo_tx(uint8_t *w_buff, uint32_t w_buff_len, uint8_t *input, uin
N_cb = 3 * K_p; // TODO: Soft buffer size limitation N_cb = 3 * K_p; // TODO: Soft buffer size limitation
k0 = nrows k0 = nrows
* (2 * (uint32_t) ceilf((float) N_cb / (float) (8 * nrows)) * rv_idx + 2); * (2 * (uint16_t) ceilf((float) N_cb / (float) (8 * nrows)) * rv_idx + 2);
k = 0; k = 0;
j = 0; j = 0;
@ -414,7 +497,7 @@ int srslte_rm_turbo_rx(float *w_buff, uint32_t w_buff_len, float *input, uint32_
nrows = (uint32_t) (out_len / 3 - 1) / NCOLS + 1; nrows = (uint16_t) (out_len / 3 - 1) / NCOLS + 1;
K_p = nrows * NCOLS; K_p = nrows * NCOLS;
if (3 * K_p > w_buff_len) { if (3 * K_p > w_buff_len) {
fprintf(stderr, fprintf(stderr,
@ -437,7 +520,7 @@ int srslte_rm_turbo_rx(float *w_buff, uint32_t w_buff_len, float *input, uint32_
/* Undo bit collection. Account for dummy bits */ /* Undo bit collection. Account for dummy bits */
N_cb = 3 * K_p; // TODO: Soft buffer size limitation N_cb = 3 * K_p; // TODO: Soft buffer size limitation
k0 = nrows k0 = nrows
* (2 * (uint32_t) ceilf((float) N_cb / (float) (8 * nrows)) * rv_idx + 2); * (2 * (uint16_t) ceilf((float) N_cb / (float) (8 * nrows)) * rv_idx + 2);
k = 0; k = 0;
j = 0; j = 0;
@ -462,7 +545,7 @@ int srslte_rm_turbo_rx(float *w_buff, uint32_t w_buff_len, float *input, uint32_
} }
} else { } else {
uint32_t jpp = (jp - K_p - 1) / 2; uint16_t jpp = (jp - K_p - 1) / 2;
kidx = (RM_PERM_TC[jpp / nrows] + NCOLS * (jpp % nrows) + 1) % K_p; kidx = (RM_PERM_TC[jpp / nrows] + NCOLS * (jpp % nrows) + 1) % K_p;
if ((kidx - ndummy) < 0) { if ((kidx - ndummy) < 0) {
isdummy = true; isdummy = true;

6
srslte/lib/fec/src/softbuffer.c
Unescape Escape View File

@ -56,7 +56,7 @@ int srslte_softbuffer_rx_init(srslte_softbuffer_rx_t *q, uint32_t nof_prb) {
if (ret != SRSLTE_ERROR) { if (ret != SRSLTE_ERROR) {
q->max_cb = (uint32_t) ret / (SRSLTE_TCOD_MAX_LEN_CB - 24) + 1; q->max_cb = (uint32_t) ret / (SRSLTE_TCOD_MAX_LEN_CB - 24) + 1;
q->buffer_f = srslte_vec_malloc(sizeof(float*) * q->max_cb); q->buffer_f = srslte_vec_malloc(sizeof(int16_t*) * q->max_cb);
if (!q->buffer_f) { if (!q->buffer_f) {
perror("malloc"); perror("malloc");
return SRSLTE_ERROR; return SRSLTE_ERROR;
@ -64,7 +64,7 @@ int srslte_softbuffer_rx_init(srslte_softbuffer_rx_t *q, uint32_t nof_prb) {
// FIXME: Use HARQ buffer limitation based on UE category // FIXME: Use HARQ buffer limitation based on UE category
for (uint32_t i=0;i<q->max_cb;i++) { for (uint32_t i=0;i<q->max_cb;i++) {
q->buffer_f[i] = srslte_vec_malloc(sizeof(float) * SOFTBUFFER_SIZE); q->buffer_f[i] = srslte_vec_malloc(sizeof(int16_t) * SOFTBUFFER_SIZE);
if (!q->buffer_f[i]) { if (!q->buffer_f[i]) {
perror("malloc"); perror("malloc");
return SRSLTE_ERROR; return SRSLTE_ERROR;
@ -107,7 +107,7 @@ void srslte_softbuffer_rx_reset_cb(srslte_softbuffer_rx_t *q, uint32_t nof_cb) {
} }
for (uint32_t i=0;i<nof_cb;i++) { for (uint32_t i=0;i<nof_cb;i++) {
if (q->buffer_f[i]) { if (q->buffer_f[i]) {
bzero(q->buffer_f[i], SOFTBUFFER_SIZE*sizeof(float)); bzero(q->buffer_f[i], SOFTBUFFER_SIZE*sizeof(int16_t));
} }
} }
} }

4
srslte/lib/fec/src/turbocoder.c
Unescape Escape View File

@ -43,7 +43,7 @@
uint8_t tcod_lut_next_state[188][8][256]; uint8_t tcod_lut_next_state[188][8][256];
uint8_t tcod_lut_output[188][8][256]; uint8_t tcod_lut_output[188][8][256];
uint32_t tcod_per_fw[188][6144]; uint16_t tcod_per_fw[188][6144];
static bool table_initiated = false; static bool table_initiated = false;
@ -74,7 +74,7 @@ int srslte_tcod_encode(srslte_tcod_t *h, uint8_t *input, uint8_t *output, uint32
uint32_t i, k = 0, j; uint32_t i, k = 0, j;
uint8_t bit; uint8_t bit;
uint8_t in, out; uint8_t in, out;
uint32_t *per; uint16_t *per;
if (long_cb > h->max_long_cb) { if (long_cb > h->max_long_cb) {
fprintf(stderr, "Turbo coder initiated for max_long_cb=%d\n", fprintf(stderr, "Turbo coder initiated for max_long_cb=%d\n",

4
srslte/lib/fec/src/turbodecoder_gen.c
Unescape Escape View File

@ -318,6 +318,10 @@ void srslte_tdec_gen_iteration(srslte_tdec_gen_t * h, float * input, uint32_t lo
// Run MAP DEC #2 // Run MAP DEC #2
map_gen_dec(&h->dec, h->syst, h->parity, h->llr2, long_cb); map_gen_dec(&h->dec, h->syst, h->parity, h->llr2, long_cb);
//printf("llr2=");
//srslte_vec_fprint_f(stdout, h->llr2, long_cb);
// Update a-priori LLR from the last iteration // Update a-priori LLR from the last iteration
for (i = 0; i < long_cb; i++) { for (i = 0; i < long_cb; i++) {
h->w[i] += h->llr2[deinter[i]] - h->llr1[i]; h->w[i] += h->llr2[deinter[i]] - h->llr1[i];

13
srslte/lib/fec/src/turbodecoder_sse.c
Unescape Escape View File

@ -125,7 +125,7 @@ void srslte_map_gen_beta(srslte_map_gen_t * s, int16_t * output, uint32_t long_c
BETA_STEP(g); BETA_STEP(g);
} }
__m128i norm;
for (; k >= 0; k-=8) { for (; k >= 0; k-=8) {
gv = _mm_load_si128(gPtr); gv = _mm_load_si128(gPtr);
gPtr--; gPtr--;
@ -133,13 +133,15 @@ void srslte_map_gen_beta(srslte_map_gen_t * s, int16_t * output, uint32_t long_c
BETA_STEP_CNT(1,1); BETA_STEP_CNT(1,1);
BETA_STEP_CNT(2,2); BETA_STEP_CNT(2,2);
BETA_STEP_CNT(3,3); BETA_STEP_CNT(3,3);
norm = _mm_shuffle_epi8(beta_k, shuf_norm);
beta_k = _mm_sub_epi16(beta_k, norm);
gv = _mm_load_si128(gPtr); gv = _mm_load_si128(gPtr);
gPtr--; gPtr--;
BETA_STEP_CNT(0,4); BETA_STEP_CNT(0,4);
BETA_STEP_CNT(1,5); BETA_STEP_CNT(1,5);
BETA_STEP_CNT(2,6); BETA_STEP_CNT(2,6);
BETA_STEP_CNT(3,7); BETA_STEP_CNT(3,7);
__m128i norm = _mm_shuffle_epi8(beta_k, shuf_norm); norm = _mm_shuffle_epi8(beta_k, shuf_norm);
beta_k = _mm_sub_epi16(beta_k, norm); beta_k = _mm_sub_epi16(beta_k, norm);
} }
} }
@ -203,6 +205,7 @@ void srslte_map_gen_alpha(srslte_map_gen_t * s, uint32_t long_cb)
_mm_store_si128(alphaPtr, alpha_k);\ _mm_store_si128(alphaPtr, alpha_k);\
alphaPtr++; \ alphaPtr++; \
__m128i norm;
for (k = 0; k < long_cb/8; k++) { for (k = 0; k < long_cb/8; k++) {
gv = _mm_load_si128(gPtr); gv = _mm_load_si128(gPtr);
gPtr++; gPtr++;
@ -210,13 +213,15 @@ void srslte_map_gen_alpha(srslte_map_gen_t * s, uint32_t long_cb)
ALPHA_STEP(1); ALPHA_STEP(1);
ALPHA_STEP(2); ALPHA_STEP(2);
ALPHA_STEP(3); ALPHA_STEP(3);
norm = _mm_shuffle_epi8(alpha_k, shuf_norm);
alpha_k = _mm_sub_epi16(alpha_k, norm);
gv = _mm_load_si128(gPtr); gv = _mm_load_si128(gPtr);
gPtr++; gPtr++;
ALPHA_STEP(0); ALPHA_STEP(0);
ALPHA_STEP(1); ALPHA_STEP(1);
ALPHA_STEP(2); ALPHA_STEP(2);
ALPHA_STEP(3); ALPHA_STEP(3);
__m128i norm = _mm_shuffle_epi8(alpha_k, shuf_norm); norm = _mm_shuffle_epi8(alpha_k, shuf_norm);
alpha_k = _mm_sub_epi16(alpha_k, norm); alpha_k = _mm_sub_epi16(alpha_k, norm);
} }
} }
@ -569,7 +574,7 @@ void srslte_tdec_sse_decision(srslte_tdec_sse_t * h, uint8_t *output, uint32_t l
__m128i *appPtr = (__m128i*) h->app1; __m128i *appPtr = (__m128i*) h->app1;
__m128i *outPtr = (__m128i*) output; __m128i *outPtr = (__m128i*) output;
__m128i ap, out, out0, out1; __m128i ap, out, out0, out1;
for (uint32_t i = 0; i < long_cb/16; i++) { for (uint32_t i = 0; i < long_cb/16; i++) {
ap = _mm_load_si128(appPtr); appPtr++; ap = _mm_load_si128(appPtr); appPtr++;
out0 = _mm_and_si128(_mm_cmpgt_epi16(ap, zero), lsb_mask); out0 = _mm_and_si128(_mm_cmpgt_epi16(ap, zero), lsb_mask);

6
srslte/lib/fec/test/rm_turbo_test.c
Unescape Escape View File

@ -165,7 +165,7 @@ int main(int argc, char **argv) {
} }
srslte_bit_unpack_vector(rm_bits2_bytes, rm_bits2, nof_e_bits); srslte_bit_unpack_vector(rm_bits2_bytes, rm_bits2, nof_e_bits);
for (int i=0;i<nof_e_bits;i++) { for (int i=0;i<nof_e_bits;i++) {
if (rm_bits2[i] != rm_bits[i]) { if (rm_bits2[i] != rm_bits[i]) {
printf("Error in TX bit %d\n", i); printf("Error in TX bit %d\n", i);
@ -176,7 +176,7 @@ int main(int argc, char **argv) {
printf("OK TX..."); printf("OK TX...");
for (int i=0;i<nof_e_bits;i++) { for (int i=0;i<nof_e_bits;i++) {
rm_bits_f[i] = rand()%10-5; rm_bits_f[i] = i;//rand()%10-5;
rm_bits_s[i] = (short) rm_bits_f[i]; rm_bits_s[i] = (short) rm_bits_f[i];
} }
@ -186,6 +186,8 @@ int main(int argc, char **argv) {
bzero(bits2_s, long_cb_enc*sizeof(short)); bzero(bits2_s, long_cb_enc*sizeof(short));
srslte_rm_turbo_rx_lut(rm_bits_s, bits2_s, nof_e_bits, cb_idx, rv_idx); srslte_rm_turbo_rx_lut(rm_bits_s, bits2_s, nof_e_bits, cb_idx, rv_idx);
//srslte_vec_fprint_f(stdout, bits_f, long_cb_enc);
//srslte_vec_fprint_s(stdout, bits2_s, long_cb_enc);
for (int i=0;i<long_cb_enc;i++) { for (int i=0;i<long_cb_enc;i++) {
if (bits_f[i] != bits2_s[i]) { if (bits_f[i] != bits2_s[i]) {
printf("error RX in bit %d %f!=%d\n", i, bits_f[i], bits2_s[i]); printf("error RX in bit %d %f!=%d\n", i, bits_f[i], bits2_s[i]);

56
srslte/lib/modem/src/demod_soft.c
Unescape Escape View File

@ -43,11 +43,13 @@
//#define SCALE_DEMOD16QAM //#define SCALE_DEMOD16QAM
#define SCALE_SHORT_CONV 100 #define SCALE_SHORT_CONV_QPSK 100
#define SCALE_SHORT_CONV_QAM16 400
#define SCALE_SHORT_CONV_QAM64 700
void demod_bpsk_lte_s(const cf_t *symbols, short *llr, int nsymbols) { void demod_bpsk_lte_s(const cf_t *symbols, short *llr, int nsymbols) {
for (int i=0;i<nsymbols;i++) { for (int i=0;i<nsymbols;i++) {
llr[i] = (short) -SCALE_SHORT_CONV*(crealf(symbols[i]) + cimagf(symbols[i]))/sqrt(2); llr[i] = (short) -SCALE_SHORT_CONV_QPSK*(crealf(symbols[i]) + cimagf(symbols[i]))/sqrt(2);
} }
} }
@ -58,7 +60,7 @@ void demod_bpsk_lte(const cf_t *symbols, float *llr, int nsymbols) {
} }
void demod_qpsk_lte_s(const cf_t *symbols, short *llr, int nsymbols) { void demod_qpsk_lte_s(const cf_t *symbols, short *llr, int nsymbols) {
srslte_vec_convert_fi((float*) symbols, llr, -SCALE_SHORT_CONV*sqrt(2), nsymbols*2); srslte_vec_convert_fi((float*) symbols, llr, -SCALE_SHORT_CONV_QPSK*sqrt(2), nsymbols*2);
} }
void demod_qpsk_lte(const cf_t *symbols, float *llr, int nsymbols) { void demod_qpsk_lte(const cf_t *symbols, float *llr, int nsymbols) {
@ -101,13 +103,13 @@ void demod_16qam_lte(const cf_t *symbols, float *llr, int nsymbols) {
void demod_16qam_lte_s(const cf_t *symbols, short *llr, int nsymbols) { void demod_16qam_lte_s(const cf_t *symbols, short *llr, int nsymbols) {
#ifndef HAVE_SIMD #ifndef HAVE_SIMD
for (int i=0;i<nsymbols;i++) { for (int i=0;i<nsymbols;i++) {
short yre = (short) (SCALE_SHORT_CONV*crealf(symbols[i])); short yre = (short) (SCALE_SHORT_CONV_QAM16*crealf(symbols[i]));
short yim = (short) (SCALE_SHORT_CONV*cimagf(symbols[i])); short yim = (short) (SCALE_SHORT_CONV_QAM16*cimagf(symbols[i]));
llr[4*i+0] = -yre; llr[4*i+0] = -yre;
llr[4*i+1] = -yim; llr[4*i+1] = -yim;
llr[4*i+2] = abs(yre)-2*SCALE_SHORT_CONV/sqrt(10); llr[4*i+2] = abs(yre)-2*SCALE_SHORT_CONV_QAM16/sqrt(10);
llr[4*i+3] = abs(yim)-2*SCALE_SHORT_CONV/sqrt(10); llr[4*i+3] = abs(yim)-2*SCALE_SHORT_CONV_QAM16/sqrt(10);
} }
#else #else
@ -115,9 +117,9 @@ void demod_16qam_lte_s(const cf_t *symbols, short *llr, int nsymbols) {
__m128i *resultPtr = (__m128i*) llr; __m128i *resultPtr = (__m128i*) llr;
__m128 symbol1, symbol2; __m128 symbol1, symbol2;
__m128i symbol_i1, symbol_i2, symbol_i, symbol_abs; __m128i symbol_i1, symbol_i2, symbol_i, symbol_abs;
__m128i offset = _mm_set1_epi16(2*SCALE_SHORT_CONV/sqrt(10)); __m128i offset = _mm_set1_epi16(2*SCALE_SHORT_CONV_QAM16/sqrt(10));
__m128i result11, result12, result22, result21; __m128i result11, result12, result22, result21;
__m128 scale_v = _mm_set1_ps(-SCALE_SHORT_CONV); __m128 scale_v = _mm_set1_ps(-SCALE_SHORT_CONV_QAM16);
__m128i shuffle_negated_1 = _mm_set_epi8(0xff,0xff,0xff,0xff,7,6,5,4,0xff,0xff,0xff,0xff,3,2,1,0); __m128i shuffle_negated_1 = _mm_set_epi8(0xff,0xff,0xff,0xff,7,6,5,4,0xff,0xff,0xff,0xff,3,2,1,0);
__m128i shuffle_negated_2 = _mm_set_epi8(0xff,0xff,0xff,0xff,15,14,13,12,0xff,0xff,0xff,0xff,11,10,9,8); __m128i shuffle_negated_2 = _mm_set_epi8(0xff,0xff,0xff,0xff,15,14,13,12,0xff,0xff,0xff,0xff,11,10,9,8);
__m128i shuffle_abs_1 = _mm_set_epi8(7,6,5,4,0xff,0xff,0xff,0xff,3,2,1,0,0xff,0xff,0xff,0xff); __m128i shuffle_abs_1 = _mm_set_epi8(7,6,5,4,0xff,0xff,0xff,0xff,3,2,1,0,0xff,0xff,0xff,0xff);
@ -143,13 +145,13 @@ void demod_16qam_lte_s(const cf_t *symbols, short *llr, int nsymbols) {
} }
// Demodulate last symbols // Demodulate last symbols
for (int i=4*(nsymbols/4);i<nsymbols;i++) { for (int i=4*(nsymbols/4);i<nsymbols;i++) {
short yre = (short) (SCALE_SHORT_CONV*crealf(symbols[i])); short yre = (short) (SCALE_SHORT_CONV_QAM16*crealf(symbols[i]));
short yim = (short) (SCALE_SHORT_CONV*cimagf(symbols[i])); short yim = (short) (SCALE_SHORT_CONV_QAM16*cimagf(symbols[i]));
llr[4*i+0] = -yre; llr[4*i+0] = -yre;
llr[4*i+1] = -yim; llr[4*i+1] = -yim;
llr[4*i+2] = abs(yre)-2*SCALE_SHORT_CONV/sqrt(10); llr[4*i+2] = abs(yre)-2*SCALE_SHORT_CONV_QAM16/sqrt(10);
llr[4*i+3] = abs(yim)-2*SCALE_SHORT_CONV/sqrt(10); llr[4*i+3] = abs(yim)-2*SCALE_SHORT_CONV_QAM16/sqrt(10);
} }
#endif #endif
} }
@ -174,24 +176,24 @@ void demod_64qam_lte_s(const cf_t *symbols, short *llr, int nsymbols)
{ {
#ifndef HAVE_SIMD #ifndef HAVE_SIMD
for (int i=0;i<nsymbols;i++) { for (int i=0;i<nsymbols;i++) {
float yre = (short) (SCALE_SHORT_CONV*crealf(symbols[i])); float yre = (short) (SCALE_SHORT_CONV_QAM64*crealf(symbols[i]));
float yim = (short) (SCALE_SHORT_CONV*cimagf(symbols[i])); float yim = (short) (SCALE_SHORT_CONV*cimagf(symbols[i]));
llr[6*i+0] = -yre; llr[6*i+0] = -yre;
llr[6*i+1] = -yim; llr[6*i+1] = -yim;
llr[6*i+2] = abs(yre)-4*SCALE_SHORT_CONV/sqrt(42); llr[6*i+2] = abs(yre)-4*SCALE_SHORT_CONV_QAM64/sqrt(42);
llr[6*i+3] = abs(yim)-4*SCALE_SHORT_CONV/sqrt(42); llr[6*i+3] = abs(yim)-4*SCALE_SHORT_CONV_QAM64/sqrt(42);
llr[6*i+4] = abs(llr[6*i+2])-2*SCALE_SHORT_CONV/sqrt(42); llr[6*i+4] = abs(llr[6*i+2])-2*SCALE_SHORT_CONV_QAM64/sqrt(42);
llr[6*i+5] = abs(llr[6*i+3])-2*SCALE_SHORT_CONV/sqrt(42); llr[6*i+5] = abs(llr[6*i+3])-2*SCALE_SHORT_CONV_QAM64/sqrt(42);
} }
#else #else
float *symbolsPtr = (float*) symbols; float *symbolsPtr = (float*) symbols;
__m128i *resultPtr = (__m128i*) llr; __m128i *resultPtr = (__m128i*) llr;
__m128 symbol1, symbol2; __m128 symbol1, symbol2;
__m128i symbol_i1, symbol_i2, symbol_i, symbol_abs, symbol_abs2; __m128i symbol_i1, symbol_i2, symbol_i, symbol_abs, symbol_abs2;
__m128i offset1 = _mm_set1_epi16(4*SCALE_SHORT_CONV/sqrt(42)); __m128i offset1 = _mm_set1_epi16(4*SCALE_SHORT_CONV_QAM64/sqrt(42));
__m128i offset2 = _mm_set1_epi16(2*SCALE_SHORT_CONV/sqrt(42)); __m128i offset2 = _mm_set1_epi16(2*SCALE_SHORT_CONV_QAM64/sqrt(42));
__m128 scale_v = _mm_set1_ps(-SCALE_SHORT_CONV); __m128 scale_v = _mm_set1_ps(-SCALE_SHORT_CONV_QAM64);
__m128i result11, result12, result13, result22, result21,result23, result31, result32, result33; __m128i result11, result12, result13, result22, result21,result23, result31, result32, result33;
__m128i shuffle_negated_1 = _mm_set_epi8(7,6,5,4,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,3,2,1,0); __m128i shuffle_negated_1 = _mm_set_epi8(7,6,5,4,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,3,2,1,0);
@ -234,15 +236,15 @@ void demod_64qam_lte_s(const cf_t *symbols, short *llr, int nsymbols)
_mm_store_si128(resultPtr, _mm_or_si128(_mm_or_si128(result31, result32),result33)); resultPtr++; _mm_store_si128(resultPtr, _mm_or_si128(_mm_or_si128(result31, result32),result33)); resultPtr++;
} }
for (int i=4*(nsymbols/4);i<nsymbols;i++) { for (int i=4*(nsymbols/4);i<nsymbols;i++) {
float yre = (short) (SCALE_SHORT_CONV*crealf(symbols[i])); float yre = (short) (SCALE_SHORT_CONV_QAM64*crealf(symbols[i]));
float yim = (short) (SCALE_SHORT_CONV*cimagf(symbols[i])); float yim = (short) (SCALE_SHORT_CONV_QAM64*cimagf(symbols[i]));
llr[6*i+0] = -yre; llr[6*i+0] = -yre;
llr[6*i+1] = -yim; llr[6*i+1] = -yim;
llr[6*i+2] = abs(yre)-4*SCALE_SHORT_CONV/sqrt(42); llr[6*i+2] = abs(yre)-4*SCALE_SHORT_CONV_QAM64/sqrt(42);
llr[6*i+3] = abs(yim)-4*SCALE_SHORT_CONV/sqrt(42); llr[6*i+3] = abs(yim)-4*SCALE_SHORT_CONV_QAM64/sqrt(42);
llr[6*i+4] = abs(llr[6*i+2])-2*SCALE_SHORT_CONV/sqrt(42); llr[6*i+4] = abs(llr[6*i+2])-2*SCALE_SHORT_CONV_QAM64/sqrt(42);
llr[6*i+5] = abs(llr[6*i+3])-2*SCALE_SHORT_CONV/sqrt(42); llr[6*i+5] = abs(llr[6*i+3])-2*SCALE_SHORT_CONV_QAM64/sqrt(42);
} }
#endif #endif
} }

4
srslte/lib/phch/src/pdsch.c
Unescape Escape View File

@ -375,9 +375,9 @@ int srslte_pdsch_decode_rnti(srslte_pdsch_t *q,
cfg != NULL) cfg != NULL)
{ {
INFO("Decoding PDSCH SF: %d, RNTI: 0x%x, Mod %s, TBS: %d, NofSymbols: %d, NofBitsE: %d, rv_idx: %d\n", INFO("Decoding PDSCH SF: %d, RNTI: 0x%x, Mod %s, TBS: %d, NofSymbols: %d, NofBitsE: %d, rv_idx: %d, C_prb=%d\n",
cfg->sf_idx, rnti, srslte_mod_string(cfg->grant.mcs.mod), cfg->grant.mcs.tbs, cfg->nbits.nof_re, cfg->sf_idx, rnti, srslte_mod_string(cfg->grant.mcs.mod), cfg->grant.mcs.tbs, cfg->nbits.nof_re,
cfg->nbits.nof_bits, cfg->rv); cfg->nbits.nof_bits, cfg->rv, cfg->grant.nof_prb);
/* number of layers equals number of ports */ /* number of layers equals number of ports */
for (i = 0; i < q->cell.nof_ports; i++) { for (i = 0; i < q->cell.nof_ports; i++) {

48
srslte/lib/phch/src/sch.c
Unescape Escape View File

@ -43,6 +43,8 @@
#include "srslte/utils/debug.h" #include "srslte/utils/debug.h"
#include "srslte/utils/vector.h" #include "srslte/utils/vector.h"
#define SRSLTE_PDSCH_MAX_TDEC_ITERS 4
/* 36.213 Table 8.6.3-1: Mapping of HARQ-ACK offset values and the index signalled by higher layers */ /* 36.213 Table 8.6.3-1: Mapping of HARQ-ACK offset values and the index signalled by higher layers */
float beta_harq_offset[16] = {2.0, 2.5, 3.125, 4.0, 5.0, 6.250, 8.0, 10.0, float beta_harq_offset[16] = {2.0, 2.5, 3.125, 4.0, 5.0, 6.250, 8.0, 10.0,
12.625, 15.875, 20.0, 31.0, 50.0, 80.0, 126.0, -1.0}; 12.625, 15.875, 20.0, 31.0, 50.0, 80.0, 126.0, -1.0};
@ -322,6 +324,8 @@ static int encode_tb(srslte_sch_t *q,
return encode_tb_off(q, soft_buffer, cb_segm, Qm, rv, nof_e_bits, data, e_bits, 0); return encode_tb_off(q, soft_buffer, cb_segm, Qm, rv, nof_e_bits, data, e_bits, 0);
} }
/* Decode a transport block according to 36.212 5.3.2 /* Decode a transport block according to 36.212 5.3.2
* *
@ -334,7 +338,7 @@ static int decode_tb(srslte_sch_t *q,
uint8_t parity[3] = {0, 0, 0}; uint8_t parity[3] = {0, 0, 0};
uint32_t par_rx, par_tx; uint32_t par_rx, par_tx;
uint32_t i; uint32_t i;
uint32_t cb_len, rp, wp, rlen, F, n_e; uint32_t cb_len, rp, wp, rlen, n_e;
if (q != NULL && if (q != NULL &&
data != NULL && data != NULL &&
@ -385,11 +389,6 @@ static int decode_tb(srslte_sch_t *q,
} else { } else {
rlen = cb_len - 24; rlen = cb_len - 24;
} }
if (i == 0) {
F = cb_segm->F;
} else {
F = 0;
}
if (i <= cb_segm->C - gamma - 1) { if (i <= cb_segm->C - gamma - 1) {
n_e = Qm * (Gp/cb_segm->C); n_e = Qm * (Gp/cb_segm->C);
@ -397,9 +396,6 @@ static int decode_tb(srslte_sch_t *q,
n_e = Qm * ((uint32_t) ceilf((float) Gp/cb_segm->C)); n_e = Qm * ((uint32_t) ceilf((float) Gp/cb_segm->C));
} }
INFO("CB#%d: cb_len: %d, rlen: %d, wp: %d, rp: %d, F: %d, E: %d\n", i,
cb_len, rlen - F, wp, rp, F, n_e);
/* Rate Unmatching */ /* Rate Unmatching */
if (srslte_rm_turbo_rx_lut(&e_bits[rp], softbuffer->buffer_f[i], n_e, cblen_idx, rv)) { if (srslte_rm_turbo_rx_lut(&e_bits[rp], softbuffer->buffer_f[i], n_e, cblen_idx, rv)) {
fprintf(stderr, "Error in rate matching\n"); fprintf(stderr, "Error in rate matching\n");
@ -414,7 +410,6 @@ static int decode_tb(srslte_sch_t *q,
/* Turbo Decoding with CRC-based early stopping */ /* Turbo Decoding with CRC-based early stopping */
q->nof_iterations = 0; q->nof_iterations = 0;
uint32_t len_crc; uint32_t len_crc;
uint8_t *cb_in_ptr;
srslte_crc_t *crc_ptr; srslte_crc_t *crc_ptr;
early_stop = false; early_stop = false;
@ -426,25 +421,29 @@ static int decode_tb(srslte_sch_t *q,
if (cb_segm->C > 1) { if (cb_segm->C > 1) {
len_crc = cb_len; len_crc = cb_len;
cb_in_ptr = q->cb_in;
crc_ptr = &q->crc_cb; crc_ptr = &q->crc_cb;
} else { } else {
len_crc = cb_segm->tbs+24; len_crc = cb_segm->tbs+24;
cb_in_ptr = &q->cb_in[F/8];
crc_ptr = &q->crc_tb; crc_ptr = &q->crc_tb;
} }
srslte_tdec_sse_decision_byte(&q->decoder, q->cb_in, cb_len); srslte_tdec_sse_decision_byte(&q->decoder, q->cb_in, cb_len);
if (i == 9) {
srslte_tdec_sse_decision(&q->decoder, q->temp_data, cb_len);
}
/* Check Codeblock CRC and stop early if incorrect */ /* Check Codeblock CRC and stop early if incorrect */
if (!srslte_crc_checksum_byte(crc_ptr, cb_in_ptr, len_crc)) { if (!srslte_crc_checksum_byte(crc_ptr, q->cb_in, len_crc)) {
early_stop = true; early_stop = true;
} }
} while (q->nof_iterations < SRSLTE_PDSCH_MAX_TDEC_ITERS && !early_stop); } while (q->nof_iterations < SRSLTE_PDSCH_MAX_TDEC_ITERS && !early_stop);
q->average_nof_iterations = SRSLTE_VEC_EMA((float) q->nof_iterations, q->average_nof_iterations, 0.2); q->average_nof_iterations = SRSLTE_VEC_EMA((float) q->nof_iterations, q->average_nof_iterations, 0.2);
INFO("CB#%d: cb_len: %d, rlen: %d, wp: %d, rp: %d, E: %d, n_iters=%d\n", i,
cb_len, rlen, wp, rp, n_e, q->nof_iterations);
if (SRSLTE_VERBOSE_ISDEBUG()) { if (SRSLTE_VERBOSE_ISDEBUG()) {
DEBUG("CB#%d IN: ", i); DEBUG("CB#%d IN: ", i);
srslte_vec_fprint_byte(stdout, q->cb_in, cb_len/8); srslte_vec_fprint_byte(stdout, q->cb_in, cb_len/8);
@ -452,24 +451,17 @@ static int decode_tb(srslte_sch_t *q,
// If CB CRC is not correct, early_stop will be false and wont continue with rest of CBs // If CB CRC is not correct, early_stop will be false and wont continue with rest of CBs
if (F%8) {
fprintf(stderr, "Fatal Error: Number of filler bits %d is not byte aligned\n", F);
}
/* Copy data to another buffer, removing the Codeblock CRC */ /* Copy data to another buffer, removing the Codeblock CRC */
if (i < cb_segm->C - 1) { if (i < cb_segm->C - 1) {
memcpy(&data[wp/8], &q->cb_in[F/8], (rlen - F) * sizeof(uint8_t)/8); memcpy(&data[wp/8], q->cb_in, rlen/8 * sizeof(uint8_t));
} else { } else {
DEBUG("Last CB, appending parity: %d to %d from %d and 24 from %d\n",
rlen - F - 24, wp, F, rlen - 24);
/* Append Transport Block parity bits to the last CB */ /* Append Transport Block parity bits to the last CB */
memcpy(&data[wp/8], &q->cb_in[F/8], (rlen - F - 24) * sizeof(uint8_t)/8); memcpy(&data[wp/8], q->cb_in, (rlen - 24)/8 * sizeof(uint8_t));
memcpy(parity, &q->cb_in[(rlen - 24)/8], 24 * sizeof(uint8_t)/8); memcpy(parity, &q->cb_in[(rlen - 24)/8], 3 * sizeof(uint8_t));
} }
/* Set read/write pointers */ /* Set read/write pointers */
wp += (rlen - F); wp += rlen;
rp += n_e; rp += n_e;
} }

9
srslte/lib/phch/test/dlsch_encode_test_mex.c
Unescape Escape View File

@ -113,15 +113,20 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
mexErrMsgTxt("Error encoding TB\n"); mexErrMsgTxt("Error encoding TB\n");
return; return;
} }
uint8_t *e_bits_unpacked = srslte_vec_malloc(cfg.nbits.nof_bits * sizeof(uint8_t));
if (!e_bits_unpacked) {
return;
}
srslte_bit_unpack_vector(e_bits, e_bits_unpacked, cfg.nbits.nof_bits);
if (nlhs >= 1) { if (nlhs >= 1) {
mexutils_write_uint8(e_bits, &plhs[0], cfg.nbits.nof_bits, 1); mexutils_write_uint8(e_bits_unpacked, &plhs[0], cfg.nbits.nof_bits, 1);
} }
srslte_sch_free(&dlsch); srslte_sch_free(&dlsch);
free(trblkin); free(trblkin);
free(e_bits); free(e_bits);
free(e_bits_unpacked);
return; return;
} }

11
srslte/lib/phch/test/pdsch_test_mex.c
Unescape Escape View File

@ -65,6 +65,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
return; return;
} }
srslte_verbose = SRSLTE_VERBOSE_INFO;
bzero(&cfg, sizeof(srslte_pdsch_cfg_t)); bzero(&cfg, sizeof(srslte_pdsch_cfg_t));
if (mexutils_read_cell(ENBCFG, &cell)) { if (mexutils_read_cell(ENBCFG, &cell)) {
@ -196,7 +197,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
if (nrhs > NOF_INPUTS + 1) { if (nrhs > NOF_INPUTS + 1) {
noise_power = mxGetScalar(prhs[NOF_INPUTS+1]); noise_power = mxGetScalar(prhs[NOF_INPUTS+1]);
} else { } else {
noise_power = srslte_chest_dl_get_noise_estimate(&chest); noise_power = 0;
} }
uint8_t *data_bytes = srslte_vec_malloc(sizeof(uint8_t) * grant.mcs.tbs/8); uint8_t *data_bytes = srslte_vec_malloc(sizeof(uint8_t) * grant.mcs.tbs/8);
@ -224,7 +225,13 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
mexutils_write_cf(pdsch.d, &plhs[3], cfg.nbits.nof_re, 1); mexutils_write_cf(pdsch.d, &plhs[3], cfg.nbits.nof_re, 1);
} }
if (nlhs >= 5) { if (nlhs >= 5) {
mexutils_write_f(pdsch.e, &plhs[4], cfg.nbits.nof_bits, 1); mexutils_write_s(pdsch.e, &plhs[4], cfg.nbits.nof_bits, 1);
}
if (nlhs >= 6) {
mexutils_write_s(softbuffer.buffer_f[9], &plhs[5], 16908, 1);
}
if (nlhs >= 7) {
mexutils_write_uint8(pdsch.dl_sch.temp_data, &plhs[6], 5632, 1);
} }
srslte_chest_dl_free(&chest); srslte_chest_dl_free(&chest);

1
srslte/lib/phch/test/prach_test_mex.c
Unescape Escape View File

@ -26,6 +26,7 @@
*/ */
#include <string.h> #include <string.h>
#define FORCE_POWER2_FFT
#include "srslte/srslte.h" #include "srslte/srslte.h"
#include "srslte/mex/mexutils.h" #include "srslte/mex/mexutils.h"

12
srslte/lib/sync/test/pss_file.c
Unescape Escape View File

@ -54,14 +54,16 @@ uint32_t fft_size=64;
float threshold = 0.4; float threshold = 0.4;
int N_id_2_sync = -1; int N_id_2_sync = -1;
srslte_cp_t cp=SRSLTE_CP_NORM; srslte_cp_t cp=SRSLTE_CP_NORM;
int file_offset = 0;
void usage(char *prog) { void usage(char *prog) {
printf("Usage: %s [nlestdv] -i cell_id -f input_file_name\n", prog); printf("Usage: %s [nlestodv] -i cell_id -f input_file_name\n", prog);
printf("\t-n nof_frames [Default %d]\n", nof_frames); printf("\t-n nof_frames [Default %d]\n", nof_frames);
printf("\t-l N_id_2 to sync [Default use cell_id]\n"); printf("\t-l N_id_2 to sync [Default use cell_id]\n");
printf("\t-e Extended CP [Default Normal]\n", fft_size); printf("\t-e Extended CP [Default Normal]\n", fft_size);
printf("\t-s symbol_sz [Default %d]\n", fft_size); printf("\t-s symbol_sz [Default %d]\n", fft_size);
printf("\t-t threshold [Default %.2f]\n", threshold); printf("\t-t threshold [Default %.2f]\n", threshold);
printf("\t-o file read offset [Default %d]\n", file_offset);
#ifndef DISABLE_GRAPHICS #ifndef DISABLE_GRAPHICS
printf("\t-d disable plots [Default enabled]\n"); printf("\t-d disable plots [Default enabled]\n");
#else #else
@ -72,7 +74,7 @@ void usage(char *prog) {
void parse_args(int argc, char **argv) { void parse_args(int argc, char **argv) {
int opt; int opt;
while ((opt = getopt(argc, argv, "nlestdvif")) != -1) { while ((opt = getopt(argc, argv, "nlestdvoif")) != -1) {
switch (opt) { switch (opt) {
case 'f': case 'f':
input_file_name = argv[optind]; input_file_name = argv[optind];
@ -86,6 +88,9 @@ void parse_args(int argc, char **argv) {
case 'i': case 'i':
cell_id = atoi(argv[optind]); cell_id = atoi(argv[optind]);
break; break;
case 'o':
file_offset = atoi(argv[optind]);
break;
case 'l': case 'l':
N_id_2_sync = atoi(argv[optind]); N_id_2_sync = atoi(argv[optind]);
break; break;
@ -193,6 +198,8 @@ int main(int argc, char **argv) {
bzero(&ssync, sizeof(srslte_sync_t)); bzero(&ssync, sizeof(srslte_sync_t));
ssync.fft_size = fft_size; ssync.fft_size = fft_size;
n = srslte_filesource_read(&fsrc, buffer, file_offset);
while(frame_cnt < nof_frames || nof_frames == -1) { while(frame_cnt < nof_frames || nof_frames == -1) {
n = srslte_filesource_read(&fsrc, buffer, flen - peak_offset); n = srslte_filesource_read(&fsrc, buffer, flen - peak_offset);
if (n < 0) { if (n < 0) {
@ -237,6 +244,7 @@ int main(int argc, char **argv) {
if (srslte_sss_synch_N_id_1(&sss, m0, m1) != N_id_1) { if (srslte_sss_synch_N_id_1(&sss, m0, m1) != N_id_1) {
sss_error2++; sss_error2++;
} }
printf("sf_idx = %d\n", srslte_sss_synch_subframe(m0, m1));
INFO("Partial N_id_1: %d\n", srslte_sss_synch_N_id_1(&sss, m0, m1)); INFO("Partial N_id_1: %d\n", srslte_sss_synch_N_id_1(&sss, m0, m1));
srslte_sss_synch_m0m1_diff(&sss, &buffer[sss_idx], &m0, &m0_value, &m1, &m1_value); srslte_sss_synch_m0m1_diff(&sss, &buffer[sss_idx], &m0, &m0_value, &m1, &m1_value);
if (srslte_sss_synch_N_id_1(&sss, m0, m1) != N_id_1) { if (srslte_sss_synch_N_id_1(&sss, m0, m1) != N_id_1) {

4
srslte/lib/ue/src/ue_mib.c
Unescape Escape View File

@ -140,11 +140,13 @@ int srslte_ue_mib_decode(srslte_ue_mib_t * q, cf_t *input,
for (int i=0;i<SRSLTE_MAX_PORTS;i++) { for (int i=0;i<SRSLTE_MAX_PORTS;i++) {
ce_slot1[i] = &q->ce[i][SRSLTE_SLOT_LEN_RE(q->chest.cell.nof_prb, q->chest.cell.cp)]; ce_slot1[i] = &q->ce[i][SRSLTE_SLOT_LEN_RE(q->chest.cell.nof_prb, q->chest.cell.cp)];
} }
/* Decode PBCH */ /* Decode PBCH */
ret = srslte_pbch_decode(&q->pbch, &q->sf_symbols[SRSLTE_SLOT_LEN_RE(q->chest.cell.nof_prb, q->chest.cell.cp)], ret = srslte_pbch_decode(&q->pbch, &q->sf_symbols[SRSLTE_SLOT_LEN_RE(q->chest.cell.nof_prb, q->chest.cell.cp)],
ce_slot1, 0, ce_slot1, 0,
bch_payload, nof_tx_ports, sfn_offset); bch_payload, nof_tx_ports, sfn_offset);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Error decoding PBCH (%d)\n", ret); fprintf(stderr, "Error decoding PBCH (%d)\n", ret);
} else if (ret == 1) { } else if (ret == 1) {

7
srslte/lib/ue/src/ue_sync.c
Unescape Escape View File

@ -46,7 +46,9 @@ cf_t dummy[MAX_TIME_OFFSET];
#define TRACK_FRAME_SIZE 32 #define TRACK_FRAME_SIZE 32
#define FIND_NOF_AVG_FRAMES 2 #define FIND_NOF_AVG_FRAMES 2
int srslte_ue_sync_init_file(srslte_ue_sync_t *q, uint32_t nof_prb, char *file_name) { cf_t kk[1024*1024];
int srslte_ue_sync_init_file(srslte_ue_sync_t *q, uint32_t nof_prb, char *file_name, int offset) {
int ret = SRSLTE_ERROR_INVALID_INPUTS; int ret = SRSLTE_ERROR_INVALID_INPUTS;
if (q != NULL && if (q != NULL &&
@ -69,6 +71,9 @@ int srslte_ue_sync_init_file(srslte_ue_sync_t *q, uint32_t nof_prb, char *file_n
goto clean_exit; goto clean_exit;
} }
INFO("Offseting input file by %d samples\n", offset);
srslte_filesource_read(&q->file_source, kk, offset);
srslte_ue_sync_reset(q); srslte_ue_sync_reset(q);
ret = SRSLTE_SUCCESS; ret = SRSLTE_SUCCESS;

27
srslte/lib/utils/src/bit.c
Unescape Escape View File

@ -34,18 +34,18 @@
#include "srslte/utils/bit.h" #include "srslte/utils/bit.h"
void srslte_bit_interleave(uint8_t *input, uint8_t *output, uint32_t *interleaver, uint32_t nof_bits) { void srslte_bit_interleave(uint8_t *input, uint8_t *output, uint16_t *interleaver, uint32_t nof_bits) {
srslte_bit_interleave_w_offset(input, output, interleaver, nof_bits, 0); srslte_bit_interleave_w_offset(input, output, interleaver, nof_bits, 0);
} }
void srslte_bit_interleave_w_offset(uint8_t *input, uint8_t *output, uint32_t *interleaver, uint32_t nof_bits, uint32_t w_offset) { void srslte_bit_interleave_w_offset(uint8_t *input, uint8_t *output, uint16_t *interleaver, uint32_t nof_bits, uint32_t w_offset) {
uint32_t st=0, w_offset_p=0; uint32_t st=0, w_offset_p=0;
static const uint8_t mask[] = { 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1 }; static const uint8_t mask[] = { 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1 };
if (w_offset < 8 && w_offset > 0) { if (w_offset < 8 && w_offset > 0) {
st=1; st=1;
for (uint32_t j=0;j<8-w_offset;j++) { for (uint32_t j=0;j<8-w_offset;j++) {
uint32_t i_p = interleaver[j]; uint16_t i_p = interleaver[j];
if (input[i_p/8] & mask[i_p%8]) { if (input[i_p/8] & mask[i_p%8]) {
output[0] |= mask[j+w_offset]; output[0] |= mask[j+w_offset];
} else { } else {
@ -56,14 +56,14 @@ void srslte_bit_interleave_w_offset(uint8_t *input, uint8_t *output, uint32_t *i
} }
for (uint32_t i=st;i<nof_bits/8;i++) { for (uint32_t i=st;i<nof_bits/8;i++) {
uint32_t i_p0 = interleaver[i*8+0-w_offset_p]; uint16_t i_p0 = interleaver[i*8+0-w_offset_p];
uint32_t i_p1 = interleaver[i*8+1-w_offset_p]; uint16_t i_p1 = interleaver[i*8+1-w_offset_p];
uint32_t i_p2 = interleaver[i*8+2-w_offset_p]; uint16_t i_p2 = interleaver[i*8+2-w_offset_p];
uint32_t i_p3 = interleaver[i*8+3-w_offset_p]; uint16_t i_p3 = interleaver[i*8+3-w_offset_p];
uint32_t i_p4 = interleaver[i*8+4-w_offset_p]; uint16_t i_p4 = interleaver[i*8+4-w_offset_p];
uint32_t i_p5 = interleaver[i*8+5-w_offset_p]; uint16_t i_p5 = interleaver[i*8+5-w_offset_p];
uint32_t i_p6 = interleaver[i*8+6-w_offset_p]; uint16_t i_p6 = interleaver[i*8+6-w_offset_p];
uint32_t i_p7 = interleaver[i*8+7-w_offset_p]; uint16_t i_p7 = interleaver[i*8+7-w_offset_p];
uint8_t out0 = (input[i_p0/8] & mask[i_p0%8])?mask[0]:0; uint8_t out0 = (input[i_p0/8] & mask[i_p0%8])?mask[0]:0;
uint8_t out1 = (input[i_p1/8] & mask[i_p1%8])?mask[1]:0; uint8_t out1 = (input[i_p1/8] & mask[i_p1%8])?mask[1]:0;
@ -77,7 +77,7 @@ void srslte_bit_interleave_w_offset(uint8_t *input, uint8_t *output, uint32_t *i
output[i] = out0 | out1 | out2 | out3 | out4 | out5 | out6 | out7; output[i] = out0 | out1 | out2 | out3 | out4 | out5 | out6 | out7;
} }
for (uint32_t j=0;j<nof_bits%8;j++) { for (uint32_t j=0;j<nof_bits%8;j++) {
uint32_t i_p = interleaver[(nof_bits/8)*8+j-w_offset]; uint16_t i_p = interleaver[(nof_bits/8)*8+j-w_offset];
if (input[i_p/8] & mask[i_p%8]) { if (input[i_p/8] & mask[i_p%8]) {
output[nof_bits/8] |= mask[j]; output[nof_bits/8] |= mask[j];
} else { } else {
@ -85,7 +85,7 @@ void srslte_bit_interleave_w_offset(uint8_t *input, uint8_t *output, uint32_t *i
} }
} }
for (uint32_t j=0;j<w_offset;j++) { for (uint32_t j=0;j<w_offset;j++) {
uint32_t i_p = interleaver[(nof_bits/8)*8+j-w_offset]; uint16_t i_p = interleaver[(nof_bits/8)*8+j-w_offset];
if (input[i_p/8] & (1<<(7-i_p%8))) { if (input[i_p/8] & (1<<(7-i_p%8))) {
output[nof_bits/8] |= mask[j]; output[nof_bits/8] |= mask[j];
} else { } else {
@ -309,7 +309,6 @@ uint32_t srslte_bit_diff(uint8_t *x, uint8_t *y, int nbits) {
uint32_t errors=0; uint32_t errors=0;
for (int i=0;i<nbits;i++) { for (int i=0;i<nbits;i++) {
if (x[i] != y[i]) { if (x[i] != y[i]) {
//printf("%d, ",i);
errors++; errors++;
} }
} }

2
srslte/lib/utils/src/vector_simd.c
Unescape Escape View File

@ -180,7 +180,7 @@ void srslte_vec_lut_sss_simd(short *x, unsigned short *lut, short *y, uint32_t l
lutVal = _mm_load_si128(lutPtr); lutVal = _mm_load_si128(lutPtr);
for (int i=0;i<8;i++) { for (int i=0;i<8;i++) {
uint16_t x = (uint16_t) _mm_extract_epi16(xVal, i); int16_t x = (int16_t) _mm_extract_epi16(xVal, i);
uint16_t l = (uint16_t) _mm_extract_epi16(lutVal, i); uint16_t l = (uint16_t) _mm_extract_epi16(lutVal, i);
y[l] = x; y[l] = x;
} }

Write Preview
Loading…
Cancel
Save