Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
0ebe4a6a
Commit
0ebe4a6a
authored
Mar 25, 2021
by
sfn
Committed by
Thomas Schlichter
Apr 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend nr_dlsim to test dmrs_config_type 2
parent
fd9fd78a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+3
-2
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+14
-3
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
0ebe4a6a
...
@@ -777,7 +777,8 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int eNB_
...
@@ -777,7 +777,8 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int eNB_
for
(
m
=
s0
;
m
<
(
s0
+
s1
);
m
++
)
{
for
(
m
=
s0
;
m
<
(
s0
+
s1
);
m
++
)
{
if
(((
1
<<
m
)
&
dlsch0
->
harq_processes
[
harq_pid
]
->
dlDmrsSymbPos
)
>
0
)
{
if
(((
1
<<
m
)
&
dlsch0
->
harq_processes
[
harq_pid
]
->
dlDmrsSymbPos
)
>
0
)
{
for
(
uint8_t
aatx
=
0
;
aatx
<
dlsch0
->
harq_processes
[
harq_pid
]
->
Nl
;
aatx
++
)
{
//for MIMO Config: it shall loop over no_layers
ue
->
dmrs_DownlinkConfig
.
pdsch_dmrs_type
=
dlsch0_harq
->
dmrsConfigType
;
//DL channel estimation uses ue->dmrs_DownlinkConfig.pdsch_dmrs_type
for
(
uint8_t
aatx
=
0
;
aatx
<
dlsch0_harq
->
Nl
;
aatx
++
)
{
//for MIMO Config: it shall loop over no_layers
nr_pdsch_channel_estimation
(
ue
,
nr_pdsch_channel_estimation
(
ue
,
proc
,
proc
,
0
/*eNB_id*/
,
0
/*eNB_id*/
,
...
@@ -808,7 +809,7 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int eNB_
...
@@ -808,7 +809,7 @@ int nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int eNB_
uint16_t
first_symbol_with_data
=
s0
;
uint16_t
first_symbol_with_data
=
s0
;
uint32_t
dmrs_data_re
;
uint32_t
dmrs_data_re
;
if
(
ue
->
dmrs_DownlinkConfig
.
pdsch_dmrs_t
ype
==
pdsch_dmrs_type1
)
if
(
dlsch0_harq
->
dmrsConfigT
ype
==
pdsch_dmrs_type1
)
dmrs_data_re
=
12
-
6
*
dlsch0_harq
->
n_dmrs_cdm_groups
;
dmrs_data_re
=
12
-
6
*
dlsch0_harq
->
n_dmrs_cdm_groups
;
else
else
dmrs_data_re
=
12
-
4
*
dlsch0_harq
->
n_dmrs_cdm_groups
;
dmrs_data_re
=
12
-
4
*
dlsch0_harq
->
n_dmrs_cdm_groups
;
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
0ebe4a6a
...
@@ -336,7 +336,7 @@ int main(int argc, char **argv)
...
@@ -336,7 +336,7 @@ int main(int argc, char **argv)
int8_t
enable_ptrs
=
0
;
int8_t
enable_ptrs
=
0
;
int8_t
modify_dmrs
=
0
;
int8_t
modify_dmrs
=
0
;
int8_t
dmrs_arg
[
2
]
=
{
-
1
,
-
1
};
// Invalid values
int8_t
dmrs_arg
[
3
]
=
{
-
1
,
-
1
,
-
1
};
// Invalid values
/* L_PTRS = ptrs_arg[0], K_PTRS = ptrs_arg[1] */
/* L_PTRS = ptrs_arg[0], K_PTRS = ptrs_arg[1] */
int8_t
ptrs_arg
[
2
]
=
{
-
1
,
-
1
};
// Invalid values
int8_t
ptrs_arg
[
2
]
=
{
-
1
,
-
1
};
// Invalid values
...
@@ -594,7 +594,7 @@ int main(int argc, char **argv)
...
@@ -594,7 +594,7 @@ int main(int argc, char **argv)
printf
(
"-q Use 2nd MCS table (256 QAM table) for PDSCH
\n
"
);
printf
(
"-q Use 2nd MCS table (256 QAM table) for PDSCH
\n
"
);
printf
(
"-t Acceptable effective throughput (in percentage)
\n
"
);
printf
(
"-t Acceptable effective throughput (in percentage)
\n
"
);
printf
(
"-T Enable PTRS, arguments list L_PTRS{0,1,2} K_PTRS{2,4}, e.g. -T 2 0 2
\n
"
);
printf
(
"-T Enable PTRS, arguments list L_PTRS{0,1,2} K_PTRS{2,4}, e.g. -T 2 0 2
\n
"
);
printf
(
"-U Change DMRS Config, arguments list DMRS TYPE{0=A,1=B} DMRS AddPos{0:2}
, e.g. -U 2 0 2
\n
"
);
printf
(
"-U Change DMRS Config, arguments list DMRS TYPE{0=A,1=B} DMRS AddPos{0:2}
DMRS ConfType{1:2}, e.g. -U 3 0 2 1
\n
"
);
printf
(
"-P Print DLSCH performances
\n
"
);
printf
(
"-P Print DLSCH performances
\n
"
);
printf
(
"-w Write txdata to binary file (one frame)
\n
"
);
printf
(
"-w Write txdata to binary file (one frame)
\n
"
);
printf
(
"-d number of dlsch threads, 0: no dlsch parallelization
\n
"
);
printf
(
"-d number of dlsch threads, 0: no dlsch parallelization
\n
"
);
...
@@ -1359,6 +1359,7 @@ void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dm
...
@@ -1359,6 +1359,7 @@ void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dm
{
{
int8_t
mapping_type
=
typeA
;
//default value
int8_t
mapping_type
=
typeA
;
//default value
int8_t
add_pos
=
pdsch_dmrs_pos0
;
//default value
int8_t
add_pos
=
pdsch_dmrs_pos0
;
//default value
int8_t
dmrs_config_type
=
pdsch_dmrs_type1
;
//default value
if
(
dmrs_arg
[
0
]
==
0
)
{
if
(
dmrs_arg
[
0
]
==
0
)
{
mapping_type
=
typeA
;
mapping_type
=
typeA
;
}
}
...
@@ -1369,10 +1370,17 @@ void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dm
...
@@ -1369,10 +1370,17 @@ void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dm
if
(
dmrs_arg
[
1
]
>=
0
&&
dmrs_arg
[
1
]
<
3
)
{
if
(
dmrs_arg
[
1
]
>=
0
&&
dmrs_arg
[
1
]
<
3
)
{
add_pos
=
dmrs_arg
[
1
];
add_pos
=
dmrs_arg
[
1
];
}
}
/* DMRS Conf Type 1 or 2 */
if
(
dmrs_arg
[
2
]
>=
1
&&
dmrs_arg
[
2
]
<
3
)
{
dmrs_config_type
=
dmrs_arg
[
2
]
-
1
;
}
if
(
scg
!=
NULL
)
{
if
(
scg
!=
NULL
)
{
NR_BWP_Downlink_t
*
bwp
=
scg
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
0
];
NR_BWP_Downlink_t
*
bwp
=
scg
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
0
];
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
->
dmrs_AdditionalPosition
=
add_pos
;
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
->
dmrs_AdditionalPosition
=
add_pos
;
if
(
dmrs_config_type
==
pdsch_dmrs_type2
)
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
->
dmrs_Type
=
calloc
(
1
,
sizeof
(
*
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
->
dmrs_Type
));
else
bwp
->
bwp_Dedicated
->
pdsch_Config
->
choice
.
setup
->
dmrs_DownlinkForPDSCH_MappingTypeA
->
choice
.
setup
->
dmrs_Type
=
NULL
;
for
(
int
i
=
0
;
i
<
bwp
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
->
list
.
count
;
i
++
)
{
for
(
int
i
=
0
;
i
<
bwp
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
->
list
.
count
;
i
++
)
{
bwp
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
mappingType
=
mapping_type
;
bwp
->
bwp_Common
->
pdsch_ConfigCommon
->
choice
.
setup
->
pdsch_TimeDomainAllocationList
->
list
.
array
[
i
]
->
mappingType
=
mapping_type
;
}
}
...
@@ -1382,6 +1390,9 @@ void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dm
...
@@ -1382,6 +1390,9 @@ void update_dmrs_config(NR_CellGroupConfig_t *scg,PHY_VARS_NR_UE *ue, int8_t* dm
ue
->
PDSCH_Config
.
pdsch_TimeDomainResourceAllocation
[
i
]
->
mappingType
=
mapping_type
;
ue
->
PDSCH_Config
.
pdsch_TimeDomainResourceAllocation
[
i
]
->
mappingType
=
mapping_type
;
}
}
ue
->
dmrs_DownlinkConfig
.
pdsch_dmrs_AdditionalPosition
=
add_pos
;
ue
->
dmrs_DownlinkConfig
.
pdsch_dmrs_AdditionalPosition
=
add_pos
;
if
(
dmrs_config_type
==
pdsch_dmrs_type2
)
ue
->
dmrs_DownlinkConfig
.
pdsch_dmrs_type
=
pdsch_dmrs_type2
;
else
ue
->
dmrs_DownlinkConfig
.
pdsch_dmrs_type
=
pdsch_dmrs_type1
;
}
}
printf
(
"[DLSIM] DMRS Config is modified with Mapping Type %d, Additional Positions %d
\n
"
,
dmrs_arg
[
0
],
dmrs_arg
[
1
]
);
printf
(
"[DLSIM] DMRS Config is modified with Mapping Type %d, Additional Positions %d
Config. Type %d
\n
"
,
dmrs_arg
[
0
],
add_pos
,
dmrs_arg
[
2
]
);
}
}
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