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>

.clang-format

@@ -48,13 +48,24 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
+  - 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,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #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,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,8 @@
 
 #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>

offline_compiler/offline_compiler.h

@@ -6,13 +6,15 @@
  */
 
 #pragma once
-#include "cif/common/cif_main.h"
-#include "ocl_igc_interface/igc_ocl_device_ctx.h"
-#include "ocl_igc_interface/fcl_ocl_device_ctx.h"
 #include "elf/writer.h"
+
+#include "cif/common/cif_main.h"
+#include "ocl_igc_interface/fcl_ocl_device_ctx.h"
+#include "ocl_igc_interface/igc_ocl_device_ctx.h"
+
 #include <cstdint>
-#include <string>
 #include <memory>
+#include <string>
 
 namespace OCLRT {
 

offline_compiler/options.cpp

@@ -1,13 +1,16 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "hw_cmds.h"
 #include "runtime/helpers/options.h"
+
 #include "runtime/helpers/array_count.h"
+
+#include "hw_cmds.h"
+
 #include <cstddef>
 
 namespace OCLRT {

offline_compiler/utilities/linux/safety_caller_linux.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/os_interface/os_library.h"
 #include "offline_compiler/offline_compiler.h"
 #include "offline_compiler/utilities/linux/safety_guard_linux.h"
+#include "runtime/os_interface/os_library.h"
 
 using namespace OCLRT;
 

offline_compiler/utilities/linux/safety_guard_linux.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,11 +7,12 @@
 
 #pragma once
 #include "runtime/helpers/abort.h"
-#include <cstdlib>
+
 #include <cstdio>
+#include <cstdlib>
 #include <execinfo.h>
-#include <signal.h>
 #include <setjmp.h>
+#include <signal.h>
 
 static jmp_buf jmpbuf;
 

offline_compiler/utilities/windows/seh_exception.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "seh_exception.h"
+
 #include "runtime/os_interface/os_library.h"
 
 #include <memory>
@@ -16,9 +17,10 @@
 #include <dbghelp.h>
 #pragma warning(pop)
 
+#include <windows.h>
+
 #include <excpt.h>
 #include <psapi.h>
-#include <windows.h>
 
 using namespace std;
 

offline_compiler/utilities/windows/seh_exception.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,9 @@
 
 #pragma once
 
-#include "windows.h"
 #include "excpt.h"
+#include "windows.h"
+
 #include <string>
 
 class SehException {

public/cl_gl_private_intel.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,10 @@
 #ifndef OPENCL_SHARED_RESOURCE
 #define OPENCL_SHARED_RESOURCE
 
+#include "GL/gl.h"
+#include "GmmLib.h"
+#include "third_party/opencl_headers/CL/cl_gl.h"
+
 // Used for creating CL resources from GL resources
 typedef struct _tagCLGLResourceInfo {
     GLuint name;

runtime/accelerators/intel_accelerator.cpp

@@ -1,14 +1,15 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "runtime/accelerators/intel_accelerator.h"
+
 #include "runtime/context/context.h"
-#include "runtime/helpers/string.h"
 #include "runtime/helpers/get_info.h"
+#include "runtime/helpers/string.h"
 
 namespace OCLRT {
 

runtime/api/api.cpp

@@ -5,10 +5,8 @@
  *
  */
 
-#include "config.h"
-#include <algorithm>
 #include "api.h"
-#include "CL/cl.h"
+
 #include "runtime/accelerators/intel_motion_estimation.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue.h"
@@ -38,6 +36,11 @@
 #include "runtime/sharings/sharing_factory.h"
 #include "runtime/utilities/api_intercept.h"
 #include "runtime/utilities/stackvec.h"
+
+#include "CL/cl.h"
+#include "config.h"
+
+#include <algorithm>
 #include <cstring>
 
 using namespace OCLRT;

runtime/api/api.h

@@ -5,11 +5,12 @@
  *
  */
 
-#include "CL/cl.h"
-#include "CL/cl_gl.h"
 #include "public/cl_ext_private.h"
 #include "runtime/api/dispatch.h"
 
+#include "CL/cl.h"
+#include "CL/cl_gl.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

runtime/api/cl_types.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "runtime/api/dispatch.h"
+
 #include <cstdint>
 
 struct ClDispatch {

runtime/api/dispatch.cpp

@@ -1,26 +1,12 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "dispatch.h"
+
 #include "api.h"
 
 SDispatchTable icdGlobalDispatchTable =

runtime/api/dispatch.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,12 +14,14 @@
 #include "CL/cl_gl_ext.h"
 #if defined(_WIN32)
 #include <d3d10_1.h>
-#include "CL/cl_dx9_media_sharing.h"
+
 #include "CL/cl_d3d10.h"
 #include "CL/cl_d3d11.h"
+#include "CL/cl_dx9_media_sharing.h"
 #define CL_DX9_MEDIA_SHARING_INTEL_EXT
-#include "CL/cl_dx9_media_sharing_intel.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
+
+#include "CL/cl_dx9_media_sharing_intel.h"
 #else
 #define CL_CONTEXT_D3D10_DEVICE_KHR 0x4014
 #define CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR 0x402C

runtime/aub/aub_center.cpp

@@ -6,14 +6,15 @@
  */
 
 #include "runtime/aub/aub_center.h"
+
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 #include "third_party/aub_stream/headers/aub_manager.h"
-#include "third_party/aub_stream/headers/options.h"
 #include "third_party/aub_stream/headers/modes.h"
+#include "third_party/aub_stream/headers/options.h"
 
 namespace OCLRT {
 extern aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode);

runtime/aub/aub_center.h

@@ -7,10 +7,11 @@
 
 #pragma once
 #include "runtime/command_stream/aub_stream_provider.h"
-#include "runtime/helpers/options.h"
 #include "runtime/command_stream/aub_subcapture.h"
+#include "runtime/helpers/options.h"
 #include "runtime/memory_manager/address_mapper.h"
 #include "runtime/memory_manager/physical_address_allocator.h"
+
 #include "third_party/aub_stream/headers/aub_manager.h"
 
 namespace OCLRT {

runtime/aub/aub_helper.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "runtime/aub/aub_helper.h"
+
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/helpers/basic_math.h"
 #include "runtime/os_interface/debug_settings_manager.h"

runtime/aub/aub_helper_add_mmio.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/aub/aub_helper.h"
 #include "runtime/os_interface/debug_settings_manager.h"
+
 #include "third_party/aub_stream/headers/options.h"
 
 namespace OCLRT {

runtime/aub_mem_dump/aub_mem_dump.cpp

@@ -6,9 +6,10 @@
  */
 
 #include "aub_mem_dump.h"
+
 #include "runtime/aub/aub_helper.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/debug_helpers.h"
+#include "runtime/helpers/ptr_math.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 namespace AubMemDump {

runtime/aub_mem_dump/aub_mem_dump.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include <cstdio>
 #include <cstdint>
+#include <cstdio>
 #include <fstream>
 #include <mutex>
 

runtime/aub_mem_dump/aub_mem_dump.inl

@@ -5,11 +5,13 @@
  *
  */
 
-#include "aub_mem_dump.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/memory_constants.h"
+
+#include "aub_mem_dump.h"
+
 #include <algorithm>
 #include <cstring>
 

runtime/aub_mem_dump/aub_services.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "aub_header.h"
+
 #include <cstdint>
 
 #ifndef WIN32

runtime/built_ins/aux_translation_builtin.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/helpers/dispatch_info_builder.h"
+
 #include <memory>
 
 namespace OCLRT {

runtime/built_ins/built_ins.cpp

@@ -5,21 +5,23 @@
  *
  */
 
-#include <cstdint>
-#include "runtime/built_ins/aux_translation_builtin.h"
 #include "runtime/built_ins/built_ins.h"
+
+#include "runtime/built_ins/aux_translation_builtin.h"
 #include "runtime/built_ins/built_ins.inl"
-#include "runtime/built_ins/vme_dispatch_builder.h"
 #include "runtime/built_ins/sip.h"
+#include "runtime/built_ins/vme_dispatch_builder.h"
 #include "runtime/compiler_interface/compiler_interface.h"
-#include "runtime/program/program.h"
-#include "runtime/mem_obj/image.h"
-#include "runtime/kernel/kernel.h"
 #include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/helpers/convert_color.h"
-#include "runtime/helpers/dispatch_info_builder.h"
 #include "runtime/helpers/debug_helpers.h"
+#include "runtime/helpers/dispatch_info_builder.h"
+#include "runtime/kernel/kernel.h"
+#include "runtime/mem_obj/image.h"
+#include "runtime/program/program.h"
+
+#include <cstdint>
 #include <sstream>
 
 namespace OCLRT {

runtime/built_ins/built_ins.h

@@ -6,12 +6,13 @@
  */
 
 #pragma once
-#include "CL/cl.h"
+#include "runtime/built_ins/sip.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/properties_helper.h"
-#include "runtime/built_ins/sip.h"
 #include "runtime/utilities/vec.h"
 
+#include "CL/cl.h"
+
 #include <array>
 #include <cstdint>
 #include <fstream>

runtime/built_ins/built_ins.inl

@@ -6,8 +6,8 @@
  */
 
 #include "runtime/built_ins/aux_translation_builtin.h"
-#include "runtime/mem_obj/buffer.h"
 #include "runtime/kernel/kernel.h"
+#include "runtime/mem_obj/buffer.h"
 
 namespace OCLRT {
 template <typename... KernelsDescArgsT>

runtime/built_ins/built_ins_storage.cpp

@@ -1,16 +1,18 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include <cstdint>
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/os_interface/debug_settings_manager.h"
+
 #include "os_inc.h"
 
+#include <cstdint>
+
 namespace OCLRT {
 
 const char *getBuiltinAsString(EBuiltInOps builtin) {

runtime/built_ins/builtins_dispatch_builder.h

@@ -1,16 +1,17 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "CL/cl.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/utilities/vec.h"
 
+#include "CL/cl.h"
+
 #include <array>
 #include <cstdint>
 #include <fstream>

runtime/built_ins/registry/built_ins_registry.h

@@ -1,30 +1,16 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #pragma once
 
+#include "runtime/built_ins/built_ins.h"
+
 #include <string>
 #include <unordered_map>
-#include "runtime/built_ins/built_ins.h"
 
 namespace OCLRT {
 

runtime/built_ins/registry/register_copy_kernels_source.cpp

@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include <string>
 #include "runtime/built_ins/registry/built_ins_registry.h"
 
+#include <string>
+
 namespace OCLRT {
 
 static RegisterEmbeddedResource registerCopyBufferToBufferSrc(

runtime/built_ins/registry/register_ext_vme_source.cpp

@@ -1,28 +1,14 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <string>
 #include "runtime/built_ins/registry/built_ins_registry.h"
 
+#include <string>
+
 namespace OCLRT {
 
 static RegisterEmbeddedResource registerVmeSrc(

runtime/built_ins/sip.cpp

@@ -1,18 +1,19 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "runtime/built_ins/sip.h"
+
 #include "runtime/device/device.h"
+#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/ptr_math.h"
-#include "runtime/program/program.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/string.h"
 #include "runtime/memory_manager/graphics_allocation.h"
+#include "runtime/program/program.h"
 
 namespace OCLRT {
 

runtime/builtin_kernels_simulation/gen10/scheduler_simulation.cpp

@@ -1,17 +1,19 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "CL/cl.h"
-#include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
+
+#include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
-#include "runtime/memory_manager/graphics_allocation.h"
-#include "runtime/gen10/hw_cmds.h"
 #include "runtime/execution_model/device_enqueue.h"
+#include "runtime/gen10/hw_cmds.h"
+#include "runtime/memory_manager/graphics_allocation.h"
+
+#include "CL/cl.h"
 
 using namespace OCLRT;
 using namespace BuiltinKernelsSimulation;

runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp

@@ -1,18 +1,20 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "CL/cl.h"
-#include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
+
+#include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
 #include "runtime/gen8/hw_cmds.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 
+#include "CL/cl.h"
+
 using namespace OCLRT;
 using namespace BuiltinKernelsSimulation;
 

runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp

@@ -1,18 +1,20 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "CL/cl.h"
-#include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
+
+#include "runtime/builtin_kernels_simulation/opencl_c.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl"
 #include "runtime/execution_model/device_enqueue.h"
 #include "runtime/gen9/hw_cmds.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 
+#include "CL/cl.h"
+
 using namespace OCLRT;
 using namespace BuiltinKernelsSimulation;
 

runtime/builtin_kernels_simulation/opencl_c.cpp

@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include <cstdint>
-#include "CL/cl.h"
 #include "opencl_c.h"
+
 #include "runtime/helpers/string.h"
 
 namespace BuiltinKernelsSimulation {

runtime/builtin_kernels_simulation/opencl_c.h

@@ -1,17 +1,19 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include <mutex>
+#include "CL/cl.h"
+
 #include <condition_variable>
-#include <map>
-#include <thread>
-#include <string.h>
 #include <cstdint>
+#include <map>
+#include <mutex>
+#include <string.h>
+#include <thread>
 
 // OpenCL Types
 typedef uint32_t uint;

runtime/builtin_kernels_simulation/scheduler_simulation.cpp

@@ -1,26 +1,12 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
+
 #include "runtime/builtin_kernels_simulation/opencl_c.h"
 
 #include <thread>

runtime/builtin_kernels_simulation/scheduler_simulation.h

@@ -1,29 +1,15 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
  */
+
 #pragma once
+#include "runtime/builtin_kernels_simulation/opencl_c.h"
+
 #include <cstdint>
 #include <thread>
-
-#include "runtime/builtin_kernels_simulation/opencl_c.h"
 namespace OCLRT {
 class GraphicsAllocation;
 }

runtime/builtin_kernels_simulation/scheduler_simulation.inl

@@ -1,27 +1,12 @@
 /*
-* Copyright (c) 2017, Intel Corporation
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included
-* in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-* OTHER DEALINGS IN THE SOFTWARE.
-*/
+ * Copyright (C) 2017-2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
 
-#include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
+#include "runtime/memory_manager/graphics_allocation.h"
 
 #include <cstdint>
 #include <mutex>

runtime/command_queue/command_queue.cpp

@@ -5,33 +5,36 @@
  *
  */
 
-#include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue.h"
+
+#include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/event/user_event.h"
 #include "runtime/event/event_builder.h"
+#include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/array_count.h"
+#include "runtime/helpers/convert_color.h"
 #include "runtime/helpers/get_info.h"
+#include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/helpers/options.h"
-#include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/ptr_math.h"
+#include "runtime/helpers/queue_helpers.h"
+#include "runtime/helpers/string.h"
+#include "runtime/helpers/surface_formats.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
-#include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
-#include "runtime/helpers/string.h"
-#include "CL/cl_ext.h"
 #include "runtime/utilities/api_intercept.h"
 #include "runtime/utilities/tag_allocator.h"
-#include "runtime/helpers/convert_color.h"
-#include "runtime/helpers/queue_helpers.h"
+
+#include "CL/cl_ext.h"
+
 #include <map>
 
 namespace OCLRT {

runtime/command_queue/command_queue.h

@@ -6,12 +6,14 @@
  */
 
 #pragma once
+#include "runtime/event/event.h"
 #include "runtime/helpers/base_object.h"
+#include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/engine_control.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/helpers/dispatch_info.h"
-#include "runtime/event/event.h"
+
 #include "instrumentation.h"
+
 #include <atomic>
 #include <cstdint>
 

runtime/command_queue/command_queue_hw.h

@@ -6,16 +6,17 @@
  */
 
 #pragma once
-#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_queue/command_queue.h"
+#include "runtime/command_stream/command_stream_receiver.h"
+#include "runtime/command_stream/preemption.h"
 #include "runtime/device_queue/device_queue_hw.h"
+#include "runtime/helpers/dispatch_info.h"
+#include "runtime/helpers/engine_control.h"
+#include "runtime/helpers/queue_helpers.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/program/printf_handler.h"
-#include "runtime/helpers/dispatch_info.h"
-#include "runtime/command_stream/preemption.h"
-#include "runtime/helpers/engine_control.h"
-#include "runtime/helpers/queue_helpers.h"
+
 #include <memory>
 
 namespace OCLRT {

runtime/command_queue/command_queue_hw.inl

@@ -5,27 +5,27 @@
  *
  */
 
-#include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/enqueue_barrier.h"
 #include "runtime/command_queue/enqueue_copy_buffer.h"
 #include "runtime/command_queue/enqueue_copy_buffer_rect.h"
 #include "runtime/command_queue/enqueue_copy_buffer_to_image.h"
-#include "runtime/command_queue/enqueue_copy_image_to_buffer.h"
 #include "runtime/command_queue/enqueue_copy_image.h"
+#include "runtime/command_queue/enqueue_copy_image_to_buffer.h"
 #include "runtime/command_queue/enqueue_fill_buffer.h"
 #include "runtime/command_queue/enqueue_fill_image.h"
 #include "runtime/command_queue/enqueue_kernel.h"
-#include "runtime/command_queue/enqueue_svm.h"
 #include "runtime/command_queue/enqueue_marker.h"
 #include "runtime/command_queue/enqueue_migrate_mem_objects.h"
 #include "runtime/command_queue/enqueue_read_buffer.h"
 #include "runtime/command_queue/enqueue_read_buffer_rect.h"
 #include "runtime/command_queue/enqueue_read_image.h"
+#include "runtime/command_queue/enqueue_svm.h"
 #include "runtime/command_queue/enqueue_write_buffer.h"
 #include "runtime/command_queue/enqueue_write_buffer_rect.h"
 #include "runtime/command_queue/enqueue_write_image.h"
 #include "runtime/command_queue/finish.h"
 #include "runtime/command_queue/flush.h"
+#include "runtime/command_queue/gpgpu_walker.h"
 
 namespace OCLRT {
 template <typename Family>

runtime/command_queue/enqueue_barrier.h

@@ -6,12 +6,14 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 #include "runtime/event/event.h"
 #include "runtime/memory_manager/surface.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_common.h

@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
@@ -14,8 +13,8 @@
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/hardware_interface.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/event/user_event.h"
 #include "runtime/event/event_builder.h"
+#include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/helpers/dispatch_info_builder.h"
@@ -28,10 +27,13 @@
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/os_interface/os_context.h"
-#include "runtime/program/printf_handler.h"
 #include "runtime/program/block_kernel_manager.h"
+#include "runtime/program/printf_handler.h"
 #include "runtime/utilities/range.h"
 #include "runtime/utilities/tag_allocator.h"
+
+#include "hw_cmds.h"
+
 #include <algorithm>
 #include <new>
 

runtime/command_queue/enqueue_copy_buffer.h

@@ -1,19 +1,21 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "hw_cmds.h"
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/enqueue_common.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/built_ins/built_ins.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_copy_buffer_rect.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,7 @@
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_copy_buffer_to_image.h

@@ -1,21 +1,23 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "hw_cmds.h"
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/surface_formats.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
+#include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/built_ins/built_ins.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_copy_image.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,14 +7,16 @@
 
 #pragma once
 #include "runtime/built_ins/built_ins.h"
-#include "hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/basic_math.h"
+#include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
+
+#include "hw_cmds.h"
+
 #include <algorithm>
 #include <new>
 

runtime/command_queue/enqueue_copy_image_to_buffer.h

@@ -1,21 +1,23 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "hw_cmds.h"
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/surface_formats.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
+#include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/built_ins/built_ins.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_fill_buffer.h

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "hw_cmds.h"
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/memory_manager/surface.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/built_ins/built_ins.h"
+#include "runtime/memory_manager/surface.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_fill_image.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,14 +7,16 @@
 
 #pragma once
 #include "runtime/built_ins/built_ins.h"
-#include "hw_cmds.h"
-#include "runtime/helpers/surface_formats.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/basic_math.h"
+#include "runtime/helpers/kernel_commands.h"
+#include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
+
+#include "hw_cmds.h"
+
 #include <algorithm>
 #include <new>
 

runtime/command_queue/enqueue_kernel.h

@@ -6,15 +6,17 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_queue/gpgpu_walker.h"
+#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/task_information.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_marker.h

@@ -6,13 +6,15 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_queue/gpgpu_walker.h"
+#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 #include "runtime/event/event.h"
 #include "runtime/memory_manager/surface.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_migrate_mem_objects.h

@@ -6,14 +6,15 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_queue/gpgpu_walker.h"
+#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 #include "runtime/event/event.h"
 #include "runtime/memory_manager/surface.h"
 
+#include "hw_cmds.h"
+
 namespace OCLRT {
 
 template <typename GfxFamily>

runtime/command_queue/enqueue_read_buffer.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/enqueue_common.h"
 #include "runtime/command_stream/command_stream_receiver.h"
@@ -14,7 +14,9 @@
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/built_ins/built_ins.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_read_buffer_rect.h

@@ -6,13 +6,14 @@
  */
 
 #pragma once
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/enqueue_common.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/built_ins/built_ins.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_read_image.h

@@ -7,17 +7,20 @@
 
 #pragma once
 #include "runtime/built_ins/built_ins.h"
-#include "hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
+#include "runtime/context/context.h"
 #include "runtime/event/event.h"
-#include "runtime/helpers/surface_formats.h"
+#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/kernel_commands.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/mipmap.h"
+#include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/surface.h"
+
+#include "hw_cmds.h"
+
 #include <algorithm>
 #include <new>
 

runtime/command_queue/enqueue_svm.h

@@ -9,6 +9,8 @@
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/enqueue_common.h"
 #include "runtime/event/event.h"
+#include "runtime/memory_manager/svm_memory_manager.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_write_buffer.h

@@ -6,14 +6,16 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/string.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/built_ins/built_ins.h"
+
+#include "hw_cmds.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_write_buffer_rect.h

@@ -6,12 +6,13 @@
  */
 
 #pragma once
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/built_ins/built_ins.h"
+
 #include <new>
 
 namespace OCLRT {

runtime/command_queue/enqueue_write_image.h

@@ -7,14 +7,16 @@
 
 #pragma once
 #include "runtime/built_ins/built_ins.h"
-#include "hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/surface_formats.h"
-#include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/basic_math.h"
+#include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
+#include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
+
+#include "hw_cmds.h"
+
 #include <algorithm>
 #include <new>
 

runtime/command_queue/finish.h

@@ -1,16 +1,17 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "hw_cmds.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 
+#include "hw_cmds.h"
+
 namespace OCLRT {
 
 template <typename GfxFamily>

runtime/command_queue/gpgpu_walker.h

@@ -8,10 +8,10 @@
 #pragma once
 
 #include "runtime/built_ins/built_ins.h"
-#include "runtime/context/context.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/preemption.h"
+#include "runtime/context/context.h"
 #include "runtime/device_queue/device_queue_hw.h"
 #include "runtime/event/hw_timestamps.h"
 #include "runtime/event/perf_counter.h"

runtime/command_queue/gpgpu_walker.inl

@@ -6,23 +6,25 @@
  */
 
 #pragma once
-#include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/command_queue.h"
+#include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/local_id_gen.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device_info.h"
 #include "runtime/event/perf_counter.h"
 #include "runtime/event/user_event.h"
-#include "runtime/indirect_heap/indirect_heap.h"
-#include "instrumentation.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/validators.h"
+#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/utilities/tag_allocator.h"
+
+#include "instrumentation.h"
+
 #include <algorithm>
 #include <cmath>
 

runtime/command_queue/hardware_interface.h

@@ -6,8 +6,10 @@
  */
 
 #pragma once
-#include "CL/cl.h"
 #include "runtime/command_stream/preemption_mode.h"
+
+#include "CL/cl.h"
+
 #include <cstdint>
 
 namespace OCLRT {

runtime/command_queue/hardware_interface.inl

@@ -7,9 +7,9 @@
 
 #pragma once
 #include "runtime/command_queue/hardware_interface.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/task_information.h"
+#include "runtime/memory_manager/internal_allocation_storage.h"
 
 namespace OCLRT {
 

runtime/command_queue/local_id_gen.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "runtime/command_queue/local_id_gen.h"
+
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/utilities/cpu_info.h"
 

runtime/command_queue/local_work_size.cpp

@@ -1,23 +1,8 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "runtime/context/context.h"
@@ -26,9 +11,10 @@
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
+
 #include <algorithm>
-#include <cstdint>
 #include <cmath>
+#include <cstdint>
 #include <ctime>
 
 namespace OCLRT {

runtime/command_stream/aub_command_stream_receiver.cpp

@@ -6,11 +6,13 @@
  */
 
 #include "runtime/command_stream/aub_command_stream_receiver.h"
+
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/os_inc_base.h"
+
 #include <algorithm>
 #include <cstring>
 #include <sstream>

runtime/command_stream/aub_command_stream_receiver.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
+
 #include <string>
 
 namespace OCLRT {

runtime/command_stream/aub_command_stream_receiver_hw.h

@@ -6,17 +6,18 @@
  */
 
 #pragma once
-#include "runtime/gen_common/aub_mapper.h"
-#include "command_stream_receiver_simulated_hw.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
+#include "runtime/gen_common/aub_mapper.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/memory_manager/address_mapper.h"
+#include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/memory_manager/page_table.h"
 #include "runtime/memory_manager/physical_address_allocator.h"
-#include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/utilities/spinlock.h"
 
+#include "command_stream_receiver_simulated_hw.h"
+
 namespace OCLRT {
 
 class AubSubCaptureManager;

runtime/command_stream/aub_command_stream_receiver_hw.inl

@@ -5,7 +5,6 @@
  *
  */
 
-#include "hw_cmds.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.inl"
@@ -25,12 +24,14 @@
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
+
+#include "aub_command_stream_receiver_hw.h"
 #include "driver_version.h"
+#include "hw_cmds.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 
 #include <algorithm>
 #include <cstring>
-#include "aub_command_stream_receiver_hw.h"
 
 namespace OCLRT {
 

runtime/command_stream/aub_stream_provider.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
+
 #include <string>
 
 namespace OCLRT {

runtime/command_stream/aub_subcapture.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "runtime/command_stream/aub_subcapture.h"
+
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/utilities/debug_settings_reader.h"

runtime/command_stream/command_stream_receiver.cpp

@@ -5,8 +5,9 @@
  *
  */
 
-#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_stream/command_stream_receiver.h"
+
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/command_stream/scratch_space_controller.h"

runtime/command_stream/command_stream_receiver.h

@@ -17,6 +17,7 @@
 #include "runtime/helpers/options.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/grf_config.h"
+
 #include <cstddef>
 #include <cstdint>
 

runtime/command_stream/command_stream_receiver_hw.h

@@ -7,10 +7,10 @@
 
 #pragma once
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/csr_deps.h"
-#include "runtime/helpers/hw_info.h"
-#include "runtime/helpers/dirty_state_helpers.h"
 #include "runtime/gen_common/hw_cmds.h"
+#include "runtime/helpers/csr_deps.h"
+#include "runtime/helpers/dirty_state_helpers.h"
+#include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 
 namespace OCLRT {

runtime/command_stream/command_stream_receiver_hw.inl

@@ -5,9 +5,11 @@
  *
  */
 
+#include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
 #include "runtime/command_stream/linear_stream.h"
+#include "runtime/command_stream/preemption.h"
 #include "runtime/command_stream/scratch_space_controller_base.h"
 #include "runtime/device/device.h"
 #include "runtime/event/event.h"
@@ -26,8 +28,6 @@
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
-#include "runtime/command_stream/preemption.h"
-#include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/utilities/tag_allocator.h"
 
 namespace OCLRT {

runtime/command_stream/command_stream_receiver_simulated_common_hw.h

@@ -9,6 +9,7 @@
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/gen_common/aub_mapper.h"
 #include "runtime/memory_manager/memory_banks.h"
+
 #include "third_party/aub_stream/headers/hardware_context.h"
 
 namespace aub_stream {

runtime/command_stream/command_stream_receiver_simulated_common_hw.inl

@@ -8,15 +8,16 @@
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
 #include "runtime/command_stream/command_stream_receiver_simulated_common_hw.h"
-#include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
+#include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/os_context.h"
-#include "third_party/aub_stream/headers/aub_manager.h"
+
 #include "aub_mapper.h"
+#include "third_party/aub_stream/headers/aub_manager.h"
 
 namespace OCLRT {
 

runtime/command_stream/command_stream_receiver_with_aub_dump.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "runtime/command_stream/command_stream_receiver.h"
+
 #include <memory>
 
 namespace OCLRT {

runtime/command_stream/command_stream_receiver_with_aub_dump.inl

@@ -6,8 +6,9 @@
  */
 
 #include "runtime/aub/aub_center.h"
-#include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
+#include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
+#include "runtime/execution_environment/execution_environment.h"
 
 namespace OCLRT {
 

runtime/command_stream/create_command_stream_impl.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "runtime/command_stream/aub_command_stream_receiver.h"
-#include "runtime/command_stream/tbx_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
-#include "runtime/os_interface/device_factory.h"
+#include "runtime/command_stream/tbx_command_stream_receiver.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/options.h"
+#include "runtime/os_interface/device_factory.h"
 
 namespace OCLRT {
 

runtime/command_stream/csr_definitions.h

@@ -6,11 +6,12 @@
  */
 
 #pragma once
-#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/helpers/csr_deps.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/properties_helper.h"
 #include "runtime/kernel/grf_config.h"
+#include "runtime/memory_manager/memory_constants.h"
+
 #include <limits>
 
 namespace OCLRT {

runtime/command_stream/experimental_command_buffer.cpp

@@ -5,12 +5,14 @@
  *
  */
 
-#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
+
+#include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_constants.h"
 #include "runtime/memory_manager/memory_manager.h"
+
 #include <cstring>
 #include <type_traits>
 

runtime/command_stream/linear_stream.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "runtime/command_stream/linear_stream.h"
+
 #include "runtime/memory_manager/graphics_allocation.h"
 
 namespace OCLRT {

runtime/command_stream/linear_stream.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,10 @@
 #pragma once
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/ptr_math.h"
+
+#include <atomic>
 #include <cstddef>
 #include <cstdint>
-#include <atomic>
 
 namespace OCLRT {
 class GraphicsAllocation;

runtime/command_stream/preemption.cpp

@@ -1,12 +1,13 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/built_ins/built_ins.h"
 #include "runtime/command_stream/preemption.h"
+
+#include "runtime/built_ins/built_ins.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/string.h"

runtime/command_stream/preemption.h

@@ -9,6 +9,7 @@
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/preemption_mode.h"
 #include "runtime/helpers/hw_info.h"
+
 #include "sku_info.h"
 
 namespace OCLRT {