Update bulk counter HLD (#1029)

* Upgrade bulk counter HLD
* Fix typo

doc/bulk_counter/bulk_counter.md

@@ -23,28 +23,26 @@ PR https://github.com/opencomputeproject/SAI/pull/1352/files introduced new SAI
 - sai_bulk_object_get_stats
 - sai_bulk_object_clear_stats
 
-SONiC flex counter infrastructure shall utilize bulk stats API to gain better performance. This document discusses how to integrate these two new APIs to SONiC. 
+SONiC flex counter infrastructure shall utilize bulk stats API to gain better performance. This document discusses how to integrate these two new APIs to SONiC.
 
 ### Requirements
 
 - Syncd shall use bulk stats APIs based on object type. E.g. for a counter group that queries queue and pg stats, queue stats support bulk while pg stats does not, in that case queue stats shall use bulk API, pg stats shall use non bulk API
-- For a certain object type in a counter group, it shall use bulk stats only if:
-  - The stats capability for each counter IDs shall match the stats mode of the counter group
-  - Each object queries exactly the same counter IDs. (Requirement from function signature of sai_bulk_object_get_stats and sai_bulk_object_clear_stats)
+- For a certain object in a counter group, it shall use bulk stats only if all counter IDs support bulk API
 - Syncd shall automatically fall back to old way if bulk stats APIs are not supported
-- Syncd shall utilize API sai_query_stats_capability to query bulk capability. Syncd shall treat counter as no bulk capability if API sai_query_stats_capability return error except SAI_STATUS_BUFFER_OVERFLOW (SAI_STATUS_BUFFER_OVERFLOW requires a retry with larger buffer)
-- Syncd shall call bulk stats API in flex counter thread and avoid calling it in main thread to make sure main thread only handles short and high priority tasks. (This is the default behavior in flex counter infrastructure)
+- Syncd shall utilize sai_bulk_object_get_stats/sai_bulk_object_clear_stats to query bulk capability. Syncd shall treat counter as no bulk capability if API return error
+- Syncd shall call bulk stats API in flex counter thread and avoid calling it in main thread to make sure main thread only handles short and high priority tasks. (This is the default behavior in current flex counter infrastructure)
 - In phase 1, the change is limited to syncd only, no CLI/swss change. Syncd shall deduce the bulk stats mode according to the stats mode defined in FLEX DB:
   - SAI_STATS_MODE_READ -> SAI_STATS_MODE_BULK_READ
   - SAI_STATS_MODE_READ_AND_CLEAR -> SAI_STATS_MODE_BULK_READ_AND_CLEAR
 
 ### Architecture Design
 
-For each counter group, different statistic type is allowed to chooose bulk or non-bulk API based on SAI capability.
+For each counter group, different statistic type is allowed to choose bulk or non-bulk API based on vendor SAI implementation.
 
 ![architecture](/doc/bulk_counter/bulk_counter.svg).
 
-> Note: In the picture, pg/queue watermark statistic use bulk API and buffer watermark statistic uses non-bulk API. This is just an example to show the design idea. 
+> Note: In the picture, pg/queue watermark statistic use bulk API and buffer watermark statistic uses non-bulk API. This is just an example to show the design idea.
 
 ### High-Level Design
 
@@ -56,43 +54,40 @@ Changes shall be made to sonic-sairedis to support this feature. No CLI change.
 
 ##### Bulk Statistic Context
 
-A new structure shall be added to FlexCounter class. 
+A new structure shall be added to FlexCounter class.
 
 This structure is created because:
 
 - Meet the signature of sai_bulk_object_get_stats and sai_bulk_object_clear_stats
 - Avoid constructing these information each time collecting statistic. The bulk context shall only be updated under below cases:
   - New object join counter group. E.g. adding a new port object.
   - Existing object leave counter group. E.g removing an existing port object.
-  - Other case such as counter IDs is updated by user.
+  - Other case such as counter IDs is updated by upper layer.
 
 ```cpp
 struct BulkStatsContext
 {
     sai_object_type_t object_type;
     std::vector<sai_object_id_t> object_vids;
-    std::vector<sai_object_key_t> object_keys; 
+    std::vector<sai_object_key_t> object_keys;
     std::vector<sai_stat_id_t> counter_ids;
-    std::vector<sai_status_t> statuses;
+    std::vector<sai_status_t> object_statuses;
     std::vector<uint64_t> counters;
-    std::shared_ptr<sai_stat_capability_list_t> stats_capas;
 };
 ```
 - object_type: object type.
-- object_keys: objects that participate the bulk call. E.g. for port, SAI object id value shall be put into sai_object_key_t structure.
+- object_vids: virtual IDs.
+- object_keys: real IDs.
 - counter_ids: SAI statistic IDs that will be queried/cleared by the bulk call.
-- statuses: SAI bulk API return value for each object.
+- object_statuses: SAI bulk API return value for each object.
 - counters: counter values that will be fill by vendor SAI.
-- stats_capas: stats capability for each statitstic IDs for current object type.
 
 The flow of how to updating bulk context will be discussed in following section.
 
-For a given object type, diffrent object instance may support different stats capability, so, a list of BulkStatsContext shall be added to FlexCounter class for each object type.
+For a given object type, different object instance may support different stats capability, so, a map of BulkStatsContext shall be added to FlexCounter class for each object type.
 
 ```cpp
-
-std::vector<BulkStatsContext> m_portBulkContexts;
-std::vector<BulkStatsContext> m_priorityGroupBulkContexts;
+std::map<std::vector<sai_port_stat_t>, BulkStatsContext> m_portBulkContexts;
 ...
 
 ```
@@ -124,7 +119,7 @@ N/A
 
 No extra logic on SONiC side is needed to handle warmboot/fastboot.
 
-- As fastboot dealys all counters querying, this feature does not affect fastboot. 
+- As fastboot delays all counters querying, this feature does not affect fastboot.
 - For warmboot, it is vendor SAI implementation's responsible to make sure that there must be no error if warmboot starts while bulk API is called.
 
 ### Restrictions/Limitations
@@ -135,18 +130,23 @@ No extra logic on SONiC side is needed to handle warmboot/fastboot.
 
 ### Performance Improvement
 
-A rough test has been done on Nvidia platform for queue. 
+A rough test has been done on Nvidia platform for queue.
 
 - Non bulk API: get stats for one queue takes X seconds; get stats for 32 port * 8 queue is 256X seconds;
 - Bulk API: get stats for one queue takes Y seconds; get stats for 32 port * 8 queue is almost Y seconds;
 
-X is almost euqal to Y. So, more object instances, more performance improvement. 
+X is almost equal to Y. So, more object instances, more performance improvement.
 
 ### Testing Requirements/Design
 
 As this feature does not introduce any new function, unit test shall be good enough to cover the code changes and new sonic-mgmt/VS test cases will be added.
 
 #### Unit Test cases
 
-- test_update_bulk_context
-- test_bulk_collect_stats
+- addRemoveBulkCounter
+- counterIdChange
+  - not support bulk -> support bulk
+  - support bulk but counter IDs change
+  - support bulk with different counter IDs
+  - support bulk -> not support bulk
+  - not support bulk but counter IDs change