Use -sdk suffix and reset VERSION to 0.0.0 (#263)

* Fix find_package(rocprofiler) in build tree

* Move include/rocprofiler to include/rocprofiler-sdk

* Update include/CMakeLists.txt

- add_subdirectory(rocprofiler-sdk)

* Move lib/rocprofiler to lib/rocprofiler-sdk

* Move lib/rocprofiler-tool to lib/rocprofiler-sdk-tool

* Update lib/CMakeLists.txt

- add_subdirectory(rocprofiler-sdk)
- add_subdirectory(rocprofiler-sdk-tool)

* Update lib/rocprofiler-sdk/CMakeLists.txt

* Rename rocprofiler-tool to rocprofiler-sdk-tool

* Replace include rocprofiler/ with include rocprofiler-sdk/

* Replace include lib/rocprofiler/ with include lib/rocprofiler-sdk/

* Set VERSION to 0.0.0 and finish install to rocprofiler-sdk

* More fixes for rocprofiler -> rocprofiler-sdk

- fix issue with rocprofiler-sdk-config.cmake.in
- fix counters xml install path

* Fix documentation generation

* Create rocprofiler_LIB_ROCPROFILER_SDK_DIR for build tree

* cmake formatting (cmake-format) (#264)

Co-authored-by: jrmadsen <jrmadsen@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

[ROCm/rocprofiler-sdk commit: 9a0c84efa6]

projects/rocprofiler-sdk/source/bin/CMakeLists.txt

@@ -4,9 +4,9 @@
 
 rocprofiler_activate_clang_tidy()
 
-configure_file(rocprofv2 ${PROJECT_BINARY_DIR} COPYONLY)
+configure_file(rocprofv3 ${PROJECT_BINARY_DIR} COPYONLY)
 install(
-    FILES rocprofv2
+    FILES rocprofv3
     DESTINATION ${CMAKE_INSTALL_BINDIR}
     PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     COMPONENT runtime)

projects/rocprofiler-sdk/source/bin/rocprofv3

@@ -6,7 +6,7 @@ CURRENT_DIR="$( dirname -- "$0"; )";
 ROCPROFV2_DIR=$(dirname -- $(realpath ${BASH_SOURCE[0]}));
 ROCM_DIR=$( dirname -- "${ROCPROFV2_DIR}"; )
 
-export HSA_TOOLS_LIB=${ROCM_DIR}/lib/librocprofiler64.so.2
+export HSA_TOOLS_LIB=${ROCM_DIR}/lib/librocprofiler-sdk.so.0
 
 # Define color code
 GREEN='\033[0;32m'
@@ -20,10 +20,10 @@ usage() {
   echo -e "${GREEN}--hsa-activity | --hsa-trace ${RESET} For Collecting HSA API Activities Traces"
   echo -e "${GREEN}--kernel-trace ${RESET}               For Collecting Kernel Dispatch Traces"
   echo -e "${GREEN}-o   | --output-file ${RESET}         For the output file name"
-  echo -e "\t#${GREY} usage e.g:(with current dir): rocprofv2 --hip-trace -o <file_name> <executable>"
-  echo -e "\t#${GREY} usage e.g:(with custom dir):  rocprofv2 --hip-trace -d <out_dir> -o <file_name> <executable>${RESET}\n"
+  echo -e "\t#${GREY} usage e.g:(with current dir): rocprofv3 --hip-trace -o <file_name> <executable>"
+  echo -e "\t#${GREY} usage e.g:(with custom dir):  rocprofv3 --hip-trace -d <out_dir> -o <file_name> <executable>${RESET}\n"
   echo -e "${GREEN}-d   | --output-directory ${RESET}    For adding output path where the output files will be saved"
-  echo -e "\t#${GREY} usage e.g:(with custom dir):  rocprofv2 --hip-trace -d <out_dir> <executable>${RESET}\n"
+  echo -e "\t#${GREY} usage e.g:(with custom dir):  rocprofv3 --hip-trace -d <out_dir> <executable>${RESET}\n"
   exit 1
 }
 
@@ -80,4 +80,4 @@ done
 
 export ROCPROFILER_OUTPUT_PATH
 
-ROCP_TOOL_LIBRARIES=${ROCM_DIR}/lib/rocprofiler/librocprofiler-tool.so $*
+ROCP_TOOL_LIBRARIES=${ROCM_DIR}/lib/rocprofiler-sdk/librocprofiler-sdk-tool.so $*

projects/rocprofiler-sdk/source/docs/conf.py

@@ -32,7 +32,7 @@ read_the_docs_build = os.environ.get("READTHEDOCS", None) == "True"
 
 
 # -- Project information -----------------------------------------------------
-project = "rocprofiler"
+project = "Rocprofiler SDK"
 copyright = "2023, Advanced Micro Devices, Inc."
 author = "Advanced Micro Devices, Inc."
 

projects/rocprofiler-sdk/source/docs/generate-doxyfile.cmake

@@ -15,5 +15,5 @@ string(REGEX REPLACE "(\n|\r)" "" FULL_VERSION_STRING "${FULL_VERSION_STRING}")
 string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)(.*)" "\\1.\\2.\\3"
                      ROCPROFILER_VERSION "${FULL_VERSION_STRING}")
 
