Error out of counter splitting if group max is zero

include/gpu_performance_api/gpu_perf_api_types.h

@@ -170,6 +170,7 @@ typedef enum
     kGpaStatusErrorLibAlreadyLoaded                 = -41,
     kGpaStatusErrorOtherSessionActive               = -42,
     kGpaStatusErrorException                        = -43,
+    gGpaInvalidCounterGroupData                     = -44,
     kGpaStatusMin                                   = kGpaStatusErrorException,
     kGpaStatusInternal                              = 256,  ///< Status codes used internally within GPUPerfAPI.
 } GpaStatus;

source/gpu_perf_api_counter_generator/gpa_counter_scheduler_base.cc

@@ -308,19 +308,37 @@ GpaStatus GpaCounterSchedulerBase::GetNumRequiredPasses(GpaUInt32* num_required_
     // Add the HW groups max's.
     for (unsigned int i = 0; i < hw_counters->internal_counter_groups_.size(); ++i)
     {
-        max_counters_per_group.push_back(hw_counters->internal_counter_groups_[i].max_active_discrete_counters);
+        auto count = hw_counters->internal_counter_groups_[i].max_active_discrete_counters;
+        if (count == 0)
+        {
+            GPA_LOG_DEBUG_ERROR("ERROR: hardware counter group '%s' has zero for max-counters-per-group", hw_counters->internal_counter_groups_[i].name);
+            return gGpaInvalidCounterGroupData;
+        }
+        max_counters_per_group.push_back(count);
     }
 
     // Add the Additional groups max's.
     for (unsigned int i = 0; i < hw_counters->additional_group_count_; ++i)
     {
-        max_counters_per_group.push_back(hw_counters->additional_groups_[i].max_active_discrete_counters);
+        auto count = hw_counters->additional_groups_[i].max_active_discrete_counters;
+        if (count == 0)
+        {
+            GPA_LOG_DEBUG_ERROR("ERROR: hardware counter additional group '%s' has zero for max-counters-per-group", hw_counters->additional_groups_[i].name);
+            return gGpaInvalidCounterGroupData;
+        }
+        max_counters_per_group.push_back(count);
     }
 
     // TODO: properly handle software groups -- right now, this works because there is only ever a single group defined.
     if (sw_counters->group_count_ == 1)
     {
-        max_counters_per_group.push_back(DoGetNumSoftwareCounters());
+        auto count = DoGetNumSoftwareCounters();
+        if (count == 0)
+        {
+            GPA_LOG_DEBUG_ERROR("ERROR: software counter group has zero for max-counters-per-group");
+            return gGpaInvalidCounterGroupData;
+        }
+        max_counters_per_group.push_back(count);
     }
 
     GpaCounterGroupAccessor accessor(hw_counters->internal_counter_groups_,

source/gpu_perf_api_counter_generator/gpa_split_counters_interfaces.h

@@ -16,10 +16,10 @@
 
 #ifdef DEBUG_PUBLIC_COUNTER_SPLITTER
 #include <sstream>
-#include "gpu_perf_api_common/logging.h"
 #endif
 
 #include "gpu_perf_api_counter_generator/gpa_derived_counter.h"
+#include "gpu_perf_api_common/logging.h"
 
 /// @brief Enum to represent the different SQ shader stages.
 enum GpaSqShaderStage
@@ -390,6 +390,11 @@ class IGpaSplitCounters
         }
 
         unsigned int group_limit = max_counters_per_group[group_index];
+        if (group_limit == 0)
+        {
+            GPA_LOG_DEBUG_ERROR("ERROR: group(%d) count limit is zero", group_index);
+            return false;
+        }
 
         return new_group_used_count <= group_limit;
     }