Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move local ids generation code to shared directory

Browse Source 
Change-Id: I5b0486ceae8d67d0c1d1be56a756c102226d7e2a
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2020-10-07 15:09:42 +02:00
committed by sys_ocldev
parent 83b0932beb
commit 4e3679b8ae
20 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/manifest.yml
View File

@ -14,7 +14,7 @@ components:
infra:
branch: infra
dest_dir: infra
revision: eaa19ddf81e8b620c7f87ca50230120905e7c679
revision: 5ae873aa3d60f55f53ff7bfb63e0895a70015b67
type: git
internal:
branch: master

8
opencl/source/CMakeLists.txt
View File

@ -32,14 +32,6 @@ add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL
add_subdirectories()
include(enable_gens.cmake)
# Enable SSE4/AVX2 options for files that need them
if(MSVC)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/command_queue/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS /arch:AVX2)
else()
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/command_queue/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS -mavx2)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/command_queue/local_id_gen_sse4.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
endif()
if(WIN32)
if("${IGDRCL_OPTION__BITS}" STREQUAL "32")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")

5
opencl/source/command_queue/CMakeLists.txt
View File

@ -40,11 +40,6 @@ set(RUNTIME_SRCS_COMMAND_QUEUE
${CMAKE_CURRENT_SOURCE_DIR}/hardware_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/hardware_interface_base.inl
${CMAKE_CURRENT_SOURCE_DIR}/hardware_interface_bdw_plus.inl
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.cpp
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.h
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.inl
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_avx2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_sse4.cpp
${CMAKE_CURRENT_SOURCE_DIR}/local_work_size.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/resource_barrier.h
)

2
opencl/source/command_queue/gpgpu_walker_base.inl
View File

@ -11,6 +11,7 @@
#include "shared/source/helpers/debug_helpers.h"
#include "shared/source/helpers/engine_node_helper.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/local_id_gen.h"
#include "shared/source/indirect_heap/indirect_heap.h"
#include "shared/source/memory_manager/graphics_allocation.h"
#include "shared/source/os_interface/os_context.h"
@ -19,7 +20,6 @@
#include "opencl/source/command_queue/command_queue.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/source/command_queue/gpgpu_walker.h"
#include "opencl/source/command_queue/local_id_gen.h"
#include "opencl/source/event/perf_counter.h"
#include "opencl/source/event/user_event.h"
#include "opencl/source/helpers/hardware_commands_helper.h"

2
opencl/source/helpers/CMakeLists.txt
View File

@ -48,8 +48,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
${CMAKE_CURRENT_SOURCE_DIR}/task_information.cpp
${CMAKE_CURRENT_SOURCE_DIR}/task_information.h
${CMAKE_CURRENT_SOURCE_DIR}/task_information.inl
${CMAKE_CURRENT_SOURCE_DIR}/uint16_avx2.h
${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4.h
${CMAKE_CURRENT_SOURCE_DIR}/validators.cpp
${CMAKE_CURRENT_SOURCE_DIR}/validators.h
)

2
opencl/source/helpers/hardware_commands_helper_base.inl
View File

@ -13,12 +13,12 @@
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/helpers/basic_math.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/local_id_gen.h"
#include "shared/source/helpers/ptr_math.h"
#include "shared/source/helpers/string.h"
#include "shared/source/indirect_heap/indirect_heap.h"
#include "opencl/source/cl_device/cl_device.h"
#include "opencl/source/command_queue/local_id_gen.h"
#include "opencl/source/context/context.h"
#include "opencl/source/helpers/dispatch_info.h"
#include "opencl/source/kernel/kernel.h"

2
opencl/source/helpers/per_thread_data.h
View File

@ -6,7 +6,7 @@
*/
#pragma once
#include "opencl/source/command_queue/local_id_gen.h"
#include "shared/source/helpers/local_id_gen.h"
#include "patch_shared.h"

2
opencl/test/unit_test/command_queue/local_id_tests.cpp
View File

@ -7,9 +7,9 @@
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/helpers/basic_math.h"
#include "shared/source/helpers/local_id_gen.h"
#include "shared/source/helpers/ptr_math.h"
#include "opencl/source/command_queue/local_id_gen.h"
#include "opencl/test/unit_test/helpers/unit_test_helper.h"
#include "test.h"

2
opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
View File

