Skip to content

Commit 41b1d91

Browse files
jrmadsenjrmadsen
authored
SortIncludes: true (#19)
* Update .clang-format - set SortIncludes to true * Reformat source with includes sorted
1 parent 39b209c commit 41b1d91

16 files changed

+35
-35
lines changed

‎.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ PenaltyExcessCharacter: 1000000
8787
PenaltyReturnTypeOnItsOwnLine: 200
8888
PointerAlignment: Left
8989
ReflowComments: true
90-
SortIncludes: false
90+
SortIncludes: true
9191
SortUsingDeclarations: true
9292
SpaceAfterCStyleCast: true
9393
SpaceAfterLogicalNot: false

‎samples/pc_sampling/common.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
#include <rocprofiler/rocprofiler.h>
55

6-
#include <cstdio>
7-
#include <cstdlib>
86
#include <cstddef>
97
#include <cstdint>
8+
#include <cstdio>
9+
#include <cstdlib>
1010

1111
constexpr size_t BUFFER_SIZE_BYTES = 4096;
1212
constexpr size_t WATERMARK = (BUFFER_SIZE_BYTES / 2);

‎source/include/rocprofiler/hip.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
#pragma once
2424

25-
#include <rocprofiler/hip/api_id.h>
2625
#include <rocprofiler/hip/api_args.h>
26+
#include <rocprofiler/hip/api_id.h>
2727

2828
#include <stdint.h>
2929

‎source/include/rocprofiler/hsa.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
#pragma once
2424

25+
#include <rocprofiler/hsa/api_args.h>
2526
#include <rocprofiler/hsa/api_id.h>
2627
#include <rocprofiler/hsa/table_api_id.h>
27-
#include <rocprofiler/hsa/api_args.h>
2828

2929
#include <hsa/hsa.h>
3030

‎source/lib/common/config.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121

2222
#include "lib/common/config.hpp"
2323
#include "lib/common/environment.hpp"
24+
#include "lib/common/helper.hpp"
2425
#include "lib/common/join.hpp"
2526
#include "lib/common/log.hpp"
26-
#include "lib/common/helper.hpp"
2727

2828
#include <unistd.h>
29+
#include <algorithm>
2930
#include <cstring>
30-
#include <string>
31-
#include <vector>
3231
#include <ctime>
33-
#include <sstream>
32+
#include <filesystem>
3433
#include <fstream>
35-
#include <algorithm>
3634
#include <regex>
37-
#include <filesystem>
35+
#include <sstream>
36+
#include <string>
37+
#include <vector>
3838

3939
namespace rocprofiler
4040
{

‎source/lib/common/container/atomic_ring_buffer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
// SOFTWARE.
2222

2323
#include "atomic_ring_buffer.hpp"
24-
#include "lib/common/units.hpp"
2524
#include "lib/common/environment.hpp"
25+
#include "lib/common/units.hpp"
2626

27+
#include <sys/mman.h>
2728
#include <cerrno>
29+
#include <cstddef>
30+
#include <cstdint>
2831
#include <cstdio>
2932
#include <cstdlib>
3033
#include <cstring>
31-
#include <cstdint>
32-
#include <cstddef>
33-
#include <sys/mman.h>
3434

3535
namespace rocprofiler
3636
{

‎source/lib/common/container/atomic_ring_buffer.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222

2323
#pragma once
2424

25-
#include "lib/common/units.hpp"
2625
#include "lib/common/environment.hpp"
26+
#include "lib/common/units.hpp"
2727

2828
#include <algorithm>
2929
#include <atomic>
3030
#include <cmath>
31+
#include <cstddef>
32+
#include <cstdlib>
3133
#include <fstream>
3234
#include <functional>
3335
#include <iomanip>
@@ -36,8 +38,6 @@
3638
#include <stdexcept>
3739
#include <utility>
3840
#include <vector>
39-
#include <cstddef>
40-
#include <cstdlib>
4141

4242
namespace rocprofiler
4343
{

‎source/lib/common/container/ring_buffer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
#include "ring_buffer.hpp"
2424

25+
#include <sys/mman.h>
2526
#include <cerrno>
2627
#include <cstdio>
2728
#include <cstdlib>
2829
#include <cstring>
29-
#include <sys/mman.h>
3030

3131
namespace rocprofiler
3232
{

‎source/lib/common/container/static_vector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
#include <array>
2828
#include <atomic>
29+
#include <cstddef>
2930
#include <cstdlib>
3031
#include <initializer_list>
31-
#include <cstddef>
3232

3333
namespace rocprofiler
3434
{

‎source/lib/common/environment.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include "lib/common/log.hpp"
2424

25+
#include <unistd.h>
2526
#include <cstdio>
2627
#include <cstdlib>
2728
#include <cstring>
@@ -30,7 +31,6 @@
3031
#include <string>
3132
#include <string_view>
3233
#include <type_traits>
33-
#include <unistd.h>
3434

3535
#if !defined(ROCPROFILER_ENVIRON_LOG_NAME)
3636
# if defined(ROCPROFILER_COMMON_LIBRARY_NAME)

‎source/lib/common/helper.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222

2323
#include <amd_comgr/amd_comgr.h>
2424

25-
#include <cstdio>
25+
#include <cxxabi.h>
2626
#include <cstdarg>
27+
#include <cstdio>
2728
#include <cstring>
28-
#include <cxxabi.h>
2929
#include <iomanip>
3030
#include <iostream>
31+
#include <set>
3132
#include <sstream>
3233
#include <string>
33-
#include <set>
3434

3535
#define ENABLE_BACKTRACE
3636
#if defined(ENABLE_BACKTRACE)

‎source/lib/common/helper.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020

2121
#pragma once
2222

23-
#include <cstdio>
23+
#include <cxxabi.h>
24+
#include <algorithm>
2425
#include <cstdarg>
26+
#include <cstdio>
2527
#include <iomanip>
2628
#include <iostream>
2729
#include <sstream>
2830
#include <string>
2931
#include <vector>
30-
#include <algorithm>
31-
#include <cxxabi.h>
3232

3333
namespace rocprofiler
3434
{

‎source/lib/common/units.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424

2525
#include "lib/common/environment.hpp"
2626

27+
#include <unistd.h>
2728
#include <cctype>
2829
#include <cstdint>
2930
#include <cstdlib>
3031
#include <iostream>
3132
#include <string>
3233
#include <tuple>
3334
#include <unordered_set>
34-
#include <unistd.h>
3535

3636
namespace rocprofiler
3737
{

‎source/lib/rocprofiler/hsa/hsa.def.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
#include <rocprofiler/hsa.h>
2222

23-
#include "hsa.hpp"
2423
#include "defines.hpp"
24+
#include "hsa.hpp"
2525

2626
// clang-format off
2727
HSA_API_TABLE_LOOKUP_DEFINITION(ROCPROFILER_HSA_API_TABLE_ID_CoreApi, core_)

‎source/lib/rocprofiler/rocprofiler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
#include <rocprofiler/rocprofiler.h>
2424

25-
#include <vector>
2625
#include <algorithm>
26+
#include <vector>
2727

2828
namespace
2929
{

‎source/lib/rocprofiler/rocprofiler_config.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

2-
#include <rocprofiler/rocprofiler.h>
32
#include <rocprofiler/config.h>
3+
#include <rocprofiler/rocprofiler.h>
44

55
#include "config_helpers.hpp"
66
#include "config_internal.hpp"
77

8-
#include <atomic>
9-
#include <cstddef>
108
#include <roctracer/roctx.h>
119
#include <sys/syscall.h>
1210
#include <unistd.h>
13-
#include <mutex>
11+
#include <atomic>
12+
#include <cstddef>
1413
#include <iostream>
14+
#include <mutex>
1515

1616
#include <hsa/hsa.h>
17+
#include <hsa/hsa_api_trace.h>
1718
#include <hsa/hsa_ext_amd.h>
1819
#include <hsa/hsa_ext_image.h>
19-
#include <hsa/hsa_api_trace.h>
2020

2121
typedef enum
2222
{

0 commit comments

Comments
 (0)