-configure_file(${SOURCE_DIR}/source/docs/rocprofiler.dox.in
-               ${SOURCE_DIR}/source/docs/rocprofiler.dox @ONLY)
+configure_file(${SOURCE_DIR}/source/docs/rocprofiler-sdk.dox.in
+               ${SOURCE_DIR}/source/docs/rocprofiler-sdk.dox @ONLY)

projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox

@@ -0,0 +1,402 @@
+# Doxyfile 1.9.8
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = 
+PROJECT_NUMBER         = 0.0.0
+PROJECT_BRIEF          = "ROCm Profiling API and tools"
+PROJECT_LOGO           =
+OUTPUT_DIRECTORY       = _doxygen
+CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS_LEVEL   = 8
+ALLOW_UNICODE_NAMES    = YES
+OUTPUT_LANGUAGE        = English
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       =
+ALWAYS_DETAILED_SEC    = YES
+INLINE_INHERITED_MEMB  = YES
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include \
+                         /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/build-docs/source/include
+STRIP_FROM_INC_PATH    = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include \
+                         /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/build-docs/source/include
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+JAVADOC_BANNER         = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = YES
+PYTHON_DOCSTRING       = YES
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 4
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
+EXTENSION_MAPPING      = hpp=C++ \
+                         cpp=C++ \
+                         hh=C++ \
+                         cc=C++ \
+                         h=C \
+                         c=C \
+                         py=Python
+MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 2
+MARKDOWN_ID_STYLE      = DOXYGEN
+AUTOLINK_SUPPORT       = YES
+BUILTIN_STL_SUPPORT    = YES
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = YES
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = YES
+TYPEDEF_HIDES_STRUCT   = YES
+LOOKUP_CACHE_SIZE      = 5
+NUM_PROC_THREADS       = 0
+TIMESTAMP              = NO
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_PRIV_VIRTUAL   = NO
+EXTRACT_PACKAGE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
+RESOLVE_UNNAMED_PARAMS = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = YES
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = NO
+HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
+SHOW_HEADERFILE        = YES
+SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = YES
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
+GENERATE_TODOLIST      = NO
+GENERATE_TESTLIST      = NO
+GENERATE_BUGLIST       = NO
+GENERATE_DEPRECATEDLIST= NO
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_IF_INCOMPLETE_DOC = YES
+WARN_NO_PARAMDOC       = YES
+WARN_IF_UNDOC_ENUM_VAL = NO
+WARN_AS_ERROR          = YES
+WARN_FORMAT            = "---> WARNING! $file:$line: $text"
+WARN_LINE_FORMAT       = "at line $line of file $file"
+WARN_LOGFILE           =
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/README.md \
+                         /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include/rocprofiler-sdk \
+                         /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/build-docs/source/include/rocprofiler-sdk/version.h
+INPUT_ENCODING         = UTF-8
+INPUT_FILE_ENCODING    =
+FILE_PATTERNS          = *.h \
+                         *.hh \
+                         *.hpp \
+                         *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.icc \
+                         *.tcc \
+                         conf.py
+RECURSIVE              = YES
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = YES
+EXCLUDE_PATTERNS       = */.git/* \
+                         /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/**/tests/* \
+                         /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/**/scripts/* \
+                         /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/**/docs/*
+EXCLUDE_SYMBOLS        = "std::*" \
+                         "ROCPROFILER_ATTRIBUTE" \
+                         "ROCPROFILER_API" \
+                         "ROCPROFILER_NONNULL" \
+                         "ROCPROFILER_PUBLIC_API" \
+                         "ROCPROFILER_HIDDEN_API" \
+                         "ROCPROFILER_EXPORT_DECORATOR" \
+                         "ROCPROFILER_IMPORT_DECORATOR" \
+                         "ROCPROFILER_EXPORT" \
+                         "ROCPROFILER_IMPORT" \
+                         "ROCPROFILER_HANDLE_LITERAL" \
+                         "ROCPROFILER_EXTERN_C_INIT" \
+                         "ROCPROFILER_EXTERN_C_FINI"
+EXAMPLE_PATH           = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/samples
+EXAMPLE_PATTERNS       = *.h \
+                         *.hh \
+                         *.hpp \
+                         *.c \
+                         *.cc \
+                         *.cpp \
+                         *.txt
+EXAMPLE_RECURSIVE      = YES
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/README.md
+FORTRAN_COMMENT_AFTER  = 72
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = YES
+INLINE_SOURCES         = YES
+STRIP_CODE_COMMENTS    = NO
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+IGNORE_PREFIX          =
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  = ../../external/doxygen-awesome-css/doxygen-awesome.css
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE        = LIGHT
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_SECTIONS  = YES
+HTML_CODE_FOLDING      = YES
+HTML_INDEX_NUM_ENTRIES = 1000
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_FEEDURL         =
+DOCSET_BUNDLE_ID       = org.doxygen.rocprofiler
+DOCSET_PUBLISHER_ID    = org.doxygen.amd
+DOCSET_PUBLISHER_NAME  = "Advanced Micro Devices, Inc."
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
+BINARY_TOC             = NO
+TOC_EXPAND             = YES
+SITEMAP_URL            =
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          =
+QHP_VIRTUAL_FOLDER     = doxy
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.rocprofiler
+DISABLE_INDEX          = NO
+GENERATE_TREEVIEW      = YES
+FULL_SIDEBAR           = NO
+ENUM_VALUES_PER_LINE   = 1
+TREEVIEW_WIDTH         = 300
+EXT_LINKS_IN_WINDOW    = YES
+OBFUSCATE_EMAILS       = YES
+HTML_FORMULA_FORMAT    = png
+FORMULA_FONTSIZE       = 12
+FORMULA_MACROFILE      =
+USE_MATHJAX            = NO
+MATHJAX_VERSION        = MathJax_2
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = NO
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             =
+EXTRA_PACKAGES         = float
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = YES
+LATEX_HIDE_INDICES     = NO
+LATEX_BIB_STYLE        = plain
+LATEX_EMOJI_DIRECTORY  =
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_SUBDIR             =
+MAN_LINKS              = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# Configuration options related to Sqlite3 output
+#---------------------------------------------------------------------------
+GENERATE_SQLITE3       = NO
+SQLITE3_OUTPUT         = sqlite3
+SQLITE3_RECREATE_DB    = YES
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = NO
+INCLUDE_PATH           = /home/jrmadsen/devel/c++/ROCm-Developer-Tools/rocprofiler-v2-internal/source/include
+INCLUDE_FILE_PATTERNS  = *.h
+PREDEFINED             = "ROCPROFILER_API=" \
+                         "ROCPROFILER_EXPORT=" \
+                         "ROCPROFILER_IMPORT=" \
+                         "ROCPROFILER_NONNULL(...)=" \
+                         "ROCPROFILER_PUBLIC_API=" \
+                         "ROCPROFILER_HIDDEN_API=" \
+                         "ROCPROFILER_EXPORT_DECORATOR=" \
+                         "ROCPROFILER_IMPORT_DECORATOR=" \
+                         "ROCPROFILER_HANDLE_LITERAL=" \
+                         "ROCPROFILER_EXTERN_C_INIT=" \
+                         "ROCPROFILER_EXTERN_C_FINI=" \
+                         "__attribute__(x)=" \
+                         "__declspec(x)=" \
+                         "size_t=unsigned long" \
+                         "uintptr_t=unsigned long" \
+                         "DOXYGEN_SHOULD_SKIP_THIS=1"
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = NO
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+TAGFILES               =
+GENERATE_TAGFILE       = _doxygen/tagfile.xml
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
+#---------------------------------------------------------------------------
+# Configuration options related to diagram generator tools
+#---------------------------------------------------------------------------
+HIDE_UNDOC_RELATIONS   = NO
+HAVE_DOT               = YES
+DOT_NUM_THREADS        = 0
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=12"
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=12"
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_FONTPATH           =
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = YES
+UML_LIMIT_NUM_FIELDS   = 10
+DOT_UML_DETAILS        = YES
+DOT_WRAP_THRESHOLD     = 17
+TEMPLATE_RELATIONS     = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = YES
+CALLER_GRAPH           = YES
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DIR_GRAPH_MAX_DEPTH    = 1
+DOT_IMAGE_FORMAT       = svg
+INTERACTIVE_SVG        = NO
+DOT_PATH               = /opt/conda/envs/rocprofiler-docs/bin/dot
+DOTFILE_DIRS           =
+DIA_PATH               =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_MULTI_TARGETS      = YES
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+MSCGEN_TOOL            =
+MSCFILE_DIRS           =

projects/rocprofiler-sdk/source/docs/rocprofiler-sdk.dox.in

@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = rocprofiler
+PROJECT_NAME           = @PROJECT_NAME@
 PROJECT_NUMBER         = @ROCPROFILER_VERSION@
 PROJECT_BRIEF          = "ROCm Profiling API and tools"
 PROJECT_LOGO           =
@@ -123,8 +123,8 @@ WARN_LOGFILE           =
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = @SOURCE_DIR@/README.md \
-                         @SOURCE_DIR@/source/include/rocprofiler \
-                         @SOURCE_DIR@/build-docs/source/include/rocprofiler/version.h
+                         @SOURCE_DIR@/source/include/rocprofiler-sdk \
+                         @SOURCE_DIR@/build-docs/source/include/rocprofiler-sdk/version.h
 INPUT_ENCODING         = UTF-8
 INPUT_FILE_ENCODING    =
 FILE_PATTERNS          = *.h \

projects/rocprofiler-sdk/source/docs/tool_library_overview.md

@@ -25,7 +25,7 @@ Rocprofiler provides a `rocprofiler/registration.h` header file which forward de
 compiler function attributes to ensure that the symbol is publicly visible.
 
 ```cpp
-#include <rocprofiler/registration.h>
+#include <rocprofiler-sdk/registration.h>
 
 namespace
 {
@@ -90,7 +90,7 @@ collects all of the `rocprofiler_tool_configure_result_t` instances before invok
 When rocprofiler invokes this function in a tool, this is the opportunity to create contexts:
 
 ```cpp
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 namespace
 {
@@ -120,7 +120,7 @@ In the invocation of the user-provided `initialize` callback, rocprofiler will p
 This function pointer can be invoked by the tool to explicitly invoke the `finalize` callback from the `rocprofiler_tool_configure_result_t` instance:
 
 ```cpp
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 namespace
 {
@@ -168,7 +168,7 @@ Otherwise, rocprofiler will invoke the `finalize` callback via an `atexit` handl
 All of the snippets from the previous sections have been combined here for convenience.
 
 ```cpp
-#include <rocprofiler/registration.h>
+#include <rocprofiler-sdk/registration.h>
 
 namespace
 {

projects/rocprofiler-sdk/source/include/CMakeLists.txt

@@ -1,4 +1,4 @@
 #
 #
 #
-add_subdirectory(rocprofiler)
+add_subdirectory(rocprofiler-sdk)

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/CMakeLists.txt

@@ -34,7 +34,7 @@ set(ROCPROFILER_HEADER_FILES
     ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
 install(FILES ${ROCPROFILER_HEADER_FILES}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk)
 
 add_subdirectory(hip)
 add_subdirectory(hsa)

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include <hsakmt/hsakmttypes.h>
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/agent_profile.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/buffer_tracing.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/callback_tracing.h

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/hip.h>
-#include <rocprofiler/hsa.h>
-#include <rocprofiler/marker.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/hip.h>
+#include <rocprofiler-sdk/hsa.h>
+#include <rocprofiler-sdk/marker.h>
 
 #include <hsa/hsa_ven_amd_loader.h>
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/context.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/counters.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/dispatch_profile.h

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/hsa.h>
-#include <rocprofiler/profile_config.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/hsa.h>
+#include <rocprofiler-sdk/profile_config.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/external_correlation.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/fwd.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
+#include <rocprofiler-sdk/defines.h>
 
 #include <stddef.h>
 #include <stdint.h>

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip.h

@@ -22,5 +22,5 @@
 
 #pragma once
 
-#include <rocprofiler/hip/api_args.h>
-#include <rocprofiler/hip/api_id.h>
+#include <rocprofiler-sdk/hip/api_args.h>
+#include <rocprofiler-sdk/hip/api_id.h>

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hip/CMakeLists.txt

@@ -6,4 +6,4 @@
 set(ROCPROFILER_HIP_HEADER_FILES api_args.h api_id.h)
 
 install(FILES ${ROCPROFILER_HIP_HEADER_FILES}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/hip)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/hip)

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa.h

@@ -32,9 +32,9 @@
 #    endif
 #endif
 
-#include <rocprofiler/hsa/api_args.h>
-#include <rocprofiler/hsa/api_id.h>
-#include <rocprofiler/hsa/table_api_id.h>
+#include <rocprofiler-sdk/hsa/api_args.h>
+#include <rocprofiler-sdk/hsa/api_id.h>
+#include <rocprofiler-sdk/hsa/table_api_id.h>
 
 #include <hsa/hsa.h>
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/CMakeLists.txt

@@ -6,4 +6,4 @@
 set(ROCPROFILER_HSA_HEADER_FILES api_args.h api_id.h table_api_id.h)
 
 install(FILES ${ROCPROFILER_HSA_HEADER_FILES}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/hsa)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/hsa)

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_args.h

@@ -26,7 +26,7 @@
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ext_amd.h>
 #include <hsa/hsa_ext_image.h>
-#include <rocprofiler/version.h>
+#include <rocprofiler-sdk/version.h>
 
 typedef union rocprofiler_hsa_api_retval_u
 {

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/hsa/api_id.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/version.h>
+#include <rocprofiler-sdk/version.h>
 
 /**
  * @brief ROCProfiler enumeration of HSA API tracing operations

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/intercept_table.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/internal_threading.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker.h

@@ -22,5 +22,5 @@
 
 #pragma once
 
-#include <rocprofiler/marker/api_args.h>
-#include <rocprofiler/marker/api_id.h>
+#include <rocprofiler-sdk/marker/api_args.h>
+#include <rocprofiler-sdk/marker/api_id.h>

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/marker/CMakeLists.txt

@@ -6,4 +6,4 @@
 set(ROCPROFILER_MARKER_HEADER_FILES api_args.h api_id.h)
 
 install(FILES ${ROCPROFILER_MARKER_HEADER_FILES}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler/marker)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocprofiler-sdk/marker)

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/pc_sampling.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 
@@ -292,4 +292,4 @@ struct rocprofiler_pc_sampling_record_s
 
 /** @} */
 
