From 9675b1bd25e566fc5b96d0552f24da43abb0ad09 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Tue, 24 Sep 2024 15:51:02 -0400
Subject: [PATCH 01/14] Rebranding of omnitrace-dl, console log.

---
 source/lib/omnitrace-dl/dl.cpp | 44 +++++++++++++++++-----------------
 source/lib/omnitrace-dl/main.c |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/source/lib/omnitrace-dl/dl.cpp b/source/lib/omnitrace-dl/dl.cpp
index 0181df2d6..937d479c5 100644
--- a/source/lib/omnitrace-dl/dl.cpp
+++ b/source/lib/omnitrace-dl/dl.cpp
@@ -1336,19 +1336,19 @@ verify_instrumented_preloaded()
                                                     | |__| |____) | |____
                                                      \____/|_____/|______|
 
-                     ____  __  __ _   _ _____ _______ _____            _____ ______      _____  _    _ _   _
-                    / __ \|  \/  | \ | |_   _|__   __|  __ \     /\   / ____|  ____|    |  __ \| |  | | \ | |
-                   | |  | | \  / |  \| | | |    | |  | |__) |   /  \ | |    | |__ ______| |__) | |  | |  \| |
-                   | |  | | |\/| | . ` | | |    | |  |  _  /   / /\ \| |    |  __|______|  _  /| |  | | . ` |
-                   | |__| | |  | | |\  |_| |_   | |  | | \ \  / ____ \ |____| |____     | | \ \| |__| | |\  |
-                    \____/|_|  |_|_| \_|_____|  |_|  |_|  \_\/_/    \_\_____|______|    |_|  \_\\____/|_| \_|
+                                                         __                                            
+                         _ __ ___   ___ _ __  _ __ ___  / _|      ___ _   _ ___       _ __ _   _ _ __  
+                        | '__/ _ \ / __| '_ \| '__/ _ \| |_ _____/ __| | | / __|_____| '__| | | | '_ \ 
+                        | | | (_) | (__| |_) | | | (_) |  _|_____\__ \ |_| \__ \_____| |  | |_| | | | |
+                        |_|  \___/ \___| .__/|_|  \___/|_|       |___/\__, |___/     |_|   \__,_|_| |_|
+                                       |_|                            |___/                            
 
 
-    Due to a variety of edge cases we've encountered, OmniTrace now requires that binary rewritten executables and libraries be launched
-    with the 'omnitrace-run' executable.
+    Due to a variety of edge cases we've encountered, rocprof-sys now requires that binary rewritten executables and libraries be launched
+    with the 'rocprof-sys-run' executable.
 
-    In order to launch the executable with 'omnitrace-run', prefix the current command with 'omnitrace-run' and a standalone double hyphen ('--').
-    For MPI applications, place 'omnitrace-run --' after the MPI command.
+    In order to launch the executable with 'rocprof-sys-run', prefix the current command with 'rocprof-sys-run' and a standalone double hyphen ('--').
+    For MPI applications, place 'rocprof-sys-run --' after the MPI command.
     E.g.:
 
         <EXECUTABLE> <ARGS...>
@@ -1356,23 +1356,23 @@ verify_instrumented_preloaded()
 
     should be:
 
-        omnitrace-run -- <EXECUTABLE> <ARGS...>
-        mpirun -n 2 omnitrace-run -- <EXECUTABLE> <ARGS...>
+        rocprof-sys-run -- <EXECUTABLE> <ARGS...>
+        mpirun -n 2 rocprof-sys-run -- <EXECUTABLE> <ARGS...>
 
-    Note: the command-line arguments passed to 'omnitrace-run' (which are specified before the double hyphen) will override configuration variables
-    and/or any configuration values specified to 'omnitrace-instrument' via the '--config' or '--env' options.
+    Note: the command-line arguments passed to 'rocprof-sys-run' (which are specified before the double hyphen) will override configuration variables
+    and/or any configuration values specified to 'rocprof-sys-instrument' via the '--config' or '--env' options.
     E.g.:
 
-        $ omnitrace-instrument -o ./sleep.inst --env OMNITRACE_SAMPLING_DELAY=5.0 -- sleep
-        $ echo "OMNITRACE_SAMPLING_FREQ = 500" > omnitrace.cfg
-        $ export OMNITRACE_CONFIG_FILE=omnitrace.cfg
-        $ omnitrace-run --sampling-freq=100 --sampling-delay=1.0 -- ./sleep.inst 10
+        $ rocprof-sys-instrument -o ./sleep.inst --env ROCPROFSYS_SAMPLING_DELAY=5.0 -- sleep
+        $ echo "ROCPROFSYS_SAMPLING_FREQ = 500" > rocprof-sys.cfg
+        $ export ROCPROFSYS_CONFIG_FILE=rocprof-sys.cfg
+        $ rocprof-sys-run --sampling-freq=100 --sampling-delay=1.0 -- ./sleep.inst 10
 
     In the first command, a default sampling delay of 5 seconds in embedded into the instrumented 'sleep.inst'.
-    In the second command, the sampling frequency will be set to 500 interrupts per second when OmniTrace reads the config file
+    In the second command, the sampling frequency will be set to 500 interrupts per second when rocprof-sys reads the config file
     In the fourth command, the sampling frequency and sampling delay are overridden to 100 interrupts per second and 1 second, respectively, when sleep.inst runs
 
-    Thanks for using OmniTrace and happy optimizing!
+    Thanks for using rocprof-sys and happy optimizing!
     )notice";
 
     // emit notice
@@ -1409,7 +1409,7 @@ extern "C"
         _reentry = 1;
 
         if(!::omnitrace::dl::main_real)
-            throw std::runtime_error("[omnitrace][dl] Unsuccessful wrapping of main: "
+            throw std::runtime_error("[rocprof-sys][dl] Unsuccessful wrapping of main: "
                                      "nullptr to real main function");
 
         if(envp)
@@ -1426,7 +1426,7 @@ extern "C"
                 {
                     auto _var = std::string{ _env_v }.substr(0, _pos);
                     auto _val = std::string{ _env_v }.substr(_pos + 1);
-                    OMNITRACE_DL_LOG(1, "%s(%s, %s)\n", "omnitrace_set_env", _var.c_str(),
+                    OMNITRACE_DL_LOG(1, "%s(%s, %s)\n", "rocprof-sys_set_env", _var.c_str(),
                                      _val.c_str());
                     setenv(_var.c_str(), _val.c_str(), 0);
                 }
diff --git a/source/lib/omnitrace-dl/main.c b/source/lib/omnitrace-dl/main.c
index c83325c69..db3146a0d 100644
--- a/source/lib/omnitrace-dl/main.c
+++ b/source/lib/omnitrace-dl/main.c
@@ -122,7 +122,7 @@ omnitrace_libc_start_main(int (*_main)(int, char**, char**), int _argc, char** _
     }
     else
     {
-        fputs("Error! omnitrace could not find __libc_start_main!", stderr);
+        fputs("Error! rocprof-sys could not find __libc_start_main!", stderr);
         return -1;
     }
 }

From f2f4ef60a997494feb5f7f95bc663b23c636a4dc Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Fri, 27 Sep 2024 10:25:14 -0400
Subject: [PATCH 02/14] Rebranding of omnitrace-user, console log.

---
 source/lib/omnitrace-user/user.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/lib/omnitrace-user/user.cpp b/source/lib/omnitrace-user/user.cpp
index 72fa03fe8..13a865c38 100644
--- a/source/lib/omnitrace-user/user.cpp
+++ b/source/lib/omnitrace-user/user.cpp
@@ -184,7 +184,7 @@ extern "C"
             case OMNITRACE_USER_ERROR_INVALID_CATEGORY:
                 return "Invalid user binding category";
             case OMNITRACE_USER_ERROR_INTERNAL:
-                return "An unknown error occurred within omnitrace library";
+                return "An unknown error occurred within rocprof-sys library";
             default: break;
         }
         return "No error";

