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
wangjie
OpenXG-RAN
Commits
6a0b2c63
Commit
6a0b2c63
authored
Apr 12, 2021
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BLER configuration for upper limit of 2nd retx
parent
b3df605f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
6 deletions
+22
-6
openair2/GNB_APP/MACRLC_nr_paramdef.h
openair2/GNB_APP/MACRLC_nr_paramdef.h
+3
-0
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+16
-6
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+2
-0
No files found.
openair2/GNB_APP/MACRLC_nr_paramdef.h
View file @
6a0b2c63
...
...
@@ -57,6 +57,7 @@
#define CONFIG_STRING_MACRLC_REMOTE_S_PORTD "remote_s_portd"
#define CONFIG_STRING_MACRLC_DL_BLER_TARGET_UPPER "dl_bler_target_upper"
#define CONFIG_STRING_MACRLC_DL_BLER_TARGET_LOWER "dl_bler_target_lower"
#define CONFIG_STRING_MACRLC_DL_RD2_BLER_THRESHOLD "dl_rd2_bler_threshold"
/*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
...
...
@@ -83,6 +84,7 @@
{CONFIG_STRING_MACRLC_REMOTE_S_PORTD, NULL, 0, uptr:NULL, defintval:50021, TYPE_UINT, 0}, \
{CONFIG_STRING_MACRLC_DL_BLER_TARGET_UPPER, "Upper threshold of BLER to decrease DL MCS", 0, dblptr:NULL, defdblval:0.15, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_DL_BLER_TARGET_LOWER, "Lower threshold of BLER to increase DL MCS", 0, dblptr:NULL, defdblval:0.05, TYPE_DOUBLE, 0}, \
{CONFIG_STRING_MACRLC_DL_RD2_BLER_THRESHOLD, "Threshold of RD2/RETX2 BLER to decrease DL MCS", 0, dblptr:NULL, defdblval:0.01, TYPE_DOUBLE, 0}, \
}
#define MACRLC_CC_IDX 0
#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1
...
...
@@ -103,5 +105,6 @@
#define MACRLC_REMOTE_S_PORTD_IDX 16
#define MACRLC_DL_BLER_TARGET_UPPER_IDX 17
#define MACRLC_DL_BLER_TARGET_LOWER_IDX 18
#define MACRLC_DL_RD2_BLER_THRESHOLD_IDX 19
/*---------------------------------------------------------------------------------------------------------------------------------------------------------*/
#endif
openair2/GNB_APP/gnb_config.c
View file @
6a0b2c63
...
...
@@ -670,6 +670,7 @@ void RCconfig_nr_macrlc() {
RC
.
nrmac
[
j
]
->
dl_bler_target_upper
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_DL_BLER_TARGET_UPPER_IDX
].
dblptr
);
RC
.
nrmac
[
j
]
->
dl_bler_target_lower
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_DL_BLER_TARGET_LOWER_IDX
].
dblptr
);
RC
.
nrmac
[
j
]
->
dl_rd2_bler_threshold
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_DL_RD2_BLER_THRESHOLD_IDX
].
dblptr
);
}
// for (j=0;j<RC.nb_nr_macrlc_inst;j++)
}
else
{
// MacRLC_ParamList.numelt > 0
AssertFatal
(
0
,
"No "
CONFIG_STRING_MACRLC_LIST
" configuration found"
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
6a0b2c63
...
...
@@ -419,6 +419,7 @@ int get_mcs_from_bler(module_id_t mod_id, int CC_id, frame_t frame, sub_frame_t
bler_stats
->
last_frame_slot
=
frame
*
n
+
slot
;
bler_stats
->
mcs
=
9
;
bler_stats
->
bler
=
(
nrmac
->
dl_bler_target_lower
+
nrmac
->
dl_bler_target_upper
)
/
2
;
bler_stats
->
rd2_bler
=
nrmac
->
dl_rd2_bler_threshold
;
}
const
int
now
=
frame
*
n
+
slot
;
int
diff
=
now
-
bler_stats
->
last_frame_slot
;
...
...
@@ -433,20 +434,29 @@ int get_mcs_from_bler(module_id_t mod_id, int CC_id, frame_t frame, sub_frame_t
const
NR_mac_stats_t
*
stats
=
&
nrmac
->
UE_info
.
mac_stats
[
UE_id
];
const
int
dtx
=
stats
->
dlsch_rounds
[
0
]
-
bler_stats
->
dlsch_rounds
[
0
];
const
int
dretx
=
stats
->
dlsch_rounds
[
1
]
-
bler_stats
->
dlsch_rounds
[
1
];
const
int
dretx2
=
stats
->
dlsch_rounds
[
2
]
-
bler_stats
->
dlsch_rounds
[
2
];
const
float
bler_window
=
dtx
>
0
?
(
float
)
dretx
/
dtx
:
bler_stats
->
bler
;
const
float
rd2_bler_wnd
=
dtx
>
0
?
(
float
)
dretx2
/
dtx
:
bler_stats
->
rd2_bler
;
bler_stats
->
bler
=
BLER_FILTER
*
bler_stats
->
bler
+
(
1
-
BLER_FILTER
)
*
bler_window
;
bler_stats
->
rd2_bler
=
BLER_FILTER
/
4
*
bler_stats
->
rd2_bler
+
(
1
-
BLER_FILTER
/
4
)
*
rd2_bler_wnd
;
int
new_mcs
=
old_mcs
;
if
(
bler_stats
->
bler
<
nrmac
->
dl_bler_target_lower
&&
old_mcs
<
25
&&
dtx
>
9
)
new_mcs
+=
1
;
else
if
(
bler_stats
->
bler
>
nrmac
->
dl_bler_target_upper
&&
old_mcs
>
6
)
new_mcs
-=
1
;
// else we are within threshold boundaries
/* first ensure that number of 2nd retx is below threshold. If this is the
* case, use 1st retx to adjust faster */
if
(
bler_stats
->
rd2_bler
>
nrmac
->
dl_rd2_bler_threshold
&&
old_mcs
>
6
)
{
new_mcs
-=
2
;
}
else
if
(
bler_stats
->
rd2_bler
<
nrmac
->
dl_rd2_bler_threshold
)
{
if
(
bler_stats
->
bler
<
nrmac
->
dl_bler_target_lower
&&
old_mcs
<
25
&&
dtx
>
9
)
new_mcs
+=
1
;
else
if
(
bler_stats
->
bler
>
nrmac
->
dl_bler_target_upper
&&
old_mcs
>
6
)
new_mcs
-=
1
;
// else we are within threshold boundaries
}
bler_stats
->
last_frame_slot
=
now
;
bler_stats
->
mcs
=
new_mcs
;
memcpy
(
bler_stats
->
dlsch_rounds
,
stats
->
dlsch_rounds
,
sizeof
(
stats
->
dlsch_rounds
));
LOG_D
(
MAC
,
"%4d.%2d MCS %d -> %d (dtx %d, dretx %d, BLER wnd %.3f avg %.6f
)
\n
"
,
frame
,
slot
,
old_mcs
,
new_mcs
,
dtx
,
dretx
,
bler_window
,
bler_stats
->
bler
);
LOG_D
(
MAC
,
"%4d.%2d MCS %d -> %d (dtx %d, dretx %d, BLER wnd %.3f avg %.6f
, dretx2 %d, RD2 BLER wnd %.3f avg %.6f)
\n
"
,
frame
,
slot
,
old_mcs
,
new_mcs
,
dtx
,
dretx
,
bler_window
,
bler_stats
->
bler
,
dretx2
,
rd2_bler_wnd
,
bler_stats
->
rd2_
bler
);
return
new_mcs
;
}
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
6a0b2c63
...
...
@@ -416,6 +416,7 @@ typedef struct NR_UE_harq {
typedef
struct
NR_DL_bler_stats
{
frame_t
last_frame_slot
;
float
bler
;
float
rd2_bler
;
uint8_t
mcs
;
int
dlsch_rounds
[
8
];
}
NR_DL_bler_stats_t
;
...
...
@@ -741,6 +742,7 @@ typedef struct gNB_MAC_INST_s {
double
dl_bler_target_upper
;
double
dl_bler_target_lower
;
double
dl_rd2_bler_threshold
;
}
gNB_MAC_INST
;
#endif
/*__LAYER2_NR_MAC_GNB_H__ */
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