From bb4959adab6c7b954d995e93b6814d2edef55162 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Thu, 3 Jan 2013 16:34:21 +0100 Subject: [PATCH] enforce at least 3RBs per UE in UL of RR scheduler --- src/lte/model/rr-ff-mac-scheduler.cc | 19 ++++- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 83 ++++++++++++++++---- 2 files changed, 82 insertions(+), 20 deletions(-) diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index ff787e79e..ff5584431 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -1345,9 +1345,9 @@ RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched // Divide the remaining resources equally among the active users starting from the subsequent one served last scheduling trigger uint16_t rbPerFlow = (m_cschedCellConfig.m_ulBandwidth) / (nflows + rntiAllocated.size ()); - if (rbPerFlow == 0) + if (rbPerFlow < 3) { - rbPerFlow = 1; // at least 1 rbg per flow (till available resource) + rbPerFlow = 3; // at least 3 rbg per flow (till available resource) to ensure TxOpportunity >= 7 bytes } uint16_t rbAllocated = 0; @@ -1389,6 +1389,12 @@ RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched { // limit to physical resources last resource assignment rbPerFlow = m_cschedCellConfig.m_ulBandwidth - rbAllocated; + // at least 3 rbg per flow to ensure TxOpportunity >= 7 bytes + if (rbPerFlow < 3) + { + // terminate allocation + rbPerFlow = 0; + } } NS_LOG_INFO (this << " try to allocate " << (*it).first); UlDciListElement_s uldci; @@ -1427,11 +1433,18 @@ RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched { // limit to physical resources last resource assignment rbPerFlow = m_cschedCellConfig.m_ulBandwidth - rbAllocated; + // at least 3 rbg per flow to ensure TxOpportunity >= 7 bytes + if (rbPerFlow < 3) + { + // terminate allocation + rbPerFlow = 0; + } } } if (!allocated) { // unable to allocate new resource: finish scheduling + m_nextRntiUl = (*it).first; if (ret.m_dciList.size () > 0) { m_schedSapUser->SchedUlConfigInd (ret); @@ -1520,7 +1533,7 @@ RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched // restart from the first it = m_ceBsrRxed.begin (); } - if (rbAllocated == m_cschedCellConfig.m_ulBandwidth) + if ((rbAllocated == m_cschedCellConfig.m_ulBandwidth) || (rbPerFlow == 0)) { // Stop allocation: no more PRBs m_nextRntiUl = (*it).first; diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc index d39a70118..2605ee417 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -57,8 +57,6 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () : TestSuite ("lte-rr-ff-mac-scheduler", SYSTEM) { NS_LOG_INFO ("creating LenaRrFfMacSchedulerTestCase"); - - AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,7000)); // DOWNLINK- DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 26 -> 2196 -> 2196000 bytes/sec @@ -71,15 +69,25 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () // 1 user -> 25 PRB at Itbs 26 -> 2292 -> 2292000 bytes/sec // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec + // before the patch enforcing min 3 PRBs per UE: // 9 user -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec + // after the patch enforcing min 3 PRBs per UE: + // 9 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/9 UE/TTI -> 246220 bytes/sec + // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec + // 15 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/15 UE/TTI -> 147730 bytes/sec AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,0,2196000,2292000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,0,749000,749000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,0,373000,373000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,0,185000,185000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,0,185000,185000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,0,148000,89000)); + // before the patch enforcing min 3 PRBs per UE: + //AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,0,185000,185000)); + //AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,0,185000,185000)); + //AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,0,148000,89000)); + // after the patch enforcing min 3 PRBs per UE: + AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,0,185000,246220)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,0,185000,184670)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,0,148000,147730)); // DOWNLINK - DISTANCE 3000 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec @@ -92,15 +100,25 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () // 1 user -> 25 PRB at Itbs 18 -> 1239 -> 1239000 bytes/sec // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 bytes/sec // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec + // before the patch enforcing min 3 PRBs per UE: // 9 user -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec + // after the patch enforcing min 3 PRBs per UE: + // 9 users -> 3 PRB at Itbs 18 -> 145 bytes * 8/9 UE/TTI -> 128890 bytes/sec + // 12 users -> 3 PRB at Itbs 18 -> 145 bytes * 8/12 UE/TTI -> 96667 bytes/sec + // 15 users -> 3 PRB at Itbs 18 -> 145 bytes * 8/15 UE/TTI -> 77333 bytes/sec AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,3000,1383000,1239000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,3000,469000,389000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,3000,233000,193000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,3000,113000,97000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,3000,113000,97000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,3000,90400,47000)); + // before the patch enforcing min 3 PRBs per UE: + // AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,3000,113000,97000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,3000,113000,97000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,3000,90400,47000)); + // after the patch enforcing min 3 PRBs per UE: + AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,3000,113000,128890)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,3000,113000,96667)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,3000,90400,77333)); // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec @@ -113,15 +131,25 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () // 1 user -> 25 PRB at Itbs 11 -> 621 -> 621000 bytes/sec // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 bytes/sec // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec + // before the patch enforcing min 3 PRBs per UE: // 9 user -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec + // after the patch enforcing min 3 PRBs per UE: + // 9 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/9 UE/TTI -> 64889 bytes/sec + // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec + // 15 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/15 UE/TTI -> 38993 bytes/sec AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,6000,903000,621000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,6000,309000,201000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,6000,153000,97000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,47000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,47000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,22000)); + // before the patch enforcing min 3 PRBs per UE: + // AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,47000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,47000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,22000)); + // after the patch enforcing min 3 PRBs per UE: + AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,64889)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,48667)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,38993)); // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec @@ -134,15 +162,25 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () // 1 user -> 24 PRB at Itbs 8 -> 437 -> 437000 bytes/sec // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 bytes/sec // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec + // before the patch enforcing min 3 PRBs per UE: // 9 user -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec + // after the patch enforcing min 3 PRBs per UE: + // 9 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/9 UE/TTI -> 43556 bytes/sec + // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec + // 15 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/15 UE/TTI -> 26133 bytes/sec AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,9000,597000,437000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,9000,201000,137000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,9000,97000,67000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,9000,47000,32000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,9000,47000,32000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,9000,37600,15000)); + // before the patch enforcing min 3 PRBs per UE: + // AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,9000,47000,32000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,9000,47000,32000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,9000,37600,15000)); + // after the patch enforcing min 3 PRBs per UE: + AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,9000,47000,43556)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,9000,47000,32667)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,9000,37600,26133)); // DOWNLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213) // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec @@ -155,15 +193,26 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () // 1 user -> 25 PRB at Itbs 6 -> 233 -> 233000 bytes/sec // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 bytes/sec // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec + // before the patch enforcing min 3 PRBs per UE: // 9 user -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec + // after the patch enforcing min 3 PRBs per UE: + // NOTE: MCS 4 was actually found to be used + // 9 users -> 3 PRB at Itbs 4 -> 26 bytes * 8/9 UE/TTI -> 23111 bytes/sec + // 12 users -> 3 PRB at Itbs 4 -> 26 bytes * 8/12 UE/TTI -> 17333 bytes/sec + // 15 users -> 3 PRB at Itbs 4 -> 26 bytes * 8/15 UE/TTI -> 13867 bytes/sec AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,15000,309000,233000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,15000,101000,69000)); AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,15000,49000,32000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,15000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,15000,22000,15000)); - AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,7000)); + // before the patch enforcing min 3 PRBs per UE: + // AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,15000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,15000,22000,15000)); + // AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,7000)); + // after the patch enforcing min 3 PRBs per UE: + AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,23111)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,15000,22000,17333)); + AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,13867)); }