Skip to content

Commit fae50eb

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Move hw_info files to shared
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 1301f77 commit fae50eb

25 files changed

+16
-27
lines changed

‎opencl/source/enable_gens.cmake‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,10 @@ set(RUNTIME_SRCS_GENX_CPP_BASE
2525
experimental_command_buffer
2626
gpgpu_walker
2727
hardware_commands_helper
28-
hw_info
2928
image
3029
sampler
3130
)
3231

33-
macro(macro_for_each_platform)
34-
string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
35-
36-
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
37-
set(PLATFORM_FILE "hw_info_setup_${PLATFORM_IT_LOWER}.inl")
38-
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}${PLATFORM_FILE})
39-
if(EXISTS ${SRC_FILE})
40-
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
41-
endif()
42-
foreach(BRANCH ${BRANCH_DIR_LIST})
43-
set(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.cpp")
44-
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_FILE})
45-
if(EXISTS ${SRC_FILE})
46-
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
47-
endif()
48-
endforeach()
49-
endforeach()
50-
endmacro()
51-
5232
macro(macro_for_each_gen)
5333
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
5434
set(GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER})
@@ -87,8 +67,6 @@ macro(macro_for_each_gen)
8767
endforeach()
8868
endforeach()
8969

90-
apply_macro_for_each_platform()
91-
9270
foreach(BRANCH ${BRANCH_DIR_LIST})
9371
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp)
9472
if(EXISTS ${SRC_FILE})

‎shared/offline_compiler/source/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ set(CLOC_LIB_LIB_FLAGS_DEFINITIONS
104104
-DALL_SUPPORTED_PRODUCT_FAMILIES=${ALL_SUPPORTED_PRODUCT_FAMILIES}
105105
)
106106

107-
set(RUNTIME_GENX_CPP_FILES
107+
set(NEO_SHARED_GENX_CPP_FILES
108108
hw_info
109109
)
110110

111111
macro(macro_for_each_platform)
112112
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
113113
foreach(BRANCH ${BRANCH_DIR_LIST})
114-
foreach(SRC_FILE ${NEO_SOURCE_DIR}/opencl/source${BRANCH}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}hw_info_setup_${PLATFORM_IT_LOWER}.inl
115-
${NEO_SOURCE_DIR}/opencl/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.cpp
114+
foreach(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}hw_info_setup_${PLATFORM_IT_LOWER}.inl
115+
${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.cpp
116116
)
117117
if(EXISTS ${SRC_FILE})
118118
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})
@@ -123,10 +123,10 @@ macro(macro_for_each_platform)
123123
endmacro()
124124

125125
macro(macro_for_each_gen)
126-
foreach(SRC_IT ${RUNTIME_GENX_CPP_FILES})
126+
foreach(SRC_IT ${NEO_SHARED_GENX_CPP_FILES})
127127
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
128128
foreach(BRANCH ${BRANCH_DIR_LIST})
129-
set(SRC_FILE ${NEO_SOURCE_DIR}/opencl/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT})
129+
set(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT})
130130
if(EXISTS ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
131131
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp)
132132
endif()

‎shared/source/enable_gens.cmake‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set(CORE_RUNTIME_SRCS_GENX_CPP_BASE
1919
create_device_command_stream_receiver
2020
direct_submission
2121
hw_helper
22+
hw_info
2223
preamble
2324
preemption
2425
state_base_address
@@ -39,6 +40,11 @@ macro(macro_for_each_platform)
3940
string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
4041

4142
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
43+
set(PLATFORM_FILE "hw_info_setup_${PLATFORM_IT_LOWER}.inl")
44+
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}${PLATFORM_FILE})
45+
if(EXISTS ${SRC_FILE})
46+
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
47+
endif()
4248
foreach(BRANCH ${BRANCH_DIR_LIST})
4349

4450
set(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h")
@@ -70,6 +76,11 @@ macro(macro_for_each_platform)
7076
list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE})
7177
endif()
7278

79+
set(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.cpp")
80+
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_FILE})
81+
if(EXISTS ${SRC_FILE})
82+
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
83+
endif()
7384
endforeach()
7485
endforeach()
7586

opencl/source/gen11/hw_info_ehl.cpp renamed to shared/source/gen11/hw_info_ehl.cpp

File renamed without changes.

opencl/source/gen11/hw_info_gen11.cpp renamed to shared/source/gen11/hw_info_gen11.cpp

File renamed without changes.

opencl/source/gen11/hw_info_icllp.cpp renamed to shared/source/gen11/hw_info_icllp.cpp

File renamed without changes.

opencl/source/gen11/hw_info_lkf.cpp renamed to shared/source/gen11/hw_info_lkf.cpp

File renamed without changes.

opencl/source/gen12lp/definitions/hw_info_setup_adlp.inl renamed to shared/source/gen12lp/definitions/hw_info_setup_adlp.inl

File renamed without changes.

opencl/source/gen12lp/hw_info_adlp.cpp renamed to shared/source/gen12lp/hw_info_adlp.cpp

File renamed without changes.

opencl/source/gen12lp/hw_info_adls.cpp renamed to shared/source/gen12lp/hw_info_adls.cpp

File renamed without changes.

0 commit comments

Comments
 (0)