From 41b1d91841d249334f29e5e8a44732b01d15c347 Mon Sep 17 00:00:00 2001
From: "Jonathan R. Madsen" <jrmadsen@users.noreply.github.com>
Date: Thu, 24 Aug 2023 19:19:48 -0500
Subject: [PATCH] SortIncludes: true (#19)

* Update .clang-format

- set SortIncludes to true

* Reformat source with includes sorted
---
 .clang-format                                      |  2 +-
 samples/pc_sampling/common.h                       |  4 ++--
 source/include/rocprofiler/hip.h                   |  2 +-
 source/include/rocprofiler/hsa.h                   |  2 +-
 source/lib/common/config.cpp                       | 14 +++++++-------
 source/lib/common/container/atomic_ring_buffer.cpp |  8 ++++----
 source/lib/common/container/atomic_ring_buffer.hpp |  6 +++---
 source/lib/common/container/ring_buffer.cpp        |  2 +-
 source/lib/common/container/static_vector.hpp      |  2 +-
 source/lib/common/environment.hpp                  |  2 +-
 source/lib/common/helper.cpp                       |  8 ++++----
 source/lib/common/helper.hpp                       |  6 +++---
 source/lib/common/units.hpp                        |  2 +-
 source/lib/rocprofiler/hsa/hsa.def.cpp             |  2 +-
 source/lib/rocprofiler/rocprofiler.cpp             |  2 +-
 source/lib/rocprofiler/rocprofiler_config.cpp      | 10 +++++-----
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.clang-format b/.clang-format
index 49ed9e082f..c3c6913868 100644
--- a/.clang-format
+++ b/.clang-format
@@ -87,7 +87,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReflowComments: true
-SortIncludes: false
+SortIncludes: true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
diff --git a/samples/pc_sampling/common.h b/samples/pc_sampling/common.h
index 2a67ad19b9..9880ca43ea 100644
--- a/samples/pc_sampling/common.h
+++ b/samples/pc_sampling/common.h
@@ -3,10 +3,10 @@
 
 #include <rocprofiler/rocprofiler.h>
 
-#include <cstdio>
-#include <cstdlib>
 #include <cstddef>
 #include <cstdint>
+#include <cstdio>
+#include <cstdlib>
 
 constexpr size_t BUFFER_SIZE_BYTES = 4096;
 constexpr size_t WATERMARK         = (BUFFER_SIZE_BYTES / 2);
diff --git a/source/include/rocprofiler/hip.h b/source/include/rocprofiler/hip.h
index 45d56a1431..fe5d36a131 100644
--- a/source/include/rocprofiler/hip.h
+++ b/source/include/rocprofiler/hip.h
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <rocprofiler/hip/api_id.h>
 #include <rocprofiler/hip/api_args.h>
+#include <rocprofiler/hip/api_id.h>
 
 #include <stdint.h>
 
diff --git a/source/include/rocprofiler/hsa.h b/source/include/rocprofiler/hsa.h
index c0abfd7fbc..d19cac16cc 100644
--- a/source/include/rocprofiler/hsa.h
+++ b/source/include/rocprofiler/hsa.h
@@ -22,9 +22,9 @@
 
 #pragma once
 
+#include <rocprofiler/hsa/api_args.h>
 #include <rocprofiler/hsa/api_id.h>
 #include <rocprofiler/hsa/table_api_id.h>
-#include <rocprofiler/hsa/api_args.h>
 
 #include <hsa/hsa.h>
 
diff --git a/source/lib/common/config.cpp b/source/lib/common/config.cpp
index 6ca1fb68d3..e2f7604364 100644
--- a/source/lib/common/config.cpp
+++ b/source/lib/common/config.cpp
@@ -21,20 +21,20 @@
 
 #include "lib/common/config.hpp"
 #include "lib/common/environment.hpp"
+#include "lib/common/helper.hpp"
 #include "lib/common/join.hpp"
 #include "lib/common/log.hpp"
-#include "lib/common/helper.hpp"
 
 #include <unistd.h>
+#include <algorithm>
 #include <cstring>
+#include <ctime>
+#include <filesystem>
+#include <fstream>
+#include <regex>
+#include <sstream>
 #include <string>
 #include <vector>
-#include <ctime>
-#include <sstream>
-#include <fstream>
-#include <algorithm>
-#include <regex>
-#include <filesystem>
 
 namespace rocprofiler
 {
diff --git a/source/lib/common/container/atomic_ring_buffer.cpp b/source/lib/common/container/atomic_ring_buffer.cpp
index a764b7a710..bb2cbd0a5c 100644
--- a/source/lib/common/container/atomic_ring_buffer.cpp
+++ b/source/lib/common/container/atomic_ring_buffer.cpp
@@ -21,16 +21,16 @@
 // SOFTWARE.
 
 #include "atomic_ring_buffer.hpp"
-#include "lib/common/units.hpp"
 #include "lib/common/environment.hpp"
+#include "lib/common/units.hpp"
 
+#include <sys/mman.h>
 #include <cerrno>
+#include <cstddef>
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cstdint>
-#include <cstddef>
-#include <sys/mman.h>
 
 namespace rocprofiler
 {
diff --git a/source/lib/common/container/atomic_ring_buffer.hpp b/source/lib/common/container/atomic_ring_buffer.hpp
index 1b97da7bb8..dec8fba40d 100644
--- a/source/lib/common/container/atomic_ring_buffer.hpp
+++ b/source/lib/common/container/atomic_ring_buffer.hpp
@@ -22,12 +22,14 @@
 
 #pragma once
 
-#include "lib/common/units.hpp"
 #include "lib/common/environment.hpp"
+#include "lib/common/units.hpp"
 
 #include <algorithm>
 #include <atomic>
 #include <cmath>
+#include <cstddef>
+#include <cstdlib>
 #include <fstream>
 #include <functional>
 #include <iomanip>
@@ -36,8 +38,6 @@
 #include <stdexcept>
 #include <utility>
 #include <vector>
-#include <cstddef>
-#include <cstdlib>
 
 namespace rocprofiler
 {
diff --git a/source/lib/common/container/ring_buffer.cpp b/source/lib/common/container/ring_buffer.cpp
index 6e15021ff5..a974cc5620 100644
--- a/source/lib/common/container/ring_buffer.cpp
+++ b/source/lib/common/container/ring_buffer.cpp
@@ -22,11 +22,11 @@
 
 #include "ring_buffer.hpp"
 
+#include <sys/mman.h>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <sys/mman.h>
 
 namespace rocprofiler
 {
diff --git a/source/lib/common/container/static_vector.hpp b/source/lib/common/container/static_vector.hpp
index 24da2d39a9..b6c56662f0 100644
--- a/source/lib/common/container/static_vector.hpp
+++ b/source/lib/common/container/static_vector.hpp
@@ -26,9 +26,9 @@
 
 #include <array>
 #include <atomic>
+#include <cstddef>
 #include <cstdlib>
 #include <initializer_list>
-#include <cstddef>
 
 namespace rocprofiler
 {
diff --git a/source/lib/common/environment.hpp b/source/lib/common/environment.hpp
index 5b75c888d6..24e6a8e463 100644
--- a/source/lib/common/environment.hpp
+++ b/source/lib/common/environment.hpp
@@ -22,6 +22,7 @@
 
 #include "lib/common/log.hpp"
 
+#include <unistd.h>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -30,7 +31,6 @@
 #include <string>
 #include <string_view>
 #include <type_traits>
-#include <unistd.h>
 
 #if !defined(ROCPROFILER_ENVIRON_LOG_NAME)
 #    if defined(ROCPROFILER_COMMON_LIBRARY_NAME)
diff --git a/source/lib/common/helper.cpp b/source/lib/common/helper.cpp
index 31e924606b..c69016aaca 100644
--- a/source/lib/common/helper.cpp
+++ b/source/lib/common/helper.cpp
@@ -22,15 +22,15 @@
 
 #include <amd_comgr/amd_comgr.h>
 
-#include <cstdio>
-#include <cstdarg>
-#include <cstring>
 #include <cxxabi.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
 #include <iomanip>
 #include <iostream>
+#include <set>
 #include <sstream>
 #include <string>
-#include <set>
 
 #define ENABLE_BACKTRACE
 #if defined(ENABLE_BACKTRACE)
diff --git a/source/lib/common/helper.hpp b/source/lib/common/helper.hpp
index d454d70725..4cd36c09a7 100644
--- a/source/lib/common/helper.hpp
+++ b/source/lib/common/helper.hpp
@@ -20,15 +20,15 @@
 
 #pragma once
 
-#include <cstdio>
+#include <cxxabi.h>
+#include <algorithm>
 #include <cstdarg>
+#include <cstdio>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>
-#include <algorithm>
-#include <cxxabi.h>
 
 namespace rocprofiler
 {
diff --git a/source/lib/common/units.hpp b/source/lib/common/units.hpp
index df0be08bac..6d3a88902b 100644
--- a/source/lib/common/units.hpp
+++ b/source/lib/common/units.hpp
@@ -24,6 +24,7 @@
 
 #include "lib/common/environment.hpp"
 
+#include <unistd.h>
 #include <cctype>
 #include <cstdint>
 #include <cstdlib>
@@ -31,7 +32,6 @@
 #include <string>
 #include <tuple>
 #include <unordered_set>
-#include <unistd.h>
 
 namespace rocprofiler
 {
diff --git a/source/lib/rocprofiler/hsa/hsa.def.cpp b/source/lib/rocprofiler/hsa/hsa.def.cpp
index 0f68f47045..33ebc2fc26 100644
--- a/source/lib/rocprofiler/hsa/hsa.def.cpp
+++ b/source/lib/rocprofiler/hsa/hsa.def.cpp
@@ -20,8 +20,8 @@
 
 #include <rocprofiler/hsa.h>
 
-#include "hsa.hpp"
 #include "defines.hpp"
+#include "hsa.hpp"
 
 // clang-format off
 HSA_API_TABLE_LOOKUP_DEFINITION(ROCPROFILER_HSA_API_TABLE_ID_CoreApi, core_)
diff --git a/source/lib/rocprofiler/rocprofiler.cpp b/source/lib/rocprofiler/rocprofiler.cpp
index 6b51995dcc..0e1d25dcda 100644
--- a/source/lib/rocprofiler/rocprofiler.cpp
+++ b/source/lib/rocprofiler/rocprofiler.cpp
@@ -22,8 +22,8 @@
 
 #include <rocprofiler/rocprofiler.h>
 
-#include <vector>
 #include <algorithm>
+#include <vector>
 
 namespace
 {
diff --git a/source/lib/rocprofiler/rocprofiler_config.cpp b/source/lib/rocprofiler/rocprofiler_config.cpp
index 5a29ac602f..9b52c7611e 100644
--- a/source/lib/rocprofiler/rocprofiler_config.cpp
+++ b/source/lib/rocprofiler/rocprofiler_config.cpp
@@ -1,22 +1,22 @@
 
-#include <rocprofiler/rocprofiler.h>
 #include <rocprofiler/config.h>
+#include <rocprofiler/rocprofiler.h>
 
 #include "config_helpers.hpp"
 #include "config_internal.hpp"
 
-#include <atomic>
-#include <cstddef>
 #include <roctracer/roctx.h>
 #include <sys/syscall.h>
 #include <unistd.h>
-#include <mutex>
+#include <atomic>
+#include <cstddef>
 #include <iostream>
+#include <mutex>
 
 #include <hsa/hsa.h>
+#include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ext_amd.h>
 #include <hsa/hsa_ext_image.h>
-#include <hsa/hsa_api_trace.h>
 
 typedef enum
 {