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
littleBu
OpenXG-RAN
Commits
90047871
Commit
90047871
authored
Feb 10, 2025
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
group two symbol loops to make one with smaller tsack size and smaller variables
parent
f73afa39
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
132 additions
and
140 deletions
+132
-140
openair1/PHY/MODULATION/nr_modulation.c
openair1/PHY/MODULATION/nr_modulation.c
+5
-9
openair1/PHY/MODULATION/nr_modulation.h
openair1/PHY/MODULATION/nr_modulation.h
+8
-12
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+119
-119
No files found.
openair1/PHY/MODULATION/nr_modulation.c
View file @
90047871
...
...
@@ -276,7 +276,7 @@ void nr_layer_mapping(int nbCodes,
for
(
int
i2
=
((
n_symbs
>>
4
)
<<
4
);
i2
<
n_symbs
;
i2
+=
2
)
{
tx_layers
[
0
][
i2
>>
1
]
=
mod_symbs
[
0
][
i2
];
tx_layers
[
1
][
i2
>>
1
]
=
mod_symbs
[
0
][
i2
+
1
];
}
}
}
#else
for
(
i
=
0
;
i
<
n_symbs
;
i
+=
32
)
{
...
...
@@ -738,30 +738,26 @@ c16_t nr_layer_precoder(int sz, c16_t datatx_F_precoding[][sz], const char *prec
}
c16_t
nr_layer_precoder_cm
(
int
n_layers
,
int
n_symbols
,
int
symSz
,
c16_t
datatx_F_precoding
[
n_layers
][
n_symbols
][
symSz
],
c16_t
datatx_F_precoding
[
n_layers
][
symSz
],
int
ap
,
nfapi_nr_pm_pdu_t
*
pmi_pdu
,
int
symbol
,
int
offset
)
{
c16_t
precodatatx_F
=
{
0
};
for
(
int
al
=
0
;
al
<
n_layers
;
al
++
)
{
nfapi_nr_pm_weights_t
*
w
=
&
pmi_pdu
->
weights
[
al
][
ap
];
c16_t
prec_weight
=
{.
r
=
w
->
precoder_weight_Re
,
.
i
=
w
->
precoder_weight_Im
};
precodatatx_F
=
c16maddShift
(
datatx_F_precoding
[
al
][
symbol
][
offset
],
prec_weight
,
precodatatx_F
,
15
);
precodatatx_F
=
c16maddShift
(
datatx_F_precoding
[
al
][
offset
],
prec_weight
,
precodatatx_F
,
15
);
}
return
precodatatx_F
;
}
void
nr_layer_precoder_simd
(
const
int
n_layers
,
const
int
n_symbols
,
const
int
symSz
,
const
c16_t
txdataF_res_mapped
[
n_layers
][
n_symbols
][
symSz
],
const
c16_t
txdataF_res_mapped
[
n_layers
][
symSz
],
const
int
ant
,
const
nfapi_nr_pm_pdu_t
*
pmi_pdu
,
const
int
symbol
,
const
int
sc_offset
,
const
int
re_cnt
,
c16_t
*
txdataF_precoded
)
...
...
@@ -811,7 +807,7 @@ void nr_layer_precoder_simd(const int n_layers,
#ifdef DEBUG_DLSCH_PRECODING_PRINT_WITH_TRIVIAL // Get result with trivial solution, TODO: To be removed
c16_t
y_triv
[
4
];
for
(
int
i
=
0
;
i
<
4
;
i
++
)
y_triv
[
i
]
=
nr_layer_precoder_cm
(
n_layers
,
NR_SYMBOLS_PER_SLOT
,
symSz
,
txdataF_res_mapped
,
ant
,
pmi_pdu
,
symbol
,
sc
+
i
);
y_triv
[
i
]
=
nr_layer_precoder_cm
(
n_layers
,
symSz
,
txdataF_res_mapped
,
ant
,
pmi_pdu
,
sc
+
i
);
memcpy
(
&
txdataF_precoded
[
sc
],
y_triv
,
sizeof
(
y_triv
));
#endif
...
...
openair1/PHY/MODULATION/nr_modulation.h
View file @
90047871
...
...
@@ -135,12 +135,10 @@ void apply_nr_rotation_RX(const NR_DL_FRAME_PARMS *frame_parms,
c16_t
nr_layer_precoder
(
int
sz
,
c16_t
datatx_F_precoding
[][
sz
],
const
char
*
prec_matrix
,
uint8_t
n_layers
,
int32_t
re_offset
);
c16_t
nr_layer_precoder_cm
(
int
n_layers
,
int
n_symbols
,
int
symSz
,
c16_t
datatx_F_precoding
[
n_layers
][
n_symbols
][
symSz
],
c16_t
datatx_F_precoding
[
n_layers
][
symSz
],
int
ap
,
nfapi_nr_pm_pdu_t
*
pmi_pdu
,
int
symbol
,
int
offset
);
/*! \brief Precoding with SIMDe, txdataF_precoded[] = prec_matrix[] * txdataF_res_mapped[]
...
...
@@ -150,13 +148,11 @@ c16_t nr_layer_precoder_cm(int n_layers,
@param[out] txdataF_precoded Precoded antenna data
*/
void
nr_layer_precoder_simd
(
const
int
n_layers
,
const
int
n_symbols
,
const
int
symSz
,
const
c16_t
txdataF_res_mapped
[
n_layers
][
n_symbols
][
symSz
],
const
int
ant
,
const
nfapi_nr_pm_pdu_t
*
pmi_pdu
,
const
int
symbol
,
const
int
sc_offset
,
const
int
re_cnt
,
c16_t
*
txdataF_precoded
);
const
int
symSz
,
const
c16_t
txdataF_res_mapped
[
n_layers
][
symSz
],
const
int
ant
,
const
nfapi_nr_pm_pdu_t
*
pmi_pdu
,
const
int
sc_offset
,
const
int
re_cnt
,
c16_t
*
txdataF_precoded
);
#endif
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
View file @
90047871
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