-ROCPROFILER_EXTERN_C_FINI
+ROCPROFILER_EXTERN_C_FINI

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/profile_config.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/registration.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 
@@ -109,7 +109,7 @@ rocprofiler_is_finalized(int* status) ROCPROFILER_API;
  * @return rocprofiler_tool_configure_result_t*
  *
  * @code{.cpp}
- * #include <rocprofiler/registration.h>
+ * #include <rocprofiler-sdk/registration.h>
  *
  * static rocprofiler_client_id_t       my_client_id;
  * static rocprofiler_client_finalize_t my_fini_func;

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler.h

@@ -25,8 +25,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rocprofiler/defines.h"
-#include "rocprofiler/fwd.h"
+#include "rocprofiler-sdk/defines.h"
+#include "rocprofiler-sdk/fwd.h"
 
 /**
  * @defgroup VERSIONING_GROUP Library Versioning
@@ -40,7 +40,7 @@
  * @{
  */
 
-#include "rocprofiler/version.h"
+#include "rocprofiler-sdk/version.h"
 
 ROCPROFILER_EXTERN_C_INIT
 
@@ -64,23 +64,23 @@ ROCPROFILER_EXTERN_C_FINI
 
 /** @} */
 
-#include "rocprofiler/agent.h"
-// #include "rocprofiler/agent_profile.h"
-#include "rocprofiler/buffer.h"
-#include "rocprofiler/buffer_tracing.h"
-#include "rocprofiler/callback_tracing.h"
-#include "rocprofiler/context.h"
-#include "rocprofiler/counters.h"
-#include "rocprofiler/dispatch_profile.h"
-#include "rocprofiler/external_correlation.h"
-#include "rocprofiler/hip.h"
-#include "rocprofiler/hsa.h"
-#include "rocprofiler/intercept_table.h"
-#include "rocprofiler/internal_threading.h"
-// #include "rocprofiler/marker.h"
-#include "rocprofiler/pc_sampling.h"
-#include "rocprofiler/profile_config.h"
-// #include "rocprofiler/spm.h"
+#include "rocprofiler-sdk/agent.h"
+// #include "rocprofiler-sdk/agent_profile.h"
+#include "rocprofiler-sdk/buffer.h"
+#include "rocprofiler-sdk/buffer_tracing.h"
+#include "rocprofiler-sdk/callback_tracing.h"
+#include "rocprofiler-sdk/context.h"
+#include "rocprofiler-sdk/counters.h"
+#include "rocprofiler-sdk/dispatch_profile.h"
+#include "rocprofiler-sdk/external_correlation.h"
+#include "rocprofiler-sdk/hip.h"
+#include "rocprofiler-sdk/hsa.h"
+#include "rocprofiler-sdk/intercept_table.h"
+#include "rocprofiler-sdk/internal_threading.h"
+// #include "rocprofiler-sdk/marker.h"
+#include "rocprofiler-sdk/pc_sampling.h"
+#include "rocprofiler-sdk/profile_config.h"
+// #include "rocprofiler-sdk/spm.h"
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/rocprofiler_plugin.h

