Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG-RAN
Commits
bc158e4c
Commit
bc158e4c
authored
3 years ago
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing asan leaks after merge
parent
43ea92bf
Branches unavailable
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
2023.w09
2023.w08
2023.w08b
2023.w07
2023.w06
2023.w05
2023.w03
2023.w02
2022.42
2022.41
2022.w51
2022.w50
2022.w49
2022.w48
2022.w47
2022.w46
2022.w45
2022.w43
2022.w42
2022.w42b
2022.w41
2022.w40
2022.w39
2022.w38
2022.w37
2022.w37b
2022.w36
2022.w35
2022.w33
2022.w32
2022.w31
2022.w31b
2022.w30
2022.w29
2022.w26
2022.w25
2022.w24
2022.w24b
2022.w23
2022.w22
2022.w21
2022.w20
2022.w19
2022.w18
2022.w17
2022.w15
2022.w15b
2022.w14a
2022.w13
2022.w13b
2022.w13a
2022.w12
flexran-eol
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
14 deletions
+13
-14
openair1/PHY/INIT/nr_init_ue.c
openair1/PHY/INIT/nr_init_ue.c
+4
-3
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+7
-9
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+1
-1
openair1/PHY/NR_TRANSPORT/nr_scrambling.c
openair1/PHY/NR_TRANSPORT/nr_scrambling.c
+1
-1
No files found.
openair1/PHY/INIT/nr_init_ue.c
View file @
bc158e4c
...
...
@@ -165,9 +165,10 @@ void phy_init_nr_ue_PUSCH(NR_UE_PUSCH *const pusch,
}
}
void
phy_term_nr_ue_PUSCH
(
NR_UE_PUSCH
*
pusch
)
void
phy_term_nr_ue_PUSCH
(
NR_UE_PUSCH
*
pusch
,
const
NR_DL_FRAME_PARMS
*
fp
)
{
for
(
int
i
=
0
;
i
<
NR_MAX_NB_LAYERS
;
i
++
)
for
(
int
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
free_and_zero
(
pusch
->
txdataF_layers
[
i
]);
}
...
...
@@ -513,7 +514,7 @@ void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
for
(
int
th_id
=
0
;
th_id
<
RX_NB_TH_MAX
;
th_id
++
)
{
for
(
int
gNB_id
=
0
;
gNB_id
<
ue
->
n_connected_gNB
;
gNB_id
++
)
{
phy_term_nr_ue_PUSCH
(
ue
->
pusch_vars
[
th_id
][
gNB_id
]);
phy_term_nr_ue_PUSCH
(
ue
->
pusch_vars
[
th_id
][
gNB_id
]
,
fp
);
free_and_zero
(
ue
->
pusch_vars
[
th_id
][
gNB_id
]);
free_and_zero
(
ue
->
pucch_vars
[
th_id
][
gNB_id
]);
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
View file @
bc158e4c
...
...
@@ -98,7 +98,7 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
uint16_t
nb_re
=
((
12
*
rel15
->
NrOfSymbols
)
-
nb_re_dmrs
*
dmrs_len
-
xOverhead
)
*
rel15
->
rbSize
*
rel15
->
nrOfLayers
;
uint8_t
Qm
=
rel15
->
qamModOrder
[
0
];
uint32_t
encoded_length
=
nb_re
*
Qm
;
uint32_t
scrambled_output
[
rel15
->
NrOfCodewords
][
encoded_length
>>
5
];
uint32_t
scrambled_output
[
rel15
->
NrOfCodewords
][
(
encoded_length
>>
5
)
+
1
];
int16_t
mod_dmrs
[
n_dmrs
<<
1
]
__attribute__
((
aligned
(
16
)));
/* PTRS */
...
...
@@ -120,8 +120,8 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
/// CRC, coding, interleaving and rate matching
AssertFatal
(
harq
->
pdu
!=
NULL
,
"harq->pdu is null
\n
"
);
unsigned
char
output
[
rel15
->
rbSize
*
NR_SYMBOLS_PER_SLOT
*
NR_NB_SC_PER_RB
*
8
*
rel15
->
nrOfLayers
]
__attribute__
((
aligned
(
32
)));
bzero
(
output
,
rel15
->
rbSize
*
NR_SYMBOLS_PER_SLOT
*
NR_NB_SC_PER_RB
*
8
*
rel15
->
nrOfLayers
);
unsigned
char
output
[
rel15
->
rbSize
*
NR_SYMBOLS_PER_SLOT
*
NR_NB_SC_PER_RB
*
Qm
*
rel15
->
nrOfLayers
]
__attribute__
((
aligned
(
32
)));
bzero
(
output
,
rel15
->
rbSize
*
NR_SYMBOLS_PER_SLOT
*
NR_NB_SC_PER_RB
*
Qm
*
rel15
->
nrOfLayers
);
start_meas
(
dlsch_encoding_stats
);
if
(
nr_dlsch_encoding
(
gNB
,
...
...
@@ -146,20 +146,18 @@ void nr_generate_pdsch(processingData_L1tx_t *msgTx,
}
printf
(
"
\n
"
);
#endif
/// scrambling
start_meas
(
dlsch_scrambling_stats
);
for
(
int
q
=
0
;
q
<
rel15
->
NrOfCodewords
;
q
++
)
memset
((
void
*
)
scrambled_output
[
q
],
0
,
(
encoded_length
>>
5
)
*
sizeof
(
uint32_t
));
for
(
int
q
=
0
;
q
<
rel15
->
NrOfCodewords
;
q
++
)
for
(
int
q
=
0
;
q
<
rel15
->
NrOfCodewords
;
q
++
)
{
memset
((
void
*
)
scrambled_output
[
q
],
0
,
((
encoded_length
>>
5
)
+
1
)
*
sizeof
(
uint32_t
));
nr_pdsch_codeword_scrambling
(
output
,
encoded_length
,
q
,
rel15
->
dataScramblingId
,
rel15
->
rnti
,
scrambled_output
[
q
]);
}
stop_meas
(
dlsch_scrambling_stats
);
#ifdef DEBUG_DLSCH
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
View file @
bc158e4c
...
...
@@ -83,7 +83,7 @@ void free_gNB_dlsch(NR_gNB_DLSCH_t **dlschptr,
for
(
int
q
=
0
;
q
<
nb_codewords
;
q
++
)
free
(
dlsch
->
mod_symbs
[
q
]);
for
(
int
layer
=
0
;
layer
<
NR_MAX_NB_LAYERS
;
layer
++
)
{
for
(
int
layer
=
0
;
layer
<
max_layers
;
layer
++
)
{
free
(
dlsch
->
txdataF
[
layer
]);
for
(
int
aa
=
0
;
aa
<
64
;
aa
++
)
free
(
dlsch
->
ue_spec_bf_weights
[
layer
][
aa
]);
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_TRANSPORT/nr_scrambling.c
View file @
bc158e4c
...
...
@@ -40,7 +40,7 @@ void nr_codeword_scrambling(uint8_t *in,
__m256i
c
=
((
__m256i
*
)
in
)[
i
];
uint32_t
in32
=
_mm256_movemask_epi8
(
_mm256_slli_epi16
(
c
,
7
));
out
[
i
]
=
(
in32
^
s
);
//printf(
"in[%d] %x => %x\n",i,in32,out[i]);
LOG_D
(
PHY
,
"in[%d] %x => %x
\n
"
,
i
,
in32
,
out
[
i
]);
s
=
lte_gold_generic
(
&
x1
,
&
x2
,
0
);
}
#elif defined(__SSE4__)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment