sched: check for max ul grants in UL result

Author: frankist

tests/unittests/scheduler/test_utils/scheduler_test_suite.cpp

@@ -282,11 +282,20 @@ void srsran::test_pdsch_ue_consistency(const cell_configuration& cell_cfg, span<
 
 void srsran::test_pusch_ue_consistency(const cell_configuration& cell_cfg, span<const ul_sched_info> grants)
 {
+  ASSERT_LE(grants.size(), cell_cfg.expert_cfg.ue.max_puschs_per_slot);
+
   for (const ul_sched_info& grant : grants) {
     ASSERT_TRUE(test_helper::is_valid_ul_sched_info(grant));
   }
 }
 
+void srsran::test_pucch_consistency(const cell_configuration& cell_cfg, span<const pucch_info> pucchs)
+{
+  ASSERT_LE(pucchs.size(), cell_cfg.expert_cfg.ue.max_pucchs_per_slot);
+
+  // TODO: Add more checks.
+}
+
 /// \brief Tests the validity of the parameters chosen for the PDCCHs using common search spaces. Checks include:
 /// - PDSCH time resource chosen (k0 and symbols) fall in DL symbols
 /// - UCI delay chosen falls in an UL slot.
@@ -442,8 +451,7 @@ void srsran::test_prach_opportunity_validity(const cell_configuration& cell_cfg,
 
 void srsran::test_ul_resource_grid_collisions(const cell_configuration& cell_cfg, const ul_sched_result& result)
 {
-  cell_slot_resource_grid grid(cell_cfg.ul_cfg_common.freq_info_ul.scs_carrier_list);
-
+  cell_slot_resource_grid      grid(cell_cfg.ul_cfg_common.freq_info_ul.scs_carrier_list);
   std::vector<test_grant_info> ul_grants = get_ul_grants(cell_cfg, result);
   for (const test_grant_info& test_grant : ul_grants) {
     // We do not check for collisions between PUCCHs or between PUCCHs and PRACHs.
@@ -460,20 +468,34 @@ void srsran::test_ul_resource_grid_collisions(const cell_configuration& cell_cfg
   }
 }
 
+void srsran::test_ul_consistency(const cell_configuration& cell_cfg, const ul_sched_result& result)
+{
+  // Check that UL grant limits are respected.
+  ASSERT_LE(result.pucchs.size() + result.puschs.size(), cell_cfg.expert_cfg.ue.max_ul_grants_per_slot);
+
+  ASSERT_NO_FATAL_FAILURE(test_prach_opportunity_validity(cell_cfg, result.prachs));
+  ASSERT_NO_FATAL_FAILURE(test_pusch_ue_consistency(cell_cfg, result.puschs));
+  ASSERT_NO_FATAL_FAILURE(test_pucch_consistency(cell_cfg, result.pucchs));
+  ASSERT_NO_FATAL_FAILURE(test_ul_resource_grid_collisions(cell_cfg, result));
+}
+
+void srsran::test_dl_consistency(const cell_configuration& cell_cfg, slot_point sl_tx, const dl_sched_result& result)
+{
+  ASSERT_NO_FATAL_FAILURE(test_pdsch_sib_consistency(cell_cfg, result.bc.sibs));
+  ASSERT_NO_FATAL_FAILURE(test_pdsch_rar_consistency(cell_cfg, result.rar_grants));
+  ASSERT_NO_FATAL_FAILURE(test_pdsch_ue_consistency(cell_cfg, result.ue_grants));
+  ASSERT_NO_FATAL_FAILURE(test_pdcch_common_consistency(cell_cfg, sl_tx, result.dl_pdcchs));
+  ASSERT_NO_FATAL_FAILURE(test_dl_resource_grid_collisions(cell_cfg, result));
+}
+
 void srsran::test_scheduler_result_consistency(const cell_configuration& cell_cfg,
                                                slot_point                sl_tx,
                                                const sched_result&       result)
 {
   ASSERT_TRUE(result.success);
   ASSERT_NO_FATAL_FAILURE(assert_tdd_pattern_consistency(cell_cfg, sl_tx, result));
-  ASSERT_NO_FATAL_FAILURE(test_pdsch_sib_consistency(cell_cfg, result.dl.bc.sibs));
-  ASSERT_NO_FATAL_FAILURE(test_prach_opportunity_validity(cell_cfg, result.ul.prachs));
-  ASSERT_NO_FATAL_FAILURE(test_pdsch_rar_consistency(cell_cfg, result.dl.rar_grants));
-  ASSERT_NO_FATAL_FAILURE(test_pdsch_ue_consistency(cell_cfg, result.dl.ue_grants));
-  ASSERT_NO_FATAL_FAILURE(test_pusch_ue_consistency(cell_cfg, result.ul.puschs));
-  ASSERT_NO_FATAL_FAILURE(test_pdcch_common_consistency(cell_cfg, sl_tx, result.dl.dl_pdcchs));
-  ASSERT_NO_FATAL_FAILURE(test_dl_resource_grid_collisions(cell_cfg, result.dl));
-  ASSERT_NO_FATAL_FAILURE(test_ul_resource_grid_collisions(cell_cfg, result.ul));
+  ASSERT_NO_FATAL_FAILURE(test_dl_consistency(cell_cfg, sl_tx, result.dl));
+  ASSERT_NO_FATAL_FAILURE(test_ul_consistency(cell_cfg, result.ul));
 }
 
 /// \brief Verifies that the cell resource grid PRBs and symbols was filled with the allocated PDSCHs.

tests/unittests/scheduler/test_utils/scheduler_test_suite.h

@@ -64,9 +64,14 @@ void test_pdsch_rar_consistency(const cell_configuration& cell_cfg, span<const r
 void test_pdsch_ue_consistency(const cell_configuration& cell_cfg, span<const dl_msg_alloc> ue_grants);
 
 /// \brief Verify UE PUSCH content is valid. Current checks:
+/// - Number of PUSCHs does not exceed max_puschs_per_slot.
 /// - PRBs fall within BWP boundaries.
 void test_pusch_ue_consistency(const cell_configuration& cell_cfg, span<const ul_sched_info> ue_grants);
 
+/// \brief Verify UE PUCCH content is valid. Current checks:
+/// - Number of PUCCHs does not exceed max_pucchs_per_slot.
+void test_pucch_consistency(const cell_configuration& cell_cfg, span<const pucch_info> pucchs);
+
 /// \brief Current checks:
 /// - PRACH occasions parameters match RACH-ConfigCommon present in cell_cfg.
 /// \param cell_cfg Cell configuration.
@@ -79,6 +84,14 @@ void test_dl_resource_grid_collisions(const cell_configuration& cell_cfg, const
 /// \brief Detects collisions in the "RB x symbol" UL resource grid.
 void test_ul_resource_grid_collisions(const cell_configuration& cell_cfg, const ul_sched_result& result);
 
+/// \brief Detects inconsistencies in the whole UL scheduling result. This function calls other more specific UL
+/// validity checks.
+void test_ul_consistency(const cell_configuration& cell_cfg, const ul_sched_result& result);
+
+/// \brief Detects inconsistencies in the whole DL scheduling result. This function calls other more specific DL
+/// validity checks.
+void test_dl_consistency(const cell_configuration& cell_cfg, slot_point sl_tx, const dl_sched_result& result);
+
 /// \brief Run all consistency checks for the scheduler result.
 void test_scheduler_result_consistency(const cell_configuration& cell_cfg,
                                        slot_point                sl_tx,