@@ -43,7 +43,7 @@
 
 #pragma once
 
-#include "rocprofiler/rocprofiler.h"
+#include "rocprofiler-sdk/rocprofiler.h"
 
 #include <stdint.h>
 

projects/rocprofiler-sdk/source/include/rocprofiler-sdk/spm.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/defines.h>
+#include <rocprofiler-sdk/fwd.h>
 
 ROCPROFILER_EXTERN_C_INIT
 

projects/rocprofiler-sdk/source/lib/CMakeLists.txt

@@ -2,8 +2,8 @@
 #
 #
 add_subdirectory(common)
-add_subdirectory(rocprofiler)
-add_subdirectory(rocprofiler-tool)
+add_subdirectory(rocprofiler-sdk)
+add_subdirectory(rocprofiler-sdk-tool)
 add_subdirectory(plugins)
 
 if(ROCPROFILER_BUILD_TESTS)

projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.cpp

@@ -22,7 +22,7 @@
 
 #include "lib/common/container/record_header_buffer.hpp"
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 #include <algorithm>
 #include <atomic>
 #include <new>

projects/rocprofiler-sdk/source/lib/common/container/record_header_buffer.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/ring_buffer.hpp"
 

projects/rocprofiler-sdk/source/lib/common/defines.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/defines.h>
+#include <rocprofiler-sdk/defines.h>
 
 #define ROCPROFILER_VISIBILITY(MODE)  ROCPROFILER_ATTRIBUTE(visibility(MODE))
 #define ROCPROFILER_INTERNAL_API      ROCPROFILER_VISIBILITY("internal")

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt

