sched: compute k1 taking into account nof. DL symbols in special slot

Author: herlesupreeth

lib/scheduler/config/serving_cell_config_factory.cpp

@@ -67,8 +67,7 @@ static_vector<uint8_t, 8> srsran::config_helpers::generate_k1_candidates(const t
   static_vector<uint8_t, 8>         result;
   for (unsigned idx = 0; idx < nof_slots_per_tdd_period(tdd_cfg); ++idx) {
     // For every slot containing DL symbols check for corresponding k1 value.
-    // TODO: Consider partial DL slots when scheduler supports it.
-    if (get_active_tdd_dl_symbols(tdd_cfg, idx, cp).length() == get_nsymb_per_slot(cp)) {
+    if (get_active_tdd_dl_symbols(tdd_cfg, idx, cp).length() > 0) {
       for (const auto k1 : valid_k1_values) {
         // TODO: Consider partial UL slots when scheduler supports it.
         if (not result.full() and get_active_tdd_ul_symbols(tdd_cfg, idx + k1, cp).length() == get_nsymb_per_slot(cp)) {

tests/unittests/scheduler/scheduler_tdd_test.cpp

@@ -122,7 +122,6 @@ TEST_P(scheduler_dl_tdd_tester, all_dl_slots_are_scheduled)
     this->run_slot();
 
     // For every DL slot.
-    // Note: Skip special slots in test for now.
     if (cell_cfg_list[0].is_dl_enabled(this->last_result_slot())) {
       // Ensure UE PDSCH allocations are made.
       ASSERT_FALSE(this->last_sched_res->dl.ue_grants.empty())
@@ -193,7 +192,8 @@ INSTANTIATE_TEST_SUITE_P(
         // clang-format off
 // csi_enabled, {ref_scs, pattern1={slot_period, DL_slots, DL_symbols, UL_slots, UL_symbols}, pattern2={...}}
   tdd_test_params{true,  {subcarrier_spacing::kHz30, {10, 6, 5, 3, 4}, nullopt}},
-  tdd_test_params{true,  {subcarrier_spacing::kHz30, {10, 7, 5, 2, 4}, nullopt}},
+  tdd_test_params{false,  {subcarrier_spacing::kHz30, {10, 7, 5, 2, 4}, nullopt}},
+  // tdd_test_params{true,  {subcarrier_spacing::kHz30, {10, 7, 5, 2, 4}, nullopt}}, // Not enough space in PUCCH.
   // tdd_test_params{false, {subcarrier_spacing::kHz30, {10, 8, 5, 1, 4}, nullopt}}, // Not enough space in PUCCH.
   tdd_test_params{false, {subcarrier_spacing::kHz30, {6, 3, 5, 2, 0}, tdd_ul_dl_pattern{4, 4, 0, 0, 0}}}));
   // TODO: Support more TDD patterns.

tests/unittests/scheduler/test_utils/scheduler_test_bench.h

@@ -37,6 +37,7 @@ class scheduler_test_bench
     next_slot(to_numerology_value(max_scs), test_rgen::uniform_int<unsigned>(0, 10239))
   {
     logger.set_context(next_slot.sfn(), next_slot.slot_index());
+    srslog::flush();
   }
 
   slot_point next_slot_rx() const { return next_slot - tx_rx_delay; }