Commit 618bfd66 authored by Florian Kaltenberger's avatar Florian Kaltenberger

adding first version of parallel segments encoder

parent 26d9855a
...@@ -574,5 +574,5 @@ void phy_viterbi_dot11(int8_t *,uint8_t *,uint16_t); ...@@ -574,5 +574,5 @@ void phy_viterbi_dot11(int8_t *,uint8_t *,uint16_t);
//short *ldpc_decoder(short *msgChannel,short block_length,short No_iteration,double rate); //short *ldpc_decoder(short *msgChannel,short block_length,short No_iteration,double rate);
//short *ldpc_encoder(char *test_input,char* channel_input,short block_length,double rate); //short *ldpc_encoder(char *test_input,char* channel_input,short block_length,double rate);
int ldpc_encoder(unsigned char *test_input,unsigned char* channel_input,short block_length,double rate); int ldpc_encoder(unsigned char *test_input,unsigned char* channel_input,short block_length,double rate);
int ldpc_encoder_multi_segment(unsigned char **test_input,unsigned char **channel_input,short block_length,double rate,uint8_t n_segments);
#endif #endif
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
#include <string.h> #include <string.h>
#include <types.h> #include <types.h>
int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Zc,short Kb) int encode_parity_check_part(uint16_t *c,uint16_t *d, short BG,short Zc,short Kb)
{ {
//short *Gen_shift_values; //short *Gen_shift_values;
int i2, i5; int i2, i5;
uint16_t temp; uint16_t temp;
unsigned char *c2; //offset matrix uint16_t *c2; //offset matrix
if (BG==1) if (BG==1)
{ {
...@@ -22,7 +22,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -22,7 +22,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -130,7 +130,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -130,7 +130,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -238,7 +238,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -238,7 +238,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -346,7 +346,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -346,7 +346,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -454,7 +454,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -454,7 +454,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -562,7 +562,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -562,7 +562,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -670,7 +670,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -670,7 +670,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -778,7 +778,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -778,7 +778,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -886,7 +886,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -886,7 +886,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -994,7 +994,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -994,7 +994,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1102,7 +1102,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1102,7 +1102,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1210,7 +1210,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1210,7 +1210,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1318,7 +1318,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1318,7 +1318,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1426,7 +1426,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1426,7 +1426,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1534,7 +1534,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1534,7 +1534,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1642,7 +1642,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1642,7 +1642,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1750,7 +1750,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1750,7 +1750,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1858,7 +1858,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1858,7 +1858,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -1966,7 +1966,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -1966,7 +1966,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2074,7 +2074,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2074,7 +2074,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2182,7 +2182,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2182,7 +2182,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2290,7 +2290,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2290,7 +2290,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2398,7 +2398,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2398,7 +2398,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2506,7 +2506,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2506,7 +2506,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2614,7 +2614,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2614,7 +2614,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2722,7 +2722,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2722,7 +2722,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2830,7 +2830,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2830,7 +2830,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -2938,7 +2938,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -2938,7 +2938,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3046,7 +3046,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3046,7 +3046,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3154,7 +3154,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3154,7 +3154,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3262,7 +3262,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3262,7 +3262,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3370,7 +3370,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3370,7 +3370,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3478,7 +3478,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3478,7 +3478,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3586,7 +3586,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3586,7 +3586,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3694,7 +3694,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3694,7 +3694,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3802,7 +3802,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3802,7 +3802,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -3910,7 +3910,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -3910,7 +3910,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4018,7 +4018,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4018,7 +4018,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4228,7 +4228,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4228,7 +4228,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4336,7 +4336,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4336,7 +4336,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4444,7 +4444,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4444,7 +4444,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4552,7 +4552,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4552,7 +4552,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4660,7 +4660,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4660,7 +4660,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4768,7 +4768,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4768,7 +4768,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4876,7 +4876,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4876,7 +4876,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -4984,7 +4984,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -4984,7 +4984,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -5092,7 +5092,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -5092,7 +5092,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -5200,7 +5200,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -5200,7 +5200,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -5308,7 +5308,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -5308,7 +5308,7 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
for (i5=0; i5 < Kb; i5++) for (i5=0; i5 < Kb; i5++)
{ {
temp = c[i5*Zc]; temp = c[i5*Zc];
memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(unsigned char)); memmove(&c[i5*Zc], &c[i5*Zc+1], (Zc-1)*sizeof(uint16_t));
c[i5*Zc+Zc-1] = temp; c[i5*Zc+Zc-1] = temp;
} }
...@@ -5522,9 +5522,9 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z ...@@ -5522,9 +5522,9 @@ int encode_parity_check_part(unsigned char *c,unsigned char *d, short BG,short Z
int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short block_length,double rate) int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short block_length,double rate)
{ {
unsigned char c[22*384]; //padded input, unpacked, max size uint16_t c[22*384]; //padded input, unpacked, max size
unsigned char d[46*384]; //coded parity part output, unpacked, max size uint16_t d[46*384]; //coded parity part output, unpacked, max size
unsigned char c_extension[16896]; //double size matrix of c uint16_t c_extension[16896]; //double size matrix of c
short BG,Zc,Kb,nrows,ncols; short BG,Zc,Kb,nrows,ncols;
int i,i1; int i,i1;
int no_punctured_columns,removed_bit; int no_punctured_columns,removed_bit;
...@@ -5571,7 +5571,7 @@ int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short bl ...@@ -5571,7 +5571,7 @@ int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short bl
//printf("%d\n",no_punctured_columns); //printf("%d\n",no_punctured_columns);
//printf("%d\n",removed_bit); //printf("%d\n",removed_bit);
// unpack input // unpack input
memset(c,0,sizeof(unsigned char) * ncols * Zc); memset(c,0,sizeof(uint16_t) * ncols * Zc);
for (i=0; i<block_length; i++) for (i=0; i<block_length; i++)
{ {
...@@ -5580,17 +5580,127 @@ int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short bl ...@@ -5580,17 +5580,127 @@ int ldpc_encoder(unsigned char *test_input,unsigned char *channel_input,short bl
c[i]=(test_input[i/8]&(1<<(i&7)))>>(i&7); c[i]=(test_input[i/8]&(1<<(i&7)))>>(i&7);
} }
if ((Zc==128) || (Zc==384)) {
// extend matrix // extend matrix
for (i1=0; i1 < ncols; i1++) for (i1=0; i1 < ncols; i1++)
{ {
memcpy(&c_extension[2*i1*Zc], &c[i1*Zc], Zc*sizeof(unsigned char)); /// change type here memcpy(&c_extension[2*i1*Zc], &c[i1*Zc], Zc*sizeof(uint16_t)); /// change type here
memcpy(&c_extension[(2*i1+1)*Zc], &c[i1*Zc], Zc*sizeof(unsigned char)); memcpy(&c_extension[(2*i1+1)*Zc], &c[i1*Zc], Zc*sizeof(uint16_t));
} }
//parity check part //parity check part
encode_parity_check_part(c_extension, d, BG, Zc, Kb); encode_parity_check_part(c_extension, d, BG, Zc, Kb);
}
else {
//parity check part
encode_parity_check_part(c, d, BG, Zc, Kb);
}
// information part and puncture columns
//memcpy(&channel_input[0], &c[2*Zc], (block_length-2*Zc)*sizeof(uint16_t));
//memcpy(&channel_input[block_length-2*Zc], &d[0], ((nrows-no_punctured_columns) * Zc-removed_bit)*sizeof(uint16_t));
for (i=0;i<(block_length-2*Zc);i++)
channel_input[i] = c[2*Zc+i];
for (i=0;i<((nrows-no_punctured_columns) * Zc-removed_bit);i++)
channel_input[block_length-2*Zc+i] = d[i];
return 0;
}
int ldpc_encoder_multi_segment(unsigned char **test_input,unsigned char **channel_input,short block_length,double rate,uint8_t n_segments)
{
uint16_t c[22*384]; //padded input, unpacked, max size
uint16_t d[68*384]; //coded output, unpacked, max size
uint16_t c_extension[16896]; //double size matrix of c
short BG,Zc,Kb,nrows,ncols;
int i,i1;
int no_punctured_columns,removed_bit;
//Table of possible lifting sizes
short lift_size[51]= {2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,18,20,22,24,26,28,30,32,36,40,44,48,52,56,60,64,72,80,88,96,104,112,120,128,144,160,176,192,208,224,240,256,288,320,352,384};
int j;
//determine number of bits in codeword
//if (block_length>3840)
//{
BG=1;
Kb = 22;
nrows=46; //parity check bits
ncols=22; //info bits
//}
/* else if (block_length<=3840)
{
BG=2;
nrows=42; //parity check bits
ncols=10; // info bits
if (block_length>640)
Kb = 10;
else if (block_length>560)
Kb = 9;
else if (block_length>192)
Kb = 8;
else
Kb = 6;
} */
//find minimum value in all sets of lifting size
for (i1=0; i1 < 51; i1++)
{
if (lift_size[i1] >= (double) block_length/Kb)
{
Zc = lift_size[i1];
//printf("%d\n",Zc);
break;
}
}
// calculate number of punctured bits
no_punctured_columns=(int)((nrows-2)*Zc+block_length-block_length*3)/Zc;
removed_bit=(nrows-no_punctured_columns-2) * Zc+block_length-(int)(block_length*3);
// unpack input
memset(c,0,sizeof(uint16_t) * block_length);
for (i=0; i<block_length; i++)
for (j=0; j<n_segments; j++) {
//c[i] = test_input[i/8]<<(i%8);
//c[i]=c[i]>>7&1;
c[i] |= (test_input[j][i/8]&(1<<(i&7)))>>((i&7)-j);
}
// parity check part
if ((Zc==128) || (Zc==384)) {
// extend matrix
for (i1=0; i1 < ncols; i1++)
{
memcpy(&c_extension[2*i1*Zc], &c[i1*Zc], Zc*sizeof(uint16_t)); /// change type here
memcpy(&c_extension[(2*i1+1)*Zc], &c[i1*Zc], Zc*sizeof(uint16_t));
}
//parity check part
encode_parity_check_part(c_extension, d, BG, Zc, Kb);
}
else {
//parity check part
encode_parity_check_part(c, d, BG, Zc, Kb);
}
/*
// information part and puncture columns // information part and puncture columns
memcpy(&channel_input[0], &c[2*Zc], (block_length-2*Zc)*sizeof(unsigned char)); memcpy(&channel_input[0], &c[2*Zc], (block_length-2*Zc)*sizeof(uint16_t));
memcpy(&channel_input[block_length-2*Zc], &d[0], ((nrows-no_punctured_columns) * Zc-removed_bit)*sizeof(unsigned char)); memcpy(&channel_input[block_length-2*Zc], d, ((nrows-no_punctured_columns) * Zc-removed_bit)*sizeof(uint16_t));
2 * Zc+block_length-(int)(block_length/rate);
*/
for (i=0;i<(block_length-2*Zc);i++)
for (j=0; j<n_segments; j++)
channel_input[j][i] = (c[2*Zc+i]>>j)&1;
for (i=0;i<((nrows-no_punctured_columns) * Zc-removed_bit);i++)
for (j=0; j<n_segments; j++)
channel_input[j][block_length-2*Zc+i] = (d[i]>>j)&1;
return 0; return 0;
} }
...@@ -582,6 +582,7 @@ int dlsch_encoding(PHY_VARS_eNB *eNB, ...@@ -582,6 +582,7 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
unsigned int Kr=0,Kr_bytes,r,r_offset=0; unsigned int Kr=0,Kr_bytes,r,r_offset=0;
unsigned short m=dlsch->harq_processes[harq_pid]->mcs; unsigned short m=dlsch->harq_processes[harq_pid]->mcs;
uint8_t beamforming_mode=0; uint8_t beamforming_mode=0;
uint8_t *d_tmp[MAX_NUM_DLSCH_SEGMENTS];
double rate = 0.33; double rate = 0.33;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_IN); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_IN);
...@@ -647,11 +648,13 @@ int dlsch_encoding(PHY_VARS_eNB *eNB, ...@@ -647,11 +648,13 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
#endif #endif
printf("Encoder: B %d F %d \n",dlsch->harq_processes[harq_pid]->B, dlsch->harq_processes[harq_pid]->F); printf("Encoder: B %d F %d \n",dlsch->harq_processes[harq_pid]->B, dlsch->harq_processes[harq_pid]->F);
#ifdef TD_DECODING
for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) { for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
//if (r<dlsch->harq_processes[harq_pid]->Cminus) if (r<dlsch->harq_processes[harq_pid]->Cminus)
// Kr = dlsch->harq_processes[harq_pid]->Kminus; Kr = dlsch->harq_processes[harq_pid]->Kminus;
//else else
Kr = dlsch->harq_processes[harq_pid]->Kplus; Kr = dlsch->harq_processes[harq_pid]->Kplus;
Kr_bytes = Kr>>3; Kr_bytes = Kr>>3;
...@@ -687,19 +690,6 @@ int dlsch_encoding(PHY_VARS_eNB *eNB, ...@@ -687,19 +690,6 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
printf("Encoding ... iind %d f1 %d, f2 %d\n",iind,f1f2mat_old[iind*2],f1f2mat_old[(iind*2)+1]); printf("Encoding ... iind %d f1 %d, f2 %d\n",iind,f1f2mat_old[iind*2],f1f2mat_old[(iind*2)+1]);
#endif #endif
start_meas(te_stats); start_meas(te_stats);
/*printf("start turbo encoder kr %d kr>>3 %d\n", Kr, Kr>>3);
for (int tbc_counter = 0; tbc_counter< Kr; tbc_counter++){
printf("turbo tbc number %d input %d\n",tbc_counter, dlsch->harq_processes[harq_pid]->c[r][tbc_counter]);
}*/
printf("start encoder kr %d kr>>3 %d rate %.2f\n", Kr, Kr>>3, rate);
for (int tbs_counter = 0; tbs_counter< 8; tbs_counter++){
printf("%d\n", dlsch->harq_processes[harq_pid]->c[r][tbs_counter]);
}
printf("end encoder \n");
#ifdef TD_DECODING
threegpplte_turbo_encoder(dlsch->harq_processes[harq_pid]->c[r], threegpplte_turbo_encoder(dlsch->harq_processes[harq_pid]->c[r],
Kr>>3, Kr>>3,
&dlsch->harq_processes[harq_pid]->d[r][96], &dlsch->harq_processes[harq_pid]->d[r][96],
...@@ -707,38 +697,46 @@ int dlsch_encoding(PHY_VARS_eNB *eNB, ...@@ -707,38 +697,46 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
f1f2mat_old[iind*2], // f1 (see 36121-820, page 14) f1f2mat_old[iind*2], // f1 (see 36121-820, page 14)
f1f2mat_old[(iind*2)+1] // f2 (see 36121-820, page 14) f1f2mat_old[(iind*2)+1] // f2 (see 36121-820, page 14)
); );
stop_meas(te_stats);
}
#else #else
printf("start ldpc encoder\n"); Kr = dlsch->harq_processes[harq_pid]->Kplus;
printf("input %d %d %d %d %d \n", dlsch->harq_processes[harq_pid]->c[r][0], dlsch->harq_processes[harq_pid]->c[r][1], dlsch->harq_processes[harq_pid]->c[r][2],dlsch->harq_processes[harq_pid]->c[r][3], dlsch->harq_processes[harq_pid]->c[r][4]);
Kr_bytes = Kr>>3;
//ldpc_encoder((char*)dlsch->harq_processes[harq_pid]->c[r],(char*)&dlsch->harq_processes[harq_pid]->d[r][96],dlsch->harq_processes[harq_pid]->B,rate);
ldpc_encoder((unsigned char*)dlsch->harq_processes[harq_pid]->c[r],&dlsch->harq_processes[harq_pid]->d[r][96],Kr,rate);
for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
d_tmp[r] = &dlsch->harq_processes[harq_pid]->d[r][96];
#ifdef DEBUG_DLSCH_CODING
printf("start ldpc encoder segment %d/%d\n",r,dlsch->harq_processes[harq_pid]->C);
printf("input %d %d %d %d %d \n", dlsch->harq_processes[harq_pid]->c[r][0], dlsch->harq_processes[harq_pid]->c[r][1], dlsch->harq_processes[harq_pid]->c[r][2],dlsch->harq_processes[harq_pid]->c[r][3], dlsch->harq_processes[harq_pid]->c[r][4]);
#endif
//ldpc_encoder((unsigned char*)dlsch->harq_processes[harq_pid]->c[r],&dlsch->harq_processes[harq_pid]->d[r][96],Kr,rate);
}
start_meas(te_stats);
ldpc_encoder_multi_segment(dlsch->harq_processes[harq_pid]->c,d_tmp,Kr,rate,dlsch->harq_processes[harq_pid]->C);
stop_meas(te_stats);
#endif #endif
printf("end ldpc encoder -- output\n"); /*printf("end ldpc encoder -- output\n");
/*printf("output %d %d %d %d %d \n", dlsch->harq_processes[harq_pid]->d[r][96], dlsch->harq_processes[harq_pid]->d[r][96+1], dlsch->harq_processes[harq_pid]->d[r][96+2],dlsch->harq_processes[harq_pid]->d[r][96+3], dlsch->harq_processes[harq_pid]->d[r][96+4]); printf("output %d %d %d %d %d \n", dlsch->harq_processes[harq_pid]->d[r][96], dlsch->harq_processes[harq_pid]->d[r][96+1], dlsch->harq_processes[harq_pid]->d[r][96+2],dlsch->harq_processes[harq_pid]->d[r][96+3], dlsch->harq_processes[harq_pid]->d[r][96+4]);
for (int cnt =0 ; cnt < 66*(*pz); cnt ++){ for (int cnt =0 ; cnt < 66*(*pz); cnt ++){
printf("%d \n", dlsch->harq_processes[harq_pid]->d[r][96+cnt]); printf("%d \n", dlsch->harq_processes[harq_pid]->d[r][96+cnt]);
}
printf("\n");*/
}
printf("\n");*/
stop_meas(te_stats);
#ifdef DEBUG_DLSCH_CODING #ifdef DEBUG_DLSCH_CODING
write_output("enc_output0.m","enc0",&dlsch->harq_processes[harq_pid]->d[0][96],(3*8*Kr_bytes)+12,1,4);
if (r==0)
write_output("enc_output0.m","enc0",&dlsch->harq_processes[harq_pid]->d[r][96],(3*8*Kr_bytes)+12,1,4);
#endif #endif
start_meas(i_stats); start_meas(i_stats);
dlsch->harq_processes[harq_pid]->RTC[r] = for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
sub_block_interleaving_turbo(4+(Kr_bytes*8), dlsch->harq_processes[harq_pid]->RTC[r] =
&dlsch->harq_processes[harq_pid]->d[r][96], sub_block_interleaving_turbo(4+(Kr_bytes*8),
dlsch->harq_processes[harq_pid]->w[r]); &dlsch->harq_processes[harq_pid]->d[r][96],
dlsch->harq_processes[harq_pid]->w[r]);
}
stop_meas(i_stats); stop_meas(i_stats);
}
} }
......
...@@ -212,11 +212,6 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -212,11 +212,6 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
__m128i *pv = (__m128i*)&z; __m128i *pv = (__m128i*)&z;
__m128i *pl = (__m128i*)&l; __m128i *pl = (__m128i*)&l;
#ifdef DEBUG_DLSCH_DECODING
uint16_t i;
#endif
//#ifdef __AVX2__ //#ifdef __AVX2__
#if 0 #if 0
int Kr_last,skipped_last=0; int Kr_last,skipped_last=0;
...@@ -616,7 +611,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -616,7 +611,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
&pl[0], &pl[0],
llrProcBuf, llrProcBuf,
p_procTime); p_procTime);
ret = no_iteration_ldpc; //ret = no_iteration_ldpc;
nb_total_decod++; nb_total_decod++;
...@@ -652,14 +647,16 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -652,14 +647,16 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
printf(" \n");*/ printf(" \n");*/
#endif #endif
//printf("output decoder %d %d %d %d %d \n", harq_process->c[r][0], harq_process->c[r][1], harq_process->c[r][2],harq_process->c[r][3], harq_process->c[r][4]); #ifdef DEBUG_DLSCH_DECODING
printf("output decoder %d %d %d %d %d \n", harq_process->c[r][0], harq_process->c[r][1], harq_process->c[r][2],harq_process->c[r][3], harq_process->c[r][4]);
printf("no_iterations_ldpc %d\n",no_iteration_ldpc);
#endif
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(dlsch_turbo_decoding_stats); stop_meas(dlsch_turbo_decoding_stats);
#endif #endif
} }
#else #else //1
if ((harq_process->C == 1) || if ((harq_process->C == 1) ||
((r==harq_process->C-1) && (skipped_last==0))) { // last segment with odd number of segments ((r==harq_process->C-1) && (skipped_last==0))) { // last segment with odd number of segments
...@@ -805,7 +802,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue, ...@@ -805,7 +802,7 @@ uint32_t dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
} }
} }
} }
#endif #endif //1
/*printf("Segmentation: C %d r %d, dlsch_rate_unmatching_stats %5.3f dlsch_deinterleaving_stats %5.3f dlsch_turbo_decoding_stats %5.3f \n", /*printf("Segmentation: C %d r %d, dlsch_rate_unmatching_stats %5.3f dlsch_deinterleaving_stats %5.3f dlsch_turbo_decoding_stats %5.3f \n",
harq_process->C, harq_process->C,
......
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