From 75e7e6b13f366836a67174a4845dd60d37eadf5d Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Fri, 27 Sep 2024 10:27:45 -0400
Subject: [PATCH 03/14] Rebranding of python gui, console log.

---
 source/python/gui/source/__main__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/python/gui/source/__main__.py b/source/python/gui/source/__main__.py
index fa17d6e51..24aa5868d 100644
--- a/source/python/gui/source/__main__.py
+++ b/source/python/gui/source/__main__.py
@@ -143,18 +143,18 @@ def main():
             settings[key] = value
 
     my_parser = argparse.ArgumentParser(
-        description="AMD's OmniTrace Causal Profiling GUI",
+        description="AMD's ROCm Systems Profiler Causal Profiling GUI",
         prog="tool",
         allow_abbrev=False,
         formatter_class=lambda prog: argparse.RawTextHelpFormatter(
             prog, max_help_position=40
         ),
         usage="""
-        omnitrace-causal-plot [ARGS...]
+        rocprof-sys-causal-plot [ARGS...]
 
         -------------------------------------------------------------------------------
         Examples:
-        \tomnitrace-causal-plot --path workloads/toy -n 0
+        \trocprof-sys-causal-plot --path workloads/toy -n 0
         -------------------------------------------------------------------------------
         """,
     )
@@ -162,7 +162,7 @@ def main():
     my_parser.add_argument(
         "--version",
         action="version",
-        version="OmniTrace Causal Viewer v{}\n".format(f"{__version__}".strip("\n")),
+        version="ROCm Systems Profiler Causal Viewer v{}\n".format(f"{__version__}".strip("\n")),
     )
 
     my_parser.add_argument(

From 1986b8f05b7069e5e540d60d6f76ace05b5d5f3f Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Fri, 27 Sep 2024 10:29:35 -0400
Subject: [PATCH 04/14] Rebranding of python omnitrace, console log.

---
 source/python/omnitrace/__main__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/python/omnitrace/__main__.py b/source/python/omnitrace/__main__.py
index a4f43ec4e..8d63be976 100644
--- a/source/python/omnitrace/__main__.py
+++ b/source/python/omnitrace/__main__.py
@@ -102,9 +102,9 @@ def str2bool(v):
         _default_label.append("line")
 
     parser = argparse.ArgumentParser(
-        "omnitrace",
+        "rocprof-sys",
         add_help=True,
-        epilog="usage: {} -m omnitrace <OMNITRACE_ARGS> -- <SCRIPT> <SCRIPT_ARGS>".format(
+        epilog="usage: {} -m rocprof-sys <ROCPROFSYS_ARGS> -- <SCRIPT> <SCRIPT_ARGS>".format(
             os.path.basename(sys.executable)
         ),
     )
@@ -130,7 +130,7 @@ def str2bool(v):
         default=None,
         type=str,
         metavar="FILE",
-        help="Omnitrace configuration file",
+        help="rocprof-sys configuration file",
     )
     parser.add_argument(
         "-s",
@@ -290,7 +290,7 @@ def main(main_args=sys.argv):
                 raise RuntimeError(
                     "Could not determine input script in '{}'. Use '--' before "
                     "the script and its arguments to ensure correct parsing. \nE.g. "
-                    "python -m omnitrace -- ./script.py".format(" ".join(argv))
+                    "python -m rocprof-sys -- ./script.py".format(" ".join(argv))
                 )
 
     if len(argv) > 1:
@@ -335,7 +335,7 @@ def main(main_args=sys.argv):
     _profiler_config.annotate_trace = opts.annotate_trace
     _profiler_config.verbosity = opts.verbosity
 
-    print("[omnitrace]> profiling: {}".format(argv))
+    print("[rocprof-sys]> profiling: {}".format(argv))
 
     main_args[:] = argv
     if opts.setup is not None:

From 1bb11d2933dc8804d760c8b2067ece53c81b4ea0 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Fri, 27 Sep 2024 10:34:14 -0400
Subject: [PATCH 05/14] Rebranding of python libpyomnitrace, console log.

---
 source/python/libpyomnitrace.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/python/libpyomnitrace.cpp b/source/python/libpyomnitrace.cpp
index 798038622..863016449 100644
--- a/source/python/libpyomnitrace.cpp
+++ b/source/python/libpyomnitrace.cpp
@@ -82,7 +82,7 @@ PYBIND11_MODULE(libpyomnitrace, omni)
 {
     using namespace pyomnitrace;
 
-    py::doc("Omnitrace Python bindings for profiling, user API, and code coverage "
+    py::doc("rocprof-sys Python bindings for profiling, user API, and code coverage "
             "post-processing");
 
     static bool _is_initialized = false;
@@ -110,18 +110,18 @@ PYBIND11_MODULE(libpyomnitrace, omni)
         "initialize",
         [](const std::string& _v) {
             if(_is_initialized)
-                throw std::runtime_error("Error! omnitrace is already initialized");
+                throw std::runtime_error("Error! rocprof-sys is already initialized");
             _is_initialized = true;
             omnitrace_set_mpi(_get_use_mpi(), false);
             omnitrace_init("trace", false, _v.c_str());
         },
-        "Initialize omnitrace");
+        "Initialize rocprof-sys");
 
     omni.def(
         "initialize",
         [](const py::list& _v) {
             if(_is_initialized)
-                throw std::runtime_error("Error! omnitrace is already initialized");
+                throw std::runtime_error("Error! rocprof-sys is already initialized");
             _is_initialized = true;
             omnitrace_set_instrumented(
                 static_cast<int>(omnitrace::dl::InstrumentMode::PythonProfile));
@@ -140,17 +140,17 @@ PYBIND11_MODULE(libpyomnitrace, omni)
             }
             omnitrace_init("trace", false, _cmd.c_str());
         },
-        "Initialize omnitrace");
+        "Initialize rocprof-sys");
 
     omni.def(
         "finalize",
         []() {
             if(_is_finalized)
-                throw std::runtime_error("Error! omnitrace is already finalized");
+                throw std::runtime_error("Error! rocprof-sys is already finalized");
             _is_finalized = true;
             omnitrace_finalize();
         },
-        "Finalize omnitrace");
+        "Finalize rocprof-sys");
 
     pyprofile::generate(omni);
     pycoverage::generate(omni);
@@ -168,7 +168,7 @@ PYBIND11_MODULE(libpyomnitrace, omni)
         auto _msg =
             TIMEMORY_JOIN("", "dlopen(\"", _libpath, "\", RTLD_NOW | RTLD_GLOBAL)");
         perror(_msg.c_str());
-        fprintf(stderr, "[omnitrace][dl][pid=%i] %s :: %s\n", getpid(), _msg.c_str(),
+        fprintf(stderr, "[rocprof-sys][dl][pid=%i] %s :: %s\n", getpid(), _msg.c_str(),
                 dlerror());
     }
 }