@ -6,6 +6,7 @@
*/
#include "shared/source/helpers/engine_node_helper.h"
#include "shared/source/helpers/local_id_gen.h"
#include "shared/test/unit_test/cmd_parse/hw_parse.h"
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
#include "shared/test/unit_test/utilities/base_object_utils.h"
@ -13,7 +14,6 @@
#include "opencl/source/built_ins/builtins_dispatch_builder.h"
#include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h"
#include "opencl/source/command_queue/gpgpu_walker.h"
#include "opencl/source/command_queue/local_id_gen.h"
#include "opencl/source/device_queue/device_queue_hw.h"
#include "opencl/source/event/user_event.h"
#include "opencl/source/helpers/per_thread_data.h"

2
opencl/test/unit_test/helpers/per_thread_data_tests.cpp
View File

@ -7,8 +7,8 @@
#include "shared/source/command_stream/linear_stream.h"
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/helpers/local_id_gen.h"
#include "opencl/source/command_queue/local_id_gen.h"
#include "opencl/source/helpers/per_thread_data.h"
#include "opencl/source/program/kernel_info.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"

3
opencl/test/unit_test/helpers/uint16_sse4_tests.cpp
View File

@ -6,8 +6,7 @@
*/
#include "shared/source/helpers/aligned_memory.h"
#include "opencl/source/helpers/uint16_sse4.h"
#include "shared/source/helpers/uint16_sse4.h"
#include "gtest/gtest.h"

9
shared/source/CMakeLists.txt
View File

@ -52,6 +52,15 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
endif()
create_project_source_tree(${LIB_NAME})
# Enable SSE4/AVX2 options for files that need them
if(MSVC)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/helpers/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS /arch:AVX2)
else()
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/helpers/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS -mavx2)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/helpers/local_id_gen_sse4.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
endif()
endfunction()
set(NEO_CORE_COMPILE_DEFS "")

7
shared/source/helpers/CMakeLists.txt
View File

@ -64,6 +64,11 @@ set(NEO_CORE_HELPERS
${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.h
${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.h
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.cpp
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.h
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.inl
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_avx2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_sse4.cpp
${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h
${CMAKE_CURRENT_SOURCE_DIR}/options.h
${CMAKE_CURRENT_SOURCE_DIR}/pause_on_gpu_properties.h
@ -89,6 +94,8 @@ set(NEO_CORE_HELPERS
${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.h
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/timestamp_packet_extra.cpp
${CMAKE_CURRENT_SOURCE_DIR}/uint16_avx2.h
${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4.h
${CMAKE_CURRENT_SOURCE_DIR}/vec.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions/${BRANCH_DIR_SUFFIX}/hw_cmds.h
${CMAKE_CURRENT_SOURCE_DIR}/definitions/pipe_control_args_base.h

2
opencl/source/command_queue/local_id_gen.cpp → shared/source/helpers/local_id_gen.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "opencl/source/command_queue/local_id_gen.h"
#include "shared/source/helpers/local_id_gen.h"
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/utilities/cpu_info.h"

0
opencl/source/command_queue/local_id_gen.h → shared/source/helpers/local_id_gen.h
View File

2
opencl/source/command_queue/local_id_gen.inl → shared/source/helpers/local_id_gen.inl
View File

@ -5,7 +5,7 @@
*
*/
#include "opencl/source/command_queue/local_id_gen.h"
#include "shared/source/helpers/local_id_gen.h"
#include <array>

4
opencl/source/command_queue/local_id_gen_avx2.cpp → shared/source/helpers/local_id_gen_avx2.cpp
View File

@ -6,8 +6,8 @@
*/
#if __AVX2__
#include "opencl/source/command_queue/local_id_gen.inl"
#include "opencl/source/helpers/uint16_avx2.h"
#include "shared/source/helpers/local_id_gen.inl"
#include "shared/source/helpers/uint16_avx2.h"
#include <array>

4
opencl/source/command_queue/local_id_gen_sse4.cpp → shared/source/helpers/local_id_gen_sse4.cpp
View File

@ -5,8 +5,8 @@
*
*/
#include "opencl/source/command_queue/local_id_gen.inl"
#include "opencl/source/helpers/uint16_sse4.h"
#include "shared/source/helpers/local_id_gen.inl"
#include "shared/source/helpers/uint16_sse4.h"
#include <array>

0
opencl/source/helpers/uint16_avx2.h → shared/source/helpers/uint16_avx2.h
View File

0
opencl/source/helpers/uint16_sse4.h → shared/source/helpers/uint16_sse4.h
View File