Move basic_math.h and vec.h to core directory

Change-Id: I143b7af450ff48d4958b4bc7137b393a2dc0eb64
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

.clang-format

@@ -50,7 +50,7 @@ ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^.(common|documentation|elf|manifests|offline_compiler|public|runtime|scripts|unit_tests)/'
+  - Regex:           '^.(common|core|documentation|elf|manifests|offline_compiler|public|runtime|scripts|unit_tests)/'
     Priority:        1
   - Regex:           '^"test\.h"$'
     Priority:        1

CMakeLists.txt

@@ -688,6 +688,7 @@ endif(MSVC)
 
 add_subdirectory(offline_compiler ${IGDRCL_BUILD_DIR}/offline_compiler)
 target_compile_definitions(ocloc PRIVATE MOCKABLE_VIRTUAL=)
+add_subdirectory(core)
 
 macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
 	set(NEO_STATIC_LIB_NAME ${LIB_NAME})

core/CMakeLists.txt

@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+add_subdirectories()

core/helpers/CMakeLists.txt

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_HELPERS
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_HELPERS ${NEO_CORE_HELPERS})

core/helpers/basic_math.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/utilities/vec.h"
+#include "core/helpers/vec.h"
 
 #include <algorithm>
 #include <cmath>

runtime/CMakeLists.txt

@@ -177,7 +177,7 @@ if(${GENERATE_EXECUTABLE})
   create_project_source_tree_with_exports(${NEO_DYNAMIC_LIB_NAME} "${EXPORTS_FILENAME}")
 endif(${GENERATE_EXECUTABLE})
 