From f26a352b4ba8ef5c2b873b0ad1e35f61bc589115 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Fri, 27 Sep 2024 14:09:45 -0400
Subject: [PATCH 06/14] Rebranding of lib core, console log and banner (using
 full name 'ROCm Systems Profiler).

---
 source/lib/core/config.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/source/lib/core/config.cpp b/source/lib/core/config.cpp
index d7bb5d959..01848a770 100644
--- a/source/lib/core/config.cpp
+++ b/source/lib/core/config.cpp
@@ -97,7 +97,7 @@ get_config()
 std::string
 get_setting_name(std::string _v)
 {
-    static const auto _prefix = tim::string_view_t{ "omnitrace_" };
+    static const auto _prefix = tim::string_view_t{ "omnitrac=_" };
     for(auto& itr : _v)
         itr = tolower(itr);
     auto _pos = _v.find(_prefix);
@@ -172,7 +172,7 @@ auto cfg_fini_callbacks = std::vector<std::function<void()>>{};
 void
 finalize()
 {
-    OMNITRACE_DEBUG("[omnitrace_finalize] Disabling signal handling...\n");
+    OMNITRACE_DEBUG("[rocprof-sys_finalize] Disabling signal handling...\n");
     tim::signals::disable_signal_detection();
     _settings_are_configured() = false;
     for(const auto& itr : cfg_fini_callbacks)
@@ -255,7 +255,7 @@ configure_settings(bool _init)
 
     OMNITRACE_CONFIG_EXT_SETTING(int, "OMNITRACE_DL_VERBOSE",
                                  "Verbosity within the omnitrace-dl library", 0,
-                                 "debugging", "libomnitrace-dl", "advanced");
+                                 "debugging", "librocprof-sys-dl", "advanced");
 
     OMNITRACE_CONFIG_SETTING(
         size_t, "OMNITRACE_NUM_THREADS_HINT",
@@ -1521,17 +1521,16 @@ print_banner(std::ostream& _os)
 {
     static const char* _banner = R"banner(
 
-      ______   .___  ___. .__   __.  __  .___________..______          ___       ______  _______
-     /  __  \  |   \/   | |  \ |  | |  | |           ||   _  \        /   \     /      ||   ____|
-    |  |  |  | |  \  /  | |   \|  | |  | `---|  |----`|  |_)  |      /  ^  \   |  ,----'|  |__
-    |  |  |  | |  |\/|  | |  . `  | |  |     |  |     |      /      /  /_\  \  |  |     |   __|
-    |  `--'  | |  |  |  | |  |\   | |  |     |  |     |  |\  \----./  _____  \ |  `----.|  |____
-     \______/  |__|  |__| |__| \__| |__|     |__|     | _| `._____/__/     \__\ \______||_______|
+    ____   ___   ____ __  __   ______   ______ _____ _____ __  __ ____    ____  ____   ___  _____ ___ _     _____ ____  
+    |  _ \ / _ \ / ___|  \/  | / ___\ \ / / ___|_   _| ____|  \/  / ___|  |  _ \|  _ \ / _ \|  ___|_ _| |   | ____|  _ \ 
+    | |_) | | | | |   | |\/| | \___ \\ V /\___ \ | | |  _| | |\/| \___ \  | |_) | |_) | | | | |_   | || |   |  _| | |_) |
+    |  _ <| |_| | |___| |  | |  ___) || |  ___) || | | |___| |  | |___) | |  __/|  _ <| |_| |  _|  | || |___| |___|  _ < 
+    |_| \_\\___/ \____|_|  |_| |____/ |_| |____/ |_| |_____|_|  |_|____/  |_|   |_| \_\\___/|_|   |___|_____|_____|_| \_\                                                            
 
     )banner";
 
     std::stringstream _version_info{};
-    _version_info << "omnitrace v" << OMNITRACE_VERSION_STRING;
+    _version_info << "rocprof-sys v" << OMNITRACE_VERSION_STRING;
 
     namespace join = ::timemory::join;
 
@@ -1917,7 +1916,7 @@ get_use_sampling()
     return static_cast<tim::tsettings<bool>&>(*_v->second).get();
 #else
     OMNITRACE_THROW(
-        "Error! sampling was enabled but omnitrace was not built with libunwind support");
+        "Error! sampling was enabled but rocprof-sys was not built with libunwind support");
     static bool _v = false;
     return _v;
 #endif

From b0d51ac932abb1dc4fd8a77571871fff2b7762ba Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 12:19:56 -0400
Subject: [PATCH 07/14] Rebranding of lib omnitrace, console log.

---
 source/lib/omnitrace/library.cpp                       |  8 ++++----
 source/lib/omnitrace/library/causal/experiment.cpp     |  2 +-
 .../omnitrace/library/components/category_region.hpp   |  2 +-
 .../library/components/pthread_create_gotcha.cpp       |  2 +-
 source/lib/omnitrace/library/kokkosp.cpp               | 10 +++++-----
 source/lib/omnitrace/library/ompt.cpp                  |  2 +-
 source/lib/omnitrace/library/perf.cpp                  |  2 +-
 source/lib/omnitrace/library/ptl.cpp                   |  2 +-
 source/lib/omnitrace/library/sampling.cpp              |  2 +-
 source/lib/omnitrace/library/thread_info.cpp           |  8 ++++----
 source/lib/omnitrace/library/tracing.hpp               |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/source/lib/omnitrace/library.cpp b/source/lib/omnitrace/library.cpp
index 1086989c0..bf04e627f 100644
--- a/source/lib/omnitrace/library.cpp
+++ b/source/lib/omnitrace/library.cpp
@@ -278,7 +278,7 @@ omnitrace_set_env_hidden(const char* env_name, const char* env_val)
     {
         OMNITRACE_WARNING_F(
             0,
-            "omnitrace_set_env(\"%s\", \"%s\") called after omnitrace was initialized. "
+            "omnitrace_set_env(\"%s\", \"%s\") called after rocprof-sys was initialized. "
             "state = %s. This environment variable will have no effect\n",
             env_name, env_val, std::to_string(get_state()).c_str());
     }
@@ -336,7 +336,7 @@ omnitrace_set_mpi_hidden(bool use, bool attached)
     {
         OMNITRACE_WARNING_F(
             0,
-            "omnitrace_set_mpi(use=%s, attached=%s) called after omnitrace was "
+            "omnitrace_set_mpi(use=%s, attached=%s) called after rocprof-sys was "
             "initialized. state = %s. MPI support may not be properly initialized. Use "
             "OMNITRACE_USE_MPIP=ON and OMNITRACE_USE_PID=ON to ensure full support\n",
             std::to_string(use).c_str(), std::to_string(attached).c_str(),
@@ -598,8 +598,8 @@ omnitrace_init_hidden(const char* _mode, bool _is_binary_rewrite, const char* _a
             OMNITRACE_WARNING_F(
                 0,
                 "omnitrace_init(mode=%s, is_binary_rewrite=%s, argv0=%s) "
-                "called after omnitrace was initialized. state = %s. Mode-based settings "
-                "(via -M <MODE> passed to omnitrace exe) may not be properly "
+                "called after rocprof-sys was initialized. state = %s. Mode-based settings "
+                "(via -M <MODE> passed to rocprof-sys exe) may not be properly "
                 "configured.\n",
                 _mode, std::to_string(_is_binary_rewrite).c_str(), _argv0.c_str(),
                 std::to_string(get_state()).c_str());
diff --git a/source/lib/omnitrace/library/causal/experiment.cpp b/source/lib/omnitrace/library/causal/experiment.cpp
index 0ab6c3886..6a7f12b31 100644
--- a/source/lib/omnitrace/library/causal/experiment.cpp
+++ b/source/lib/omnitrace/library/causal/experiment.cpp
@@ -345,7 +345,7 @@ experiment::stop()
             "Warning! causal experimentation hasn't seen at least 5 progress points "
             "in the last %li experiments. Progress points are necessary for measuring "
             "the effect of the virtual speed-up. Please visit "
-            "https://rocm.github.io/omnitrace/ for documentation on progress "
+            "https://rocm.github.io/rocprofiler-systems/ for documentation on progress "
             "points and how to add them\n",
             global_scaling_increments);
     }
diff --git a/source/lib/omnitrace/library/components/category_region.hpp b/source/lib/omnitrace/library/components/category_region.hpp
index b0348f84d..0e6add50a 100644
--- a/source/lib/omnitrace/library/components/category_region.hpp
+++ b/source/lib/omnitrace/library/components/category_region.hpp
@@ -290,7 +290,7 @@ category_region<CategoryT>::mark(std::string_view name, Args&&...)
     {
         OMNITRACE_CONDITIONAL_PRINT(
             tracing::debug_mark,
-            "[%s][PID=%i][state=%s][thread_state=%s] omnitrace_progress(%s)\n",
+            "[%s][PID=%i][state=%s][thread_state=%s] rocprof-sys_progress(%s)\n",
             category_name, process::get_id(), std::to_string(get_state()).c_str(),
             std::to_string(get_thread_state()).c_str(), name.data());
 
diff --git a/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp b/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp
index e34c83063..35fff8dc2 100644
--- a/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp
+++ b/source/lib/omnitrace/library/components/pthread_create_gotcha.cpp
@@ -276,7 +276,7 @@ pthread_create_gotcha::wrapper::operator()() const
     {
         OMNITRACE_BASIC_VERBOSE(
             2,
-            "[PID=%i][rank=%i] Thread %s (parent: %s) created [started by omnitrace]\n",
+            "[PID=%i][rank=%i] Thread %s (parent: %s) created [started by rocprof-sys]\n",
             process::get_id(), dmp::rank(), _info->index_data->as_string().c_str(),
             _parent_info->index_data->as_string().c_str());
     }
diff --git a/source/lib/omnitrace/library/kokkosp.cpp b/source/lib/omnitrace/library/kokkosp.cpp
index df19b5991..9ae674652 100644
--- a/source/lib/omnitrace/library/kokkosp.cpp
+++ b/source/lib/omnitrace/library/kokkosp.cpp
@@ -208,7 +208,7 @@ extern "C"
         tim::consume_parameters(devInfoCount, deviceInfo);
 
         OMNITRACE_BASIC_VERBOSE_F(
-            0, "Initializing omnitrace kokkos connector (sequence %d, version: %llu)... ",
+            0, "Initializing rocprof-sys kokkos connector (sequence %d, version: %llu)... ",
             loadSeq, (unsigned long long) interfaceVer);
 
         if(_standalone_initialized || (!omnitrace::config::settings_are_configured() &&
@@ -235,7 +235,7 @@ extern "C"
                         for(const auto& litr : _libs)
                             _libs_str << "    " << litr << "\n";
                         OMNITRACE_ABORT(
-                            "%s was invoked with libomnitrace.so as the "
+                            "%s was invoked with librocprof-sys.so as the "
                             "KOKKOS_PROFILE_LIBRARY.\n"
                             "However, libomnitrace-dl.so has already been loaded by the "
                             "process.\nTo avoid duplicate collections culminating is an "
@@ -246,7 +246,7 @@ extern "C"
                 }
             }
 
-            OMNITRACE_BASIC_VERBOSE_F(0, "Initializing omnitrace (standalone)... ");
+            OMNITRACE_BASIC_VERBOSE_F(0, "Initializing rocprof-sys (standalone)... ");
             auto _mode = tim::get_env<std::string>("OMNITRACE_MODE", "trace");
             auto _arg0 = (_initialize_arguments.empty()) ? std::string{ "unknown" }
                                                          : _initialize_arguments.at(0);
@@ -287,12 +287,12 @@ extern "C"
         {
             omnitrace_pop_trace_hidden("kokkos_main");
             OMNITRACE_VERBOSE_F(
-                0, "Finalizing kokkos omnitrace connector (standalone)...\n");
+                0, "Finalizing kokkos rocprof-sys connector (standalone)...\n");
             omnitrace_finalize_hidden();
         }
         else
         {
-            OMNITRACE_VERBOSE_F(0, "Finalizing kokkos omnitrace connector... ");
+            OMNITRACE_VERBOSE_F(0, "Finalizing kokkos rocprof-sys connector... ");
             kokkosp::cleanup();
             if(omnitrace::get_verbose() >= 0) fprintf(stderr, "Done\n");
         }
diff --git a/source/lib/omnitrace/library/ompt.cpp b/source/lib/omnitrace/library/ompt.cpp
index 843c5bf83..b83990d5f 100644
--- a/source/lib/omnitrace/library/ompt.cpp
+++ b/source/lib/omnitrace/library/ompt.cpp
@@ -117,7 +117,7 @@ tool_initialize(ompt_function_lookup_t lookup, int initial_device_num,
     {
         OMNITRACE_BASIC_WARNING(
             0,
-            "[%s] invoked before omnitrace was initialized. In instrumentation mode, "
+            "[%s] invoked before rocprof-sys was initialized. In instrumentation mode, "
             "settings exported to the environment have not been propagated yet...\n",
             __FUNCTION__);
         omnitrace::configure_settings();
diff --git a/source/lib/omnitrace/library/perf.cpp b/source/lib/omnitrace/library/perf.cpp
index 476515b6d..bac41bffb 100644
--- a/source/lib/omnitrace/library/perf.cpp
+++ b/source/lib/omnitrace/library/perf.cpp
@@ -180,7 +180,7 @@ perf_event::open(struct perf_event_attr& _pe, pid_t _pid, int _cpu)
             true, "Failed to open perf event. Consider tweaking "
                       << path << " to 2 or less "
                       << "(current value is " << value << "), "
-                      << "or run omnitrace as a privileged user (with CAP_SYS_ADMIN).");
+                      << "or run rocprof-sys as a privileged user (with CAP_SYS_ADMIN).");
     }
 
     // If sampling, map the perf event file
diff --git a/source/lib/omnitrace/library/ptl.cpp b/source/lib/omnitrace/library/ptl.cpp
index 5b9638138..133b021fd 100644
--- a/source/lib/omnitrace/library/ptl.cpp
+++ b/source/lib/omnitrace/library/ptl.cpp
@@ -192,7 +192,7 @@ shutdown()
 
     if(get_thread_pool_state() == State::Active)
     {
-        OMNITRACE_DEBUG_F("Destroying the omnitrace thread pool...\n");
+        OMNITRACE_DEBUG_F("Destroying the rocprof-sys thread pool...\n");
         get_thread_pool().destroy_threadpool();
         get_thread_pool_state() = State::Finalized;
     }
diff --git a/source/lib/omnitrace/library/sampling.cpp b/source/lib/omnitrace/library/sampling.cpp
index 3c991aa3d..9006022f7 100644
--- a/source/lib/omnitrace/library/sampling.cpp
+++ b/source/lib/omnitrace/library/sampling.cpp
@@ -421,7 +421,7 @@ offload_buffer(int64_t _seq, sampler_buffer_t&& _buf)
 {
     OMNITRACE_REQUIRE(get_use_tmp_files())
         << "Error! sampling allocator tries to offload buffer of samples but "
-           "omnitrace was configured to not use temporary files\n";
+           "rocprof-sys was configured to not use temporary files\n";
 
     // use homemade atomic_mutex/atomic_lock since contention will be low
     // and using pthread_lock might trigger our wrappers
diff --git a/source/lib/omnitrace/library/thread_info.cpp b/source/lib/omnitrace/library/thread_info.cpp
index 01ebf95f1..c10b196e5 100644
--- a/source/lib/omnitrace/library/thread_info.cpp
+++ b/source/lib/omnitrace/library/thread_info.cpp
@@ -91,14 +91,14 @@ init_index_data(int64_t _tid, bool _offset = false)
         {
             OMNITRACE_BASIC_VERBOSE_F(_verb,
                                       "Thread %li on PID %i (rank: %i) assigned "
-                                      "omnitrace TID %li (internal: %li)\n",
+                                      "rocprof-sys TID %li (internal: %li)\n",
                                       itr->system_value, process::get_id(), dmp::rank(),
                                       itr->sequent_value, itr->internal_value);
         }
         else
         {
             OMNITRACE_VERBOSE_F(_verb,
-                                "Thread %li on PID %i (rank: %i) assigned omnitrace TID "
+                                "Thread %li on PID %i (rank: %i) assigned rocprof-sys TID "
                                 "%li (internal: %li)\n",
                                 itr->system_value, process::get_id(), dmp::rank(),
                                 itr->sequent_value, itr->internal_value);
@@ -285,12 +285,12 @@ thread_info::get(int64_t _tid, ThreadIdType _type)
     }
     else if(_type == ThreadIdType::PthreadID)
     {
-        OMNITRACE_THROW("omnitrace does not support thread_info::get(int64_t, "
+        OMNITRACE_THROW("rocprof-sys does not support thread_info::get(int64_t, "
                         "ThreadIdType) with ThreadIdType::PthreadID\n");
     }
     else if(_type == ThreadIdType::StlThreadID)
     {
-        OMNITRACE_THROW("omnitrace does not support thread_info::get(int64_t, "
+        OMNITRACE_THROW("rocprof-sys does not support thread_info::get(int64_t, "
                         "ThreadIdType) with ThreadIdType::StlThreadID\n");
     }
 
diff --git a/source/lib/omnitrace/library/tracing.hpp b/source/lib/omnitrace/library/tracing.hpp
index 3fa6e0289..5b322fdd0 100644
--- a/source/lib/omnitrace/library/tracing.hpp
+++ b/source/lib/omnitrace/library/tracing.hpp
@@ -309,7 +309,7 @@ get_timemory(CategoryT, std::string_view name)
     auto& _data = tracing::get_instrumentation_bundles();
     if(OMNITRACE_UNLIKELY(_data == nullptr || _data->empty()))
     {
-        OMNITRACE_DEBUG("[%s] skipped %s :: empty bundle stack\n", "omnitrace_pop_trace",
+        OMNITRACE_DEBUG("[%s] skipped %s :: empty bundle stack\n", "rocprof-sys_pop_trace",
                         name.data());
         return return_type{ nullptr, -1 };
     }

From 7c8bafea115cd8dd44016d611c9da8c16453b955 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 15:05:59 -0400
Subject: [PATCH 08/14] Rebranding of lib omnitrace-dl, console log.

---
 source/lib/omnitrace-dl/dl.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/lib/omnitrace-dl/dl.cpp b/source/lib/omnitrace-dl/dl.cpp
index 937d479c5..e186a4c44 100644
--- a/source/lib/omnitrace-dl/dl.cpp
+++ b/source/lib/omnitrace-dl/dl.cpp
@@ -63,14 +63,14 @@
         if(VARNAME == nullptr && _omnitrace_dl_verbose >= _warn_verbose)                 \
         {                                                                                \
             OMNITRACE_COMMON_LIBRARY_LOG_START                                           \
-            fprintf(stderr, "[omnitrace][dl][pid=%i]> %s :: %s\n", getpid(), FUNCNAME,   \
+            fprintf(stderr, "[rocprof-sys][dl][pid=%i]> %s :: %s\n", getpid(), FUNCNAME,   \
                     dlerror());                                                          \
             OMNITRACE_COMMON_LIBRARY_LOG_END                                             \
         }                                                                                \
         else if(_omnitrace_dl_verbose > _info_verbose)                                   \
         {                                                                                \
             OMNITRACE_COMMON_LIBRARY_LOG_START                                           \
-            fprintf(stderr, "[omnitrace][dl][pid=%i]> %s :: success\n", getpid(),        \
+            fprintf(stderr, "[rocprof-sys][dl][pid=%i]> %s :: success\n", getpid(),        \
                     FUNCNAME);                                                           \
             OMNITRACE_COMMON_LIBRARY_LOG_END                                             \
         }                                                                                \
@@ -229,11 +229,11 @@ struct OMNITRACE_INTERNAL_API indirect
         if(_omnitrace_dl_verbose >= 1)
         {
             OMNITRACE_COMMON_LIBRARY_LOG_START
-            fprintf(stderr, "[omnitrace][dl][pid=%i] %s resolved to '%s'\n", getpid(),
+            fprintf(stderr, "[rocprof-sys][dl][pid=%i] %s resolved to '%s'\n", getpid(),
                     ::basename(_omnilib.c_str()), m_omnilib.c_str());
-            fprintf(stderr, "[omnitrace][dl][pid=%i] %s resolved to '%s'\n", getpid(),
+            fprintf(stderr, "[rocprof-sys][dl][pid=%i] %s resolved to '%s'\n", getpid(),
                     ::basename(_dllib.c_str()), m_dllib.c_str());
-            fprintf(stderr, "[omnitrace][dl][pid=%i] %s resolved to '%s'\n", getpid(),
+            fprintf(stderr, "[rocprof-sys][dl][pid=%i] %s resolved to '%s'\n", getpid(),
                     ::basename(_userlib.c_str()), m_userlib.c_str());
             OMNITRACE_COMMON_LIBRARY_LOG_END
         }
@@ -258,7 +258,7 @@ struct OMNITRACE_INTERNAL_API indirect
             if(_omnitrace_dl_verbose >= 2)
             {
                 OMNITRACE_COMMON_LIBRARY_LOG_START
-                fprintf(stderr, "[omnitrace][dl][pid=%i] dlopen(\"%s\", %s) :: success\n",
+                fprintf(stderr, "[rocprof-sys][dl][pid=%i] dlopen(\"%s\", %s) :: success\n",
                         getpid(), _lib.c_str(), _omnitrace_dl_dlopen_descr);
                 OMNITRACE_COMMON_LIBRARY_LOG_END
             }
@@ -269,7 +269,7 @@ struct OMNITRACE_INTERNAL_API indirect
             {
                 perror("dlopen");
                 OMNITRACE_COMMON_LIBRARY_LOG_START
-                fprintf(stderr, "[omnitrace][dl][pid=%i] dlopen(\"%s\", %s) :: %s\n",
+                fprintf(stderr, "[rocprof-sys][dl][pid=%i] dlopen(\"%s\", %s) :: %s\n",
                         getpid(), _lib.c_str(), _omnitrace_dl_dlopen_descr, dlerror());
                 OMNITRACE_COMMON_LIBRARY_LOG_END
             }
@@ -584,7 +584,7 @@ bool _omnitrace_dl_fini = (std::atexit([]() {
     {                                                                                    \
         fflush(stderr);                                                                  \
         OMNITRACE_COMMON_LIBRARY_LOG_START                                               \
-        fprintf(stderr, "[omnitrace][" OMNITRACE_COMMON_LIBRARY_NAME "][%i] ",           \
+        fprintf(stderr, "[rocprof-sys][" OMNITRACE_COMMON_LIBRARY_NAME "][%i] ",           \
                 getpid());                                                               \
         fprintf(stderr, __VA_ARGS__);                                                    \
         OMNITRACE_COMMON_LIBRARY_LOG_END                                                 \
@@ -1087,9 +1087,9 @@ extern "C"
     void OnLoadToolProp(void* settings)
     {
         OMNITRACE_DL_LOG(-16,
-                         "invoking %s(rocprofiler_settings_t*) within omnitrace-dl.so "
+                         "invoking %s(rocprofiler_settings_t*) within rocprof-sys-dl.so "
                          "will cause a silent failure for rocprofiler. ROCP_TOOL_LIB "
-                         "should be set to libomnitrace.so\n",
+                         "should be set to librocprof-sys.so\n",
                          __FUNCTION__);
         abort();
         return OMNITRACE_DL_INVOKE(get_indirect().rocp_on_load_tool_prop_f, settings);

From e32b7619b21acdd50fe9462c036b54c394e751a9 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 15:24:08 -0400
Subject: [PATCH 09/14] Rebranding of lib omnitrace-rt, console log.

---
 source/lib/omnitrace-rt/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/lib/omnitrace-rt/CMakeLists.txt b/source/lib/omnitrace-rt/CMakeLists.txt
index c189d4d29..9fc971ff9 100644
--- a/source/lib/omnitrace-rt/CMakeLists.txt
+++ b/source/lib/omnitrace-rt/CMakeLists.txt
@@ -129,7 +129,7 @@ add_custom_target(
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
     DEPENDS omnitrace-rt-library
     COMMENT
-        "Creating ${CMAKE_SHARED_LIBRARY_PREFIX}dyninstAPI_RT${CMAKE_SHARED_LIBRARY_SUFFIX} to omnitrace-rt..."
+        "Creating ${CMAKE_SHARED_LIBRARY_PREFIX}dyninstAPI_RT${CMAKE_SHARED_LIBRARY_SUFFIX} to rocprof-sys-rt..."
     )
 
 install(

From 90bc2fe48e732ade8f6985a7c0492c552c973ed5 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 15:40:35 -0400
Subject: [PATCH 10/14] Rebranding of python cmake and gui, console log and
 readme.md.

---
 source/python/cmake/ConfigPython.cmake | 2 +-
 source/python/gui/README.md            | 6 +++---
 source/python/gui/setup.cfg            | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/python/cmake/ConfigPython.cmake b/source/python/cmake/ConfigPython.cmake
index 06bcc64e9..1654082e4 100644
--- a/source/python/cmake/ConfigPython.cmake
+++ b/source/python/cmake/ConfigPython.cmake
@@ -54,7 +54,7 @@ foreach(_VAR FIND_STRATEGY FIND_VIRTUALENV FIND_FRAMEWORK FIND_IMPLEMENTATIONS
     if(DEFINED Python3_${_VAR})
         set(Python_${_VAR}
             "${Python3_${_VAR}}"
-            CACHE STRING "Set via Python3_${_VAR} setting (omnitrace)")
+            CACHE STRING "Set via Python3_${_VAR} setting (rocprof-sys)")
         mark_as_advanced(Python_${_VAR})
         mark_as_advanced(Python3_${_VAR})
     endif()
diff --git a/source/python/gui/README.md b/source/python/gui/README.md
index 0851fb127..eb571f9f4 100644
--- a/source/python/gui/README.md
+++ b/source/python/gui/README.md
@@ -1,4 +1,4 @@
-# Omnitrace Causal Viewer
+# ROCm Systems Profiler Causal Viewer
 
 ## Installation
 
@@ -13,13 +13,13 @@ python -m pip install .
 #### Console Script
 
 ```console
-omnitrace-causal-plot <args...>
+rocprof-sys-causal-plot <args...>
 ```
 
 #### Module
 
 ```console
-python -m omnitrace_causal_viewer <args...>
+python -m rocprof-sys_causal_viewer <args...>
 ```
 
 ### From source tree
diff --git a/source/python/gui/setup.cfg b/source/python/gui/setup.cfg
index b4d1b3f00..429752a6f 100644
--- a/source/python/gui/setup.cfg
+++ b/source/python/gui/setup.cfg
@@ -1,10 +1,10 @@
 [metadata]
 name = omnitrace-causal-viewer
-url = https://github.com/ROCm/omnitrace
-download_url = https://github.com/ROCm/omnitrace.git
+url = https://github.com/ROCm/rocprofiler-systems
+download_url = https://github.com/ROCm/rocprofiler-systems.git
 maintainer = AMD Research
 license = MIT
-description = GUI for viewing Omnitrace causal profiles
+description = GUI for viewing ROCm Systems Profiler causal profiles
 keywords =
     gui
     causal profiling
@@ -22,7 +22,7 @@ classifiers =
     Programming Language :: Python :: 3
 
 [options]
-packages = omnitrace_causal_viewer
+packages = rocprof-sys_causal_viewer
 zip_safe = true
 include_package_data = true
 

From ed50f46a75c9334e83e8cbab4efcb683802f6f38 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 16:29:03 -0400
Subject: [PATCH 11/14] Rebranding of lib core, console log.

---
 source/lib/core/argparse.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/lib/core/argparse.cpp b/source/lib/core/argparse.cpp
index c91ad674b..5ce3c0d92 100644
--- a/source/lib/core/argparse.cpp
+++ b/source/lib/core/argparse.cpp
@@ -855,7 +855,7 @@ add_core_arguments(parser_t& _parser, parser_data& _data)
                 "active "
                 "threads would equate to ~1 second of realtime. If this proves to be "
                 "difficult to handle in practice, please file a feature request for "
-                "omnitrace to auto-scale based on the number of threads.")
+                "rocprof-sys to auto-scale based on the number of threads.")
             .count(1)
             .dtype("clock-id")
             .action([&](parser_t& p) {
@@ -1191,14 +1191,14 @@ add_core_arguments(parser_t& _parser, parser_data& _data)
 
     add_group_arguments(_parser, "sampling", _data);
 
-    _parser.start_group("HARDWARE COUNTER OPTIONS", "See also: omnitrace-avail -H");
+    _parser.start_group("HARDWARE COUNTER OPTIONS", "See also: rocprof-sys-avail -H");
 
     if(_data.environ_filter("cpu_events", _data))
     {
         _parser
             .add_argument({ "-C", "--cpu-events" },
                           "Set the CPU hardware counter events to record (ref: "
-                          "`omnitrace-avail -H -c CPU`)")
+                          "`rocprof-sys-avail -H -c CPU`)")
             .min_count(1)
             .dtype("[EVENT ...]")
             .action([&](parser_t& p) {
@@ -1216,7 +1216,7 @@ add_core_arguments(parser_t& _parser, parser_data& _data)
         _parser
             .add_argument({ "-G", "--gpu-events" },
                           "Set the GPU hardware counter events to record (ref: "
-                          "`omnitrace-avail -H -c GPU`)")
+                          "`rocprof-sys-avail -H -c GPU`)")
             .min_count(1)
             .dtype("[EVENT ...]")
             .action([&](parser_t& p) {
@@ -1353,7 +1353,7 @@ add_group_arguments(parser_t& _parser, const std::string& _group_name, parser_da
                                }),
                 _choices.end());
             _choices.emplace_back(
-                "... run `omnitrace-avail -H -c CPU` for full list ...");
+                "... run `rocprof-sys-avail -H -c CPU` for full list ...");
             itr.second->set_choices(_choices);
         }
     }
@@ -1414,7 +1414,7 @@ add_extended_arguments(parser_t& _parser, parser_data& _data)
                                }),
                 _choices.end());
             _choices.emplace_back(
-                "... run `omnitrace-avail -H -c CPU` for full list ...");
+                "... run `rocprof-sys-avail -H -c CPU` for full list ...");
             itr.second->set_choices(_choices);
         }
 

From a107c9ad529ee3f0aa8c78057e95516eb8728338 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 17:28:37 -0400
Subject: [PATCH 12/14] Fix formating.

---
 source/lib/core/config.cpp               |  9 +++++----
 source/lib/omnitrace-dl/dl.cpp           | 13 +++++++------
 source/lib/omnitrace/library.cpp         |  3 ++-
 source/lib/omnitrace/library/kokkosp.cpp |  3 ++-
 source/python/gui/source/__main__.py     |  4 +++-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/source/lib/core/config.cpp b/source/lib/core/config.cpp
index 01848a770..5c2d96fd2 100644
--- a/source/lib/core/config.cpp
+++ b/source/lib/core/config.cpp
@@ -1320,7 +1320,8 @@ get_use_sampling_cputime()
     return static_cast<tim::tsettings<bool>&>(*_v->second).get();
 }
 
-std::set<int> get_sampling_signals(int64_t)
+std::set<int>
+get_sampling_signals(int64_t)
 {
     auto _v = std::set<int>{};
     if(get_use_causal())
@@ -1594,7 +1595,7 @@ print_settings(
             {
                 size_t _wextra = (_md && i < 2) ? 2 : 0;
                 _widths.at(i)  = std::max<size_t>(_widths.at(i),
-                                                 _data.back().at(i).length() + _wextra);
+                                                  _data.back().at(i).length() + _wextra);
             }
         }
     }
@@ -1915,8 +1916,8 @@ get_use_sampling()
     static auto _v = get_config()->find("OMNITRACE_USE_SAMPLING");
     return static_cast<tim::tsettings<bool>&>(*_v->second).get();
 #else
-    OMNITRACE_THROW(
-        "Error! sampling was enabled but rocprof-sys was not built with libunwind support");
+    OMNITRACE_THROW("Error! sampling was enabled but rocprof-sys was not built with "
+                    "libunwind support");
     static bool _v = false;
     return _v;
 #endif
diff --git a/source/lib/omnitrace-dl/dl.cpp b/source/lib/omnitrace-dl/dl.cpp
index e186a4c44..6070af8af 100644
--- a/source/lib/omnitrace-dl/dl.cpp
+++ b/source/lib/omnitrace-dl/dl.cpp
@@ -63,14 +63,14 @@
         if(VARNAME == nullptr && _omnitrace_dl_verbose >= _warn_verbose)                 \
         {                                                                                \
             OMNITRACE_COMMON_LIBRARY_LOG_START                                           \
-            fprintf(stderr, "[rocprof-sys][dl][pid=%i]> %s :: %s\n", getpid(), FUNCNAME,   \
+            fprintf(stderr, "[rocprof-sys][dl][pid=%i]> %s :: %s\n", getpid(), FUNCNAME, \
                     dlerror());                                                          \
             OMNITRACE_COMMON_LIBRARY_LOG_END                                             \
         }                                                                                \
         else if(_omnitrace_dl_verbose > _info_verbose)                                   \
         {                                                                                \
             OMNITRACE_COMMON_LIBRARY_LOG_START                                           \
-            fprintf(stderr, "[rocprof-sys][dl][pid=%i]> %s :: success\n", getpid(),        \
+            fprintf(stderr, "[rocprof-sys][dl][pid=%i]> %s :: success\n", getpid(),      \
                     FUNCNAME);                                                           \
             OMNITRACE_COMMON_LIBRARY_LOG_END                                             \
         }                                                                                \
@@ -258,7 +258,8 @@ struct OMNITRACE_INTERNAL_API indirect
             if(_omnitrace_dl_verbose >= 2)
             {
                 OMNITRACE_COMMON_LIBRARY_LOG_START
-                fprintf(stderr, "[rocprof-sys][dl][pid=%i] dlopen(\"%s\", %s) :: success\n",
+                fprintf(stderr,
+                        "[rocprof-sys][dl][pid=%i] dlopen(\"%s\", %s) :: success\n",
                         getpid(), _lib.c_str(), _omnitrace_dl_dlopen_descr);
                 OMNITRACE_COMMON_LIBRARY_LOG_END
             }
@@ -584,7 +585,7 @@ bool _omnitrace_dl_fini = (std::atexit([]() {
     {                                                                                    \
         fflush(stderr);                                                                  \
         OMNITRACE_COMMON_LIBRARY_LOG_START                                               \
-        fprintf(stderr, "[rocprof-sys][" OMNITRACE_COMMON_LIBRARY_NAME "][%i] ",           \
+        fprintf(stderr, "[rocprof-sys][" OMNITRACE_COMMON_LIBRARY_NAME "][%i] ",         \
                 getpid());                                                               \
         fprintf(stderr, __VA_ARGS__);                                                    \
         OMNITRACE_COMMON_LIBRARY_LOG_END                                                 \
@@ -1426,8 +1427,8 @@ extern "C"
                 {
                     auto _var = std::string{ _env_v }.substr(0, _pos);
                     auto _val = std::string{ _env_v }.substr(_pos + 1);
-                    OMNITRACE_DL_LOG(1, "%s(%s, %s)\n", "rocprof-sys_set_env", _var.c_str(),
-                                     _val.c_str());
+                    OMNITRACE_DL_LOG(1, "%s(%s, %s)\n", "rocprof-sys_set_env",
+                                     _var.c_str(), _val.c_str());
                     setenv(_var.c_str(), _val.c_str(), 0);
                 }
             }
diff --git a/source/lib/omnitrace/library.cpp b/source/lib/omnitrace/library.cpp
index bf04e627f..e91579dff 100644
--- a/source/lib/omnitrace/library.cpp
+++ b/source/lib/omnitrace/library.cpp
@@ -598,7 +598,8 @@ omnitrace_init_hidden(const char* _mode, bool _is_binary_rewrite, const char* _a
             OMNITRACE_WARNING_F(
                 0,
                 "omnitrace_init(mode=%s, is_binary_rewrite=%s, argv0=%s) "
-                "called after rocprof-sys was initialized. state = %s. Mode-based settings "
+                "called after rocprof-sys was initialized. state = %s. Mode-based "
+                "settings "
                 "(via -M <MODE> passed to rocprof-sys exe) may not be properly "
                 "configured.\n",
                 _mode, std::to_string(_is_binary_rewrite).c_str(), _argv0.c_str(),
diff --git a/source/lib/omnitrace/library/kokkosp.cpp b/source/lib/omnitrace/library/kokkosp.cpp
index 9ae674652..b3138fdfb 100644
--- a/source/lib/omnitrace/library/kokkosp.cpp
+++ b/source/lib/omnitrace/library/kokkosp.cpp
@@ -208,7 +208,8 @@ extern "C"
         tim::consume_parameters(devInfoCount, deviceInfo);
 
         OMNITRACE_BASIC_VERBOSE_F(
-            0, "Initializing rocprof-sys kokkos connector (sequence %d, version: %llu)... ",
+            0,
+            "Initializing rocprof-sys kokkos connector (sequence %d, version: %llu)... ",
             loadSeq, (unsigned long long) interfaceVer);
 
         if(_standalone_initialized || (!omnitrace::config::settings_are_configured() &&
diff --git a/source/python/gui/source/__main__.py b/source/python/gui/source/__main__.py
index 24aa5868d..879683f22 100644
--- a/source/python/gui/source/__main__.py
+++ b/source/python/gui/source/__main__.py
@@ -162,7 +162,9 @@ def main():
     my_parser.add_argument(
         "--version",
         action="version",
-        version="ROCm Systems Profiler Causal Viewer v{}\n".format(f"{__version__}".strip("\n")),
+        version="ROCm Systems Profiler Causal Viewer v{}\n".format(
+            f"{__version__}".strip("\n")
+        ),
     )
 
     my_parser.add_argument(

From 02cea6f18bb8bb04c56bc61863d0a4d54a33cace Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 17:41:18 -0400
Subject: [PATCH 13/14] Fix formating, part2.

---
 source/lib/core/config.cpp                   |  2 +-
 source/lib/omnitrace/library/thread_info.cpp | 11 ++++++-----
 source/lib/omnitrace/library/tracing.hpp     |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/lib/core/config.cpp b/source/lib/core/config.cpp
index 5c2d96fd2..6364e7006 100644
--- a/source/lib/core/config.cpp
+++ b/source/lib/core/config.cpp
@@ -1595,7 +1595,7 @@ print_settings(
             {
                 size_t _wextra = (_md && i < 2) ? 2 : 0;
                 _widths.at(i)  = std::max<size_t>(_widths.at(i),
-                                                  _data.back().at(i).length() + _wextra);
+                                                _data.back().at(i).length() + _wextra);
             }
         }
     }
diff --git a/source/lib/omnitrace/library/thread_info.cpp b/source/lib/omnitrace/library/thread_info.cpp
index c10b196e5..c4892c514 100644
--- a/source/lib/omnitrace/library/thread_info.cpp
+++ b/source/lib/omnitrace/library/thread_info.cpp
@@ -97,11 +97,12 @@ init_index_data(int64_t _tid, bool _offset = false)
         }
         else
         {
-            OMNITRACE_VERBOSE_F(_verb,
-                                "Thread %li on PID %i (rank: %i) assigned rocprof-sys TID "
-                                "%li (internal: %li)\n",
-                                itr->system_value, process::get_id(), dmp::rank(),
-                                itr->sequent_value, itr->internal_value);
+            OMNITRACE_VERBOSE_F(
+                _verb,
+                "Thread %li on PID %i (rank: %i) assigned rocprof-sys TID "
+                "%li (internal: %li)\n",
+                itr->system_value, process::get_id(), dmp::rank(), itr->sequent_value,
+                itr->internal_value);
         }
     }
     return itr;
diff --git a/source/lib/omnitrace/library/tracing.hpp b/source/lib/omnitrace/library/tracing.hpp
index 5b322fdd0..115203380 100644
--- a/source/lib/omnitrace/library/tracing.hpp
+++ b/source/lib/omnitrace/library/tracing.hpp
@@ -309,8 +309,8 @@ get_timemory(CategoryT, std::string_view name)
     auto& _data = tracing::get_instrumentation_bundles();
     if(OMNITRACE_UNLIKELY(_data == nullptr || _data->empty()))
     {
-        OMNITRACE_DEBUG("[%s] skipped %s :: empty bundle stack\n", "rocprof-sys_pop_trace",
-                        name.data());
+        OMNITRACE_DEBUG("[%s] skipped %s :: empty bundle stack\n",
+                        "rocprof-sys_pop_trace", name.data());
         return return_type{ nullptr, -1 };
     }
 

From f9d55547adc599e335a7b1435a87599bf88c3673 Mon Sep 17 00:00:00 2001
From: xuchen-amd <xuchen@amd.com>
Date: Wed, 2 Oct 2024 20:36:31 -0400
Subject: [PATCH 14/14] Fix build error.

---
 source/lib/core/config.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/lib/core/config.cpp b/source/lib/core/config.cpp
index 6364e7006..658989cc3 100644
--- a/source/lib/core/config.cpp
+++ b/source/lib/core/config.cpp
@@ -1522,11 +1522,11 @@ print_banner(std::ostream& _os)
 {
     static const char* _banner = R"banner(
 
-    ____   ___   ____ __  __   ______   ______ _____ _____ __  __ ____    ____  ____   ___  _____ ___ _     _____ ____  
-    |  _ \ / _ \ / ___|  \/  | / ___\ \ / / ___|_   _| ____|  \/  / ___|  |  _ \|  _ \ / _ \|  ___|_ _| |   | ____|  _ \ 
+    ____   ___   ____ __  __   ______   ______ _____ _____ __  __ ____    ____  ____   ___  _____ ___ _     _____ ____
+    |  _ \ / _ \ / ___|  \/  | / ___\ \ / / ___|_   _| ____|  \/  / ___|  |  _ \|  _ \ / _ \|  ___|_ _| |   | ____|  _ \
     | |_) | | | | |   | |\/| | \___ \\ V /\___ \ | | |  _| | |\/| \___ \  | |_) | |_) | | | | |_   | || |   |  _| | |_) |
-    |  _ <| |_| | |___| |  | |  ___) || |  ___) || | | |___| |  | |___) | |  __/|  _ <| |_| |  _|  | || |___| |___|  _ < 
-    |_| \_\\___/ \____|_|  |_| |____/ |_| |____/ |_| |_____|_|  |_|____/  |_|   |_| \_\\___/|_|   |___|_____|_____|_| \_\                                                            
+    |  _ <| |_| | |___| |  | |  ___) || |  ___) || | | |___| |  | |___) | |  __/|  _ <| |_| |  _|  | || |___| |___|  _ <
+    |_| \_\\___/ \____|_|  |_| |____/ |_| |____/ |_| |_____|_|  |_|____/  |_|   |_| \_\\___/|_|   |___|_____|_____|_| \_\
 
     )banner";