clang-format: enable sorting includes

Include files are now grouped and sorted in following order:
1. Header file of the class the current file implements
2. Project files
3. Third party files
4. Standard library

Change-Id: If31af05652184169f7fee1d7ad08f1b2ed602cf0
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>

Author: fhazubski-Intel

.clang-format

@@ -48,13 +48,24 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories: 
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^.(common|documentation|elf|manifests|offline_compiler|public|runtime|scripts|unit_tests)/'
+    Priority:        1
+  - Regex:           '^"test\.h"$'
     Priority:        1
+  - Regex:           '(d3d9types|d3d10_1)\.h'
+    Priority:        4
+  - Regex:           '(gfxEscape|windows)\.h'
+    Priority:        5
+  - Regex:           '^.(third_party|llvm|llvm-c|clang|clang-c|gtest|isl|json)/'
+    Priority:        5
+  - Regex:           '^.(gmock|cl|gl|d3d)'
+    Priority:        5
+  - Regex:           '^<.*>$'
+    Priority:        10
+  - Regex:           '.*'
+    Priority:        5
 IndentCaseLabels: false
 IndentWidth:     4
 IndentWrappedFunctionNames: false
@@ -74,7 +85,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:    true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements

elf/reader.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "reader.h"
+
 #include <string.h>
 
 namespace CLElfLib {

elf/writer.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "writer.h"
+
 #include <cstring>
 
 // Need for linux compatibility with memcpy_s

elf/writer.h

@@ -1,12 +1,13 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
 #include "types.h"
+
 #include <queue>
 #include <string>
 

offline_compiler/decoder/binary_decoder.cpp

@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "binary_decoder.h"
+
 #include "elf/reader.h"
-#include "helper.h"
 #include "runtime/helpers/file_io.h"
 #include "runtime/helpers/ptr_math.h"
 
+#include "helper.h"
+
 #include <cstring>
 #include <fstream>
 

offline_compiler/decoder/binary_encoder.cpp

@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "binary_encoder.h"
-#include "CL/cl.h"
+
 #include "elf/writer.h"
-#include "helper.h"
 #include "runtime/helpers/file_io.h"
 
+#include "CL/cl.h"
+#include "helper.h"
+
 #include <algorithm>
 #include <cstring>
 #include <fstream>

offline_compiler/decoder/binary_encoder.h

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
 #include <sstream>
-#include <vector>
 #include <string>
+#include <vector>
 
 class BinaryEncoder {
   public:

offline_compiler/decoder/helper.h

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include <exception>
 #include <string>
 #include <vector>
-#include <exception>
 
 void addSlash(std::string &path);
 

offline_compiler/main.cpp

@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "decoder/binary_encoder.h"
-#include "decoder/binary_decoder.h"
 #include "offline_compiler/offline_compiler.h"
 #include "offline_compiler/utilities/safety_caller.h"
 #include "runtime/os_interface/os_library.h"
 
+#include "decoder/binary_decoder.h"
+#include "decoder/binary_encoder.h"
 #include <CL/cl.h>
 
 using namespace OCLRT;

offline_compiler/offline_compiler.cpp

@@ -5,29 +5,32 @@
  *
  */
 
+#include "offline_compiler.h"
+
+#include "elf/writer.h"
+#include "runtime/helpers/debug_helpers.h"
+#include "runtime/helpers/file_io.h"
+#include "runtime/helpers/hw_info.h"
+#include "runtime/helpers/string.h"
+#include "runtime/helpers/validators.h"
+#include "runtime/os_interface/debug_settings_manager.h"
+#include "runtime/os_interface/os_inc_base.h"
+#include "runtime/os_interface/os_library.h"
+#include "runtime/platform/extensions.h"
+
 #include "cif/common/cif_main.h"
 #include "cif/helpers/error.h"
 #include "cif/import/library_api.h"
+#include "igfxfmid.h"
 #include "ocl_igc_interface/code_type.h"
 #include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "ocl_igc_interface/igc_ocl_device_ctx.h"
 #include "ocl_igc_interface/platform_helper.h"
-#include "offline_compiler.h"
-#include "igfxfmid.h"
-#include "runtime/helpers/file_io.h"
-#include "runtime/os_interface/debug_settings_manager.h"
-#include "runtime/os_interface/os_inc_base.h"
-#include "runtime/os_interface/os_library.h"
-#include "runtime/helpers/string.h"
-#include "runtime/helpers/debug_helpers.h"
-#include "runtime/helpers/hw_info.h"
-#include "runtime/helpers/validators.h"
-#include "runtime/platform/extensions.h"
-#include "elf/writer.h"
-#include <iomanip>
-#include <list>
+
 #include <algorithm>
+#include <iomanip>
 #include <iostream>
+#include <list>
 
 #ifdef _WIN32
 #include <direct.h>