Code migration and include fixes (#830)

* Migrating code/reformatting

* Remove unnecessary includes
---------

Co-authored-by: Benjamin Welton <ben@amd.com>

source/lib/rocprofiler-sdk/counters/tests/core.cpp

@@ -21,12 +21,10 @@
 // SOFTWARE.
 
 #include "lib/rocprofiler-sdk/counters/core.hpp"
-#include "lib/common/static_object.hpp"
 #include "lib/common/utility.hpp"
 #include "lib/rocprofiler-sdk/agent.hpp"
-#include "lib/rocprofiler-sdk/buffer.hpp"
 #include "lib/rocprofiler-sdk/context/context.hpp"
-#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/dispatch_handlers.hpp"
 #include "lib/rocprofiler-sdk/counters/metrics.hpp"
 #include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 #include "lib/rocprofiler-sdk/hsa/queue.hpp"
@@ -44,7 +42,6 @@
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ext_amd.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <sstream>
 #include <tuple>
@@ -427,7 +424,8 @@ TEST(core, check_callbacks)
     ROCPROFILER_CALL(rocprofiler_create_context(&get_client_ctx()), "context creation failed");
 
     context::context ctx;
-    ctx.counter_collection = std::make_unique<rocprofiler::context::counter_collection_service>();
+    ctx.counter_collection =
+        std::make_unique<rocprofiler::context::dispatch_counter_collection_service>();
     ctx.counter_collection->enabled.wlock([](auto& data) { data = true; });
 
     ASSERT_TRUE(hsa::get_queue_controller() != nullptr);

source/lib/rocprofiler-sdk/counters/tests/dimension.cpp

@@ -20,18 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/common/static_object.hpp"
 #include "lib/common/utility.hpp"
 #include "lib/rocprofiler-sdk/agent.hpp"
 #include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
-#include "lib/rocprofiler-sdk/buffer.hpp"
-#include "lib/rocprofiler-sdk/context/context.hpp"
-#include "lib/rocprofiler-sdk/counters/core.hpp"
 #include "lib/rocprofiler-sdk/counters/dimensions.hpp"
 #include "lib/rocprofiler-sdk/counters/id_decode.hpp"
 #include "lib/rocprofiler-sdk/counters/metrics.hpp"
 #include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
-#include "lib/rocprofiler-sdk/hsa/queue.hpp"
 #include "lib/rocprofiler-sdk/hsa/queue_controller.hpp"
 #include "lib/rocprofiler-sdk/registration.hpp"
 

source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.cpp

@@ -27,8 +27,8 @@
 #include <fmt/core.h>
 #include <gtest/gtest.h>
 
-#include "evaluate_ast_test.hpp"
 #include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
 #include "lib/rocprofiler-sdk/counters/parser/reader.hpp"
 
 namespace

source/lib/rocprofiler-sdk/counters/tests/evaluate_ast_test.hpp

@@ -23,9 +23,7 @@
 #pragma once
 
 #include <string>
-#include <unordered_map>
 #include <vector>
-#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
 
 struct test_data
 {

source/lib/rocprofiler-sdk/counters/tests/init_order.cpp

@@ -22,9 +22,7 @@
 
 #include "lib/common/static_object.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler-sdk/buffer.hpp"
 #include "lib/rocprofiler-sdk/context/context.hpp"
-#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
 #include "lib/rocprofiler-sdk/counters/metrics.hpp"
 #include "lib/rocprofiler-sdk/registration.hpp"
 
@@ -35,10 +33,8 @@
 #include <fmt/core.h>
 #include <gtest/gtest.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <sstream>
-#include <tuple>
 
 using namespace rocprofiler::counters;
 

source/lib/rocprofiler-sdk/counters/tests/metrics_test.cpp

@@ -29,6 +29,7 @@
 
 #include <rocprofiler-sdk/rocprofiler.h>
 
+#include "lib/common/logging.hpp"
 #include "lib/rocprofiler-sdk/agent.hpp"
 #include "lib/rocprofiler-sdk/counters/metrics.hpp"