Update .clang-format config to sort includes

Also run the new configuration on all existing test and util files. (However note that, as not all files fully conform to clang-format, this only adds the changes to includes!).
tmpark · Mar 5, 2021 · b694698 · b694698
1 parent 0673964
commit b694698
Show file tree

Hide file tree

Showing 44 changed files with 61 additions and 65 deletions.
diff --git a/.clang-format b/.clang-format
@@ -58,6 +58,6 @@ CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 SpaceBeforeParens: ControlStatements
 DisableFormat:   false
-SortIncludes:   false
+SortIncludes:   true
 ...
 
diff --git a/tests/accessor/accessor_api_buffer.cpp b/tests/accessor/accessor_api_buffer.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_buffer_common.h"
+#include "accessor_utility.h"
 
 #define TEST_NAME accessor_api_buffer
 

diff --git a/tests/accessor/accessor_api_buffer_common.h b/tests/accessor/accessor_api_buffer_common.h
@@ -10,9 +10,9 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
-#include "accessor_api_common_buffer_local.h"
 #include "accessor_api_common_all.h"
+#include "accessor_api_common_buffer_local.h"
+#include "accessor_utility.h"
 
 namespace {
 

diff --git a/tests/accessor/accessor_api_buffer_fp16.cpp b/tests/accessor/accessor_api_buffer_fp16.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_buffer_common.h"
+#include "accessor_utility.h"
 
 #define TEST_NAME accessor_api_buffer_fp16
 

diff --git a/tests/accessor/accessor_api_buffer_fp64.cpp b/tests/accessor/accessor_api_buffer_fp64.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_buffer_common.h"
+#include "accessor_utility.h"
 
 #define TEST_NAME accessor_api_buffer_fp64
 

diff --git a/tests/accessor/accessor_api_common_buffer_local.h b/tests/accessor/accessor_api_common_buffer_local.h
@@ -13,8 +13,8 @@
 
 #include "../common/common.h"
 #include "accessor_utility.h"
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 #include <vector>
 

diff --git a/tests/accessor/accessor_api_image.cpp b/tests/accessor/accessor_api_image.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_image_common.h"
+#include "accessor_utility.h"
 
 #include <array>
 #include <numeric>

diff --git a/tests/accessor/accessor_api_image_common.h b/tests/accessor/accessor_api_image_common.h
@@ -10,8 +10,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_common_all.h"
+#include "accessor_utility.h"
 
 #include <array>
 #include <numeric>

diff --git a/tests/accessor/accessor_api_image_fp16.cpp b/tests/accessor/accessor_api_image_fp16.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_image_common.h"
+#include "accessor_utility.h"
 
 #include <array>
 #include <numeric>

diff --git a/tests/accessor/accessor_api_local.cpp b/tests/accessor/accessor_api_local.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_local_common.h"
+#include "accessor_utility.h"
 
 #include <array>
 #include <numeric>

diff --git a/tests/accessor/accessor_api_local_common.h b/tests/accessor/accessor_api_local_common.h
@@ -10,9 +10,9 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
-#include "accessor_api_common_buffer_local.h"
 #include "accessor_api_common_all.h"
+#include "accessor_api_common_buffer_local.h"
+#include "accessor_utility.h"
 
 #include <array>
 #include <numeric>

diff --git a/tests/accessor/accessor_api_local_fp16.cpp b/tests/accessor/accessor_api_local_fp16.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_local_common.h"
+#include "accessor_utility.h"
 
 #include <array>
 #include <numeric>

diff --git a/tests/accessor/accessor_api_local_fp64.cpp b/tests/accessor/accessor_api_local_fp64.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 #include "./../../util/math_helper.h"
-#include "accessor_utility.h"
 #include "accessor_api_local_common.h"
+#include "accessor_utility.h"
 
 #include <array>
 #include <numeric>

diff --git a/tests/accessor/accessor_constructors_buffer.cpp b/tests/accessor/accessor_constructors_buffer.cpp
@@ -9,8 +9,8 @@
 #define TEST_NAME accessor_constructors_buffer
 
 #include "../common/common.h"
-#include "accessor_constructors_utility.h"
 #include "accessor_constructors_buffer_utility.h"
+#include "accessor_constructors_utility.h"
 
 namespace TEST_NAMESPACE {
 

diff --git a/tests/accessor/accessor_constructors_buffer_placeholder.cpp b/tests/accessor/accessor_constructors_buffer_placeholder.cpp
@@ -9,8 +9,8 @@
 #define TEST_NAME accessor_constructors_buffer_placeholder
 
 #include "../common/common.h"
-#include "accessor_constructors_utility.h"
 #include "accessor_constructors_buffer_utility.h"
+#include "accessor_constructors_utility.h"
 
 namespace TEST_NAMESPACE {
 

diff --git a/tests/accessor/accessor_constructors_fp16.cpp b/tests/accessor/accessor_constructors_fp16.cpp
@@ -9,10 +9,10 @@
 #define TEST_NAME accessor_constructors_fp16
 
 #include "../common/common.h"
-#include "accessor_constructors_utility.h"
 #include "accessor_constructors_buffer_utility.h"
-#include "accessor_constructors_local_utility.h"
 #include "accessor_constructors_image_utility.h"
+#include "accessor_constructors_local_utility.h"
+#include "accessor_constructors_utility.h"
 
 namespace TEST_NAMESPACE {
 /** tests the constructors for cl::sycl::accessor

diff --git a/tests/accessor/accessor_constructors_fp64.cpp b/tests/accessor/accessor_constructors_fp64.cpp
@@ -9,10 +9,10 @@
 #define TEST_NAME accessor_constructors_fp64
 
 #include "../common/common.h"
-#include "accessor_constructors_utility.h"
 #include "accessor_constructors_buffer_utility.h"
-#include "accessor_constructors_local_utility.h"
 #include "accessor_constructors_image_utility.h"
+#include "accessor_constructors_local_utility.h"
+#include "accessor_constructors_utility.h"
 
 namespace TEST_NAMESPACE {
 

diff --git a/tests/accessor/accessor_constructors_image.cpp b/tests/accessor/accessor_constructors_image.cpp
@@ -9,8 +9,8 @@
 #define TEST_NAME accessor_constructors_image
 
 #include "../common/common.h"
-#include "accessor_constructors_utility.h"
 #include "accessor_constructors_image_utility.h"
+#include "accessor_constructors_utility.h"
 
 namespace TEST_NAMESPACE {
 

diff --git a/tests/accessor/accessor_constructors_local.cpp b/tests/accessor/accessor_constructors_local.cpp
@@ -9,8 +9,8 @@
 #define TEST_NAME accessor_constructors_local
 
 #include "../common/common.h"
-#include "accessor_constructors_utility.h"
 #include "accessor_constructors_local_utility.h"
+#include "accessor_constructors_utility.h"
 
 namespace TEST_NAMESPACE {
 

diff --git a/tests/accessor/accessor_utility.h b/tests/accessor/accessor_utility.h
@@ -12,8 +12,8 @@
 #define SYCL_1_2_1_TESTS_ACCESSOR_ACCESSOR_UTILITY_H
 
 #include "../common/common.h"
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 #include <vector>
 

diff --git a/tests/address_space/address_space.cpp b/tests/address_space/address_space.cpp
@@ -8,8 +8,8 @@
 
 #include "../common/common.h"
 
-#include <cassert>
 #include <array>
+#include <cassert>
 #include <type_traits>
 
 #define EXPECT_EQUALS(lhs, rhs) \

diff --git a/tests/common/common.h b/tests/common/common.h
@@ -12,20 +12,18 @@
 // include our proxy to the real sycl header
 #include "sycl.h"
 
-// test framework specific device selector
-#include "../common/cts_selector.h"
+#include "../../util/math_vector.h"
+#include "../../util/proxy.h"
+#include "../../util/test_base.h"
 #include "../common/cts_async_handler.h"
+#include "../common/cts_selector.h"
 #include "../common/get_cts_object.h"
-#include "../../util/proxy.h"
 #include "macros.h"
 
-#include "../../util/test_base.h"
-#include "../../util/math_vector.h"
-
-#include <string>
+#include <numeric>
 #include <sstream>
+#include <string>
 #include <type_traits>
-#include <numeric>
 
 namespace {
 

diff --git a/tests/common/common_vec.h b/tests/common/common_vec.h
@@ -12,17 +12,15 @@
 // include our proxy to the real sycl header
 #include "sycl.h"
 
-// test framework specific device selector
+#include "../../util/math_vector.h"
+#include "../../util/proxy.h"
+#include "../../util/test_base.h"
 #include "../common/common.h"
-#include "../common/cts_selector.h"
 #include "../common/cts_async_handler.h"
+#include "../common/cts_selector.h"
 #include "../common/get_cts_object.h"
-#include "../../util/proxy.h"
 #include "macros.h"
 
-#include "../../util/test_base.h"
-#include "../../util/math_vector.h"
-
 #include <string>
 #include <type_traits>
 

diff --git a/tests/common/macros.h b/tests/common/macros.h
@@ -9,9 +9,9 @@
 #ifndef __SYCLCTS_TESTS_COMMON_MACROS_H
 #define __SYCLCTS_TESTS_COMMON_MACROS_H
 
-#include "sycl.h"
 #include "../../util/opencl_helper.h"
 #include "../../util/type_names.h"
+#include "sycl.h"
 
 #define TEST_FILE __FILE__
 #define TEST_BUILD_DATE __DATE__

diff --git a/tests/common/main.cpp b/tests/common/main.cpp
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "./../../util/test_manager.h"
 #include "./../../util/collection.h"
+#include "./../../util/test_manager.h"
 
 using namespace sycl_cts::util;
 

diff --git a/tests/image/image_api.cpp b/tests/image/image_api.cpp
@@ -6,8 +6,8 @@
 //
 *******************************************************************************/
 
-#include "image_common.h"
 #include "../common/common.h"
+#include "image_common.h"
 
 #define TEST_NAME image_api_core
 

diff --git a/tests/image/image_api_fp16.cpp b/tests/image/image_api_fp16.cpp
@@ -6,8 +6,8 @@
 //
 *******************************************************************************/
 
-#include "image_common.h"
 #include "../common/common.h"
+#include "image_common.h"
 
 #define TEST_NAME image_api_fp16
 

diff --git a/tests/image/image_constructors.cpp b/tests/image/image_constructors.cpp
@@ -6,8 +6,8 @@
 //
 *******************************************************************************/
 
-#include "image_common.h"
 #include "../common/common.h"
+#include "image_common.h"
 
 #define TEST_NAME image_constructors
 

diff --git a/tests/opencl_interop/opencl_interop_constructors.cpp b/tests/opencl_interop/opencl_interop_constructors.cpp
@@ -6,9 +6,9 @@
 //
 *******************************************************************************/
 
-#include "../common/common.h"
 #include "../../util/opencl_helper.h"
 #include "../../util/test_base_opencl.h"
+#include "../common/common.h"
 
 #define TEST_NAME opencl_interop_constructors
 

diff --git a/tests/opencl_interop/opencl_interop_get.cpp b/tests/opencl_interop/opencl_interop_get.cpp
@@ -6,9 +6,9 @@
 //
 *******************************************************************************/
 
-#include "../common/common.h"
 #include "../../util/opencl_helper.h"
 #include "../../util/test_base_opencl.h"
+#include "../common/common.h"
 
 #define TEST_NAME opencl_interop_get
 

diff --git a/tests/opencl_interop/opencl_interop_kernel.cpp b/tests/opencl_interop/opencl_interop_kernel.cpp
@@ -6,9 +6,9 @@
 //
 *******************************************************************************/
 
-#include "../common/common.h"
 #include "../../util/opencl_helper.h"
 #include "../../util/test_base_opencl.h"
+#include "../common/common.h"
 
 #define TEST_NAME opencl_interop_kernel
 

diff --git a/util/cmdarg.h b/util/cmdarg.h
@@ -9,8 +9,8 @@
 #ifndef __SYCLCTS_UTIL_CMDARG_H
 #define __SYCLCTS_UTIL_CMDARG_H
 
-#include "stl.h"
 #include "singleton.h"
+#include "stl.h"
 
 namespace sycl_cts {
 namespace util {

diff --git a/util/collection.cpp b/util/collection.cpp
@@ -7,8 +7,8 @@
 *******************************************************************************/
 
 #include "collection.h"
-#include "printer.h"
 #include "csv.h"
+#include "printer.h"
 
 // conformance test suite namespace
 namespace sycl_cts {

diff --git a/util/collection.h b/util/collection.h
@@ -9,9 +9,9 @@
 #ifndef __SYCLCTS_UTIL_COLLECTION_H
 #define __SYCLCTS_UTIL_COLLECTION_H
 
+#include "singleton.h"
 #include "stl.h"
 #include "test_base.h"
-#include "singleton.h"
 
 namespace sycl_cts {
 namespace util {

diff --git a/util/executor.cpp b/util/executor.cpp
@@ -7,10 +7,10 @@
 *******************************************************************************/
 
 #include "executor.h"
-#include "singleton.h"
-#include "printer.h"
 #include "collection.h"
 #include "logger.h"
+#include "printer.h"
+#include "singleton.h"
 
 namespace sycl_cts {
 namespace util {