@@ -2,10 +2,11 @@
 # Tool library used by rocprofiler
 #
 
-add_library(rocprofiler-tool SHARED)
-target_sources(rocprofiler-tool PRIVATE helper.hpp helper.cpp tool.cpp trace_buffer.hpp)
+add_library(rocprofiler-sdk-tool SHARED)
+target_sources(rocprofiler-sdk-tool PRIVATE helper.hpp helper.cpp tool.cpp
+                                            trace_buffer.hpp)
 target_link_libraries(
-    rocprofiler-tool
+    rocprofiler-sdk-tool
     PRIVATE rocprofiler::rocprofiler-shared-library
             rocprofiler::rocprofiler-hsa-runtime
             rocprofiler::rocprofiler-headers
@@ -16,9 +17,9 @@ target_link_libraries(
             atomic)
 
 set_target_properties(
-    rocprofiler-tool
+    rocprofiler-sdk-tool
     PROPERTIES LIBRARY_OUTPUT_DIRECTORY
-               ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/rocprofiler
+               ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
                SKIP_BUILD_RPATH OFF
@@ -26,7 +27,7 @@ set_target_properties(
                INSTALL_RPATH "\$ORIGIN:\$ORIGIN/..")
 
 install(
-    TARGETS rocprofiler-tool
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
+    TARGETS rocprofiler-sdk-tool
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/rocprofiler-sdk
     COMPONENT tools
-    EXPORT ${PROJECT_NAME}-library-targets)
+    EXPORT rocprofiler-sdk-library-targets)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/README.md

@@ -3,12 +3,12 @@
 This is a tool that gets registered with the
 rocprofiler to obtain its services.
 The tool is built as a shared library and is named as
-rocprofiler-tool.
+rocprofiler-sdk-tool.
 The library can be preloaded using LD_PRELOAD
 to facilitate its registration as a tool
 with the rocprofiler.
 
-The user through rocprofv2 script can select the
+The user through rocprofv3 script can select the
 options to obtain tracing and counter collection
 services from the rocprofiler.
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/helper.hpp

@@ -43,8 +43,8 @@
 #include <hsa/hsa_ext_amd.h>
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 #include <hsa/hsa_ven_amd_loader.h>
-#include <rocprofiler/registration.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/registration.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #define ROCPROFILER_CALL(result, msg)                                                              \
     {                                                                                              \

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt

@@ -81,7 +81,7 @@ target_link_libraries(
 
 set_target_properties(
     rocprofiler-shared-library
-    PROPERTIES OUTPUT_NAME rocprofiler64
+    PROPERTIES OUTPUT_NAME rocprofiler-sdk
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
                SKIP_BUILD_RPATH OFF
@@ -90,13 +90,12 @@ set_target_properties(
                DEFINE_SYMBOL rocprofiler_EXPORTS)
 
 add_library(rocprofiler::rocprofiler-library ALIAS rocprofiler-shared-library)
-add_library(rocprofiler::rocprofiler ALIAS rocprofiler-shared-library)
 
 install(
     TARGETS rocprofiler-shared-library
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
     COMPONENT core
-    EXPORT ${PROJECT_NAME}-library-targets)
+    EXPORT rocprofiler-sdk-library-targets)
 
 # ----------------------------------------------------------------------------------------#
 #
@@ -117,8 +116,8 @@ target_link_libraries(
             rocprofiler::rocprofiler-object-library)
 
 set_target_properties(
-    rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler64 DEFINE_SYMBOL
-                                                                    rocprofiler_EXPORTS)
+    rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler-sdk DEFINE_SYMBOL
+                                                                      rocprofiler_EXPORTS)
 
 # ----------------------------------------------------------------------------------------#
 #

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/filesystem.hpp"
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
 #include <fmt/core.h>
 #include <glog/logging.h>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/agent.hpp

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
+#include <rocprofiler-sdk/agent.h>
 
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
 #include <hsa/hsa_api_trace.h>
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/allocator.cpp

@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/allocator.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <glog/logging.h>
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
 
 #include <fmt/core.h>
 #include <glog/logging.h>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/helpers.hpp

@@ -26,7 +26,7 @@
 
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 
-#include "lib/rocprofiler/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/intercept.cpp

@@ -20,9 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/aql/intercept.hpp"
+#include "lib/rocprofiler-sdk/aql/intercept.hpp"
 
-#include "lib/rocprofiler/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
 
 #include <fmt/core.h>
 #include <hsa/hsa_ext_amd.h>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/packet_construct.hpp

@@ -30,10 +30,10 @@
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
-#include "lib/rocprofiler/hsa/queue.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/aql_test.cpp

@@ -31,12 +31,12 @@
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ven_amd_aqlprofile.h>
 
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
-#include "lib/rocprofiler/hsa/queue.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.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"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.cpp

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/buffer.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
 
 #include <glog/logging.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/internal_threading.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/internal_threading.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <atomic>
 #include <exception>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer.hpp

@@ -22,13 +22,13 @@
 
 #pragma once
 
-#include <rocprofiler/buffer.h>
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/buffer.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include "lib/common/container/record_header_buffer.hpp"
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/demangle.hpp"
-#include "lib/rocprofiler/allocator.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
 
 #include <array>
 #include <atomic>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/buffer_tracing.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <glog/logging.h>
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/callback_tracing.cpp

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <glog/logging.h>
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context.cpp

@@ -20,14 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/context.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/context.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/hsa/hsa.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/hsa/hsa.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
 #include <atomic>
 #include <vector>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.cpp

@@ -20,16 +20,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/buffer_tracing.h>
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/buffer_tracing.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/counters/core.hpp"
+#include "lib/rocprofiler-sdk/buffer.hpp"
+#include "lib/rocprofiler-sdk/context/context.hpp"
+#include "lib/rocprofiler-sdk/counters/core.hpp"
 
 #include <glog/logging.h>
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/context.hpp

@@ -22,17 +22,17 @@
 
 #pragma once
 
-#include <rocprofiler/fwd.h>
-#include <rocprofiler/registration.h>
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/fwd.h>
+#include <rocprofiler-sdk/registration.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/container/small_vector.hpp"
 #include "lib/common/container/stable_vector.hpp"
 #include "lib/common/synchronized.hpp"
-#include "lib/rocprofiler/allocator.hpp"
-#include "lib/rocprofiler/context/domain.hpp"
-#include "lib/rocprofiler/counters/core.hpp"
-#include "lib/rocprofiler/external_correlation.hpp"
+#include "lib/rocprofiler-sdk/allocator.hpp"
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include "lib/rocprofiler-sdk/counters/core.hpp"
+#include "lib/rocprofiler-sdk/external_correlation.hpp"
 
 #include <array>
 #include <atomic>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.cpp

@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/context/domain.hpp"
-#include <rocprofiler/rocprofiler.h>
+#include "lib/rocprofiler-sdk/context/domain.hpp"
+#include <rocprofiler-sdk/rocprofiler.h>
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/domain.hpp

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/mpl.hpp"
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters.cpp

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include <fmt/core.h>
 
 #include "lib/common/synchronized.hpp"
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
-#include "lib/rocprofiler/counters/id_decode.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
-#include "lib/rocprofiler/hsa/queue.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.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"
 
 extern "C" {
 /**

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

@@ -20,18 +20,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/counters/core.hpp"
+#include "lib/rocprofiler-sdk/counters/core.hpp"
 
 #include "lib/common/synchronized.hpp"
-#include "lib/rocprofiler/agent.hpp"
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/buffer.hpp"
-#include "lib/rocprofiler/context/context.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
-#include "lib/rocprofiler/registration.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.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/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/registration.hpp"
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/core.hpp

@@ -22,14 +22,14 @@
 
 #pragma once
 
-#include <rocprofiler/agent.h>
-#include <rocprofiler/dispatch_profile.h>
+#include <rocprofiler-sdk/agent.h>
+#include <rocprofiler-sdk/dispatch_profile.h>
 
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/hsa/agent_cache.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.cpp

@@ -31,9 +31,9 @@
 
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/aql/helpers.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/hsa/queue_controller.hpp"
+#include "lib/rocprofiler-sdk/aql/helpers.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/hsa/queue_controller.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/dimensions.hpp

@@ -29,8 +29,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "lib/rocprofiler/counters/id_decode.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/counters/evaluate_ast.hpp"
+#include "lib/rocprofiler-sdk/counters/evaluate_ast.hpp"
 #include <fmt/core.h>
 
 #include <exception>
@@ -30,8 +30,8 @@
 #include <stdexcept>
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/counters/dimensions.hpp"
-#include "lib/rocprofiler/counters/parser/reader.hpp"
+#include "lib/rocprofiler-sdk/counters/dimensions.hpp"
+#include "lib/rocprofiler-sdk/counters/parser/reader.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/evaluate_ast.hpp

@@ -28,10 +28,10 @@
 #include <unordered_map>
 
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/aql/packet_construct.hpp"
-#include "lib/rocprofiler/counters/dimensions.hpp"
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/counters/parser/raw_ast.hpp"
+#include "lib/rocprofiler-sdk/aql/packet_construct.hpp"
+#include "lib/rocprofiler-sdk/counters/dimensions.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/parser/raw_ast.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "lib/rocprofiler/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
 
 #include <string>
 #include <unordered_map>

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/id_decode.hpp

@@ -24,7 +24,7 @@
 
 #include <unordered_map>
 
-#include <rocprofiler/fwd.h>
+#include <rocprofiler-sdk/fwd.h>
 
 #include <glog/logging.h>
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/metrics.cpp

@@ -22,14 +22,14 @@
 
 #include "metrics.hpp"
 
-#include <rocprofiler/rocprofiler.h>
+#include <rocprofiler-sdk/rocprofiler.h>
 
 #include "lib/common/defines.hpp"
 #include "lib/common/filesystem.hpp"
 #include "lib/common/synchronized.hpp"
 #include "lib/common/utility.hpp"
 #include "lib/common/xml.hpp"
-#include "lib/rocprofiler/agent.hpp"
+#include "lib/rocprofiler-sdk/agent.hpp"
 
 #include "dimensions.hpp"
 #include "glog/logging.h"
@@ -145,7 +145,7 @@ findViaInstallPath(const std::string& filename)
     if(dladdr(reinterpret_cast<const void*>(rocprofiler_query_available_agents), &dl_info) != 0)
     {
         return common::filesystem::path{dl_info.dli_fname}.parent_path().parent_path() /
-               fmt::format("share/rocprofiler/{}", filename);
+               fmt::format("share/rocprofiler-sdk/{}", filename);
     }
     return filename;
 }
@@ -167,13 +167,19 @@ findViaEnvironment(const std::string& filename)
 MetricMap
 getDerivedHardwareMetrics()
 {
-    return loadXml(findViaEnvironment("derived_counters.xml"));
+    auto counters_path = findViaEnvironment("derived_counters.xml");
+    LOG_IF(FATAL, !common::filesystem::exists(counters_path))
+        << "metric xml file '" << counters_path << "' does not exist";
+    return loadXml(counters_path);
 }
 
 MetricMap
 getBaseHardwareMetrics()
 {
-    return loadXml(findViaEnvironment("basic_counters.xml"), true);
+    auto counters_path = findViaEnvironment("basic_counters.xml");
+    LOG_IF(FATAL, !common::filesystem::exists(counters_path))
+        << "metric xml file '" << counters_path << "' does not exist";
+    return loadXml(counters_path, true);
 }
 
 const MetricIdMap&

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/raw_ast.hpp

@@ -36,7 +36,7 @@
 #include <glog/logging.h>
 
 #include "lib/common/utility.hpp"
-#include "lib/rocprofiler/counters/id_decode.hpp"
+#include "lib/rocprofiler-sdk/counters/id_decode.hpp"
 
 namespace rocprofiler
 {

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/tests/parser_test.cpp

@@ -26,8 +26,8 @@
 
 #include <gtest/gtest.h>
 
-#include "lib/rocprofiler/counters/metrics.hpp"
-#include "lib/rocprofiler/counters/parser/reader.hpp"
+#include "lib/rocprofiler-sdk/counters/metrics.hpp"
+#include "lib/rocprofiler-sdk/counters/parser/reader.hpp"
 
 TEST(parser, base_ops)
 {