-create_project_source_tree(${NEO_STATIC_LIB_NAME})
+create_project_source_tree(${NEO_STATIC_LIB_NAME} ${IGDRCL_SOURCE_DIR})
 
 if(UNIX AND NOT (TARGET clang-tidy))
   add_custom_target(clang-tidy

runtime/aub/aub_helper.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/aub/aub_helper.h"
 
+#include "core/helpers/basic_math.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {

runtime/built_ins/built_ins.cpp

@@ -7,12 +7,12 @@
 
 #include "runtime/built_ins/built_ins.h"
 
+#include "core/helpers/basic_math.h"
 #include "runtime/built_ins/aux_translation_builtin.h"
 #include "runtime/built_ins/built_ins.inl"
 #include "runtime/built_ins/sip.h"
 #include "runtime/built_ins/vme_dispatch_builder.h"
 #include "runtime/compiler_interface/compiler_interface.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/helpers/convert_color.h"
 #include "runtime/helpers/debug_helpers.h"

runtime/built_ins/built_ins.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/vec.h"
 #include "runtime/built_ins/sip.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/properties_helper.h"
-#include "runtime/utilities/vec.h"
 
 #include "CL/cl.h"
 

runtime/built_ins/builtins_dispatch_builder.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/helpers/vec.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/kernel/kernel.h"
-#include "runtime/utilities/vec.h"
 
 #include "CL/cl.h"
 

runtime/command_queue/enqueue_copy_image.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/basic_math.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/basic_math.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/mem_obj/image.h"

runtime/command_queue/enqueue_fill_image.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/basic_math.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/basic_math.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"

runtime/command_queue/enqueue_read_image.h

@@ -6,12 +6,12 @@
  */
 
 #pragma once
+#include "core/helpers/basic_math.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/context/context.h"
 #include "runtime/event/event.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"

runtime/command_queue/enqueue_write_image.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/basic_math.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/basic_math.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/helpers/surface_formats.h"

runtime/command_queue/gpgpu_walker.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "core/helpers/vec.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/linear_stream.h"
@@ -23,7 +24,6 @@
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/kernel_info.h"
 #include "runtime/utilities/tag_allocator.h"
-#include "runtime/utilities/vec.h"
 
 namespace NEO {
 

runtime/command_queue/local_work_size.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/context/context.h"
 #include "runtime/helpers/array_count.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"

runtime/device/device_caps.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 #include "runtime/device/driver_info.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/memory_manager.h"

runtime/dll/linux/allocator_helper.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/os_interface/linux/allocator_helper.h"
 
+#include "core/helpers/basic_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 
 namespace NEO {
 size_t getSizeToMap() {

runtime/helpers/CMakeLists.txt

@@ -13,7 +13,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object_allocator.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
   ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_base.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_bdw_plus.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.h
@@ -90,6 +89,10 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/validators.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/validators.h
 )
+
+get_property(NEO_CORE_HELPERS GLOBAL PROPERTY NEO_CORE_HELPERS)
+list(APPEND RUNTIME_SRCS_HELPERS_BASE ${NEO_CORE_HELPERS})
+
 set(RUNTIME_SRCS_HELPERS_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.inl

runtime/helpers/convert_color.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 
 #include "CL/cl.h"
 

runtime/helpers/dispatch_info.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
+#include "core/helpers/vec.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/utilities/stackvec.h"
-#include "runtime/utilities/vec.h"
 
 #include <algorithm>
 #include <memory>

runtime/helpers/kernel_commands.h

@@ -8,7 +8,6 @@
 #pragma once
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/per_thread_data.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"

runtime/helpers/kernel_commands.inl

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/command_queue/local_id_gen.h"
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/helpers/address_patch.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"

runtime/indirect_heap/indirect_heap.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/helpers/basic_math.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_constants.h"

runtime/kernel/kernel.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/kernel/kernel.h"
 
+#include "core/helpers/basic_math.h"
 #include "runtime/accelerators/intel_accelerator.h"
 #include "runtime/accelerators/intel_motion_estimation.h"
 #include "runtime/built_ins/built_ins.h"
@@ -19,7 +20,6 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_helper.h"

runtime/mem_obj/buffer.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/helpers/basic_math.h"
 #include "public/cl_ext_private.h"
 #include "runtime/context/context_type.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/memory_constants.h"
 

runtime/mem_obj/image.cpp

@@ -8,6 +8,7 @@
 #include "runtime/mem_obj/image.h"
 
 #include "common/compiler_support.h"
+#include "core/helpers/basic_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
@@ -15,7 +16,6 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"

runtime/memory_manager/memory_manager.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/memory_manager/memory_manager.h"
 
+#include "core/helpers/basic_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/event.h"
 #include "runtime/event/hw_timestamps.h"
@@ -15,7 +16,6 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/kernel_commands.h"

runtime/memory_manager/os_agnostic_memory_manager.cpp

@@ -7,12 +7,12 @@
 
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 
+#include "core/helpers/basic_math.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"

runtime/memory_manager/os_agnostic_memory_manager.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/memory_manager.h"

runtime/memory_manager/page_table.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 #include "runtime/memory_manager/physical_address_allocator.h"
 
 #include <array>

runtime/os_interface/linux/drm_32bit_memory.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/os_interface/32bit_memory.h"
 #include "runtime/os_interface/debug_settings_manager.h"

runtime/os_interface/linux/drm_limited_range.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/basic_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/utilities/heap_allocator.h"
 

runtime/utilities/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -28,7 +28,6 @@ set(RUNTIME_SRCS_UTILITIES_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/stackvec.h
   ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/timer_util.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
 )
 
 set(RUNTIME_SRCS_UTILITIES_WINDOWS

unit_tests/aub/aub_center_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"

unit_tests/aub/aub_helper_tests.inl

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/device_helpers.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/command_queue/command_queue_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/event.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/timestamp_packet.h"

unit_tests/command_queue/read_write_buffer_cpu_copy.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/gmm_helper/gmm.h"
-#include "runtime/helpers/basic_math.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_read_buffer_fixture.h"
 

unit_tests/device/device_caps_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/driver_info.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"

unit_tests/device/gl/device_caps_gl_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"

unit_tests/gtpin/gtpin_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/gtpin/gtpin_defs.h"
@@ -12,7 +13,6 @@
 #include "runtime/gtpin/gtpin_hw_helper.h"
 #include "runtime/gtpin/gtpin_init.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/file_io.h"
 #include "runtime/helpers/hash.h"
 #include "runtime/helpers/options.h"

unit_tests/helpers/basic_math_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 
 #include "gtest/gtest.h"
 

unit_tests/helpers/kernel_commands_tests.cpp

@@ -7,10 +7,10 @@
 
 #include "unit_tests/helpers/kernel_commands_tests.h"
 
+#include "core/helpers/basic_math.h"
 #include "runtime/api/api.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/memory_manager/svm_memory_manager.h"
 #include "unit_tests/fixtures/execution_model_kernel_fixture.h"

unit_tests/kernel/kernel_slm_arg_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/kernel/kernel.h"
 #include "test.h"

unit_tests/linux/main_linux_dll.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/linux/allocator_helper.h"
 #include "runtime/os_interface/linux/os_interface.h"

unit_tests/mem_obj/image_set_arg_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/basic_math.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/basic_math.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/kernel/kernel.h"

unit_tests/memory_manager/local_memory_usage_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/basic_math.h"
+#include "core/helpers/basic_math.h"
 #include "runtime/memory_manager/local_memory_usage.h"
 
 #include "third_party/gtest/gtest/gtest.h"

unit_tests/utilities/vec_tests.cpp

@@ -5,10 +5,9 @@
  *
  */
 
-#include "runtime/utilities/vec.h"
-#include "test.h"
+#include "core/helpers/vec.h"
 
-using namespace NEO;
+#include "gtest/gtest.h"
 
 TEST(VecTest, operators) {
     Vec3<size_t> v0(nullptr);