moving ocloc to shared folder

Change-Id: Ic739cf747f7e6fae2c0cd57f0bc1aa0899d3aa53
This commit is contained in:
chmielew
2020-02-27 16:17:08 +01:00
committed by sys_ocldev
parent 47021dcc69
commit e28419fc91
60 changed files with 105 additions and 103 deletions

View File

@ -191,4 +191,3 @@ INSTANTIATE_TEST_CASE_P(KernelArgInfoTests,
::testing::ValuesIn(SourceFileNames),
::testing::ValuesIn(BinaryForSourceFileNames),
::testing::ValuesIn(KernelNames)));

View File

@ -8,10 +8,10 @@ project(ocloc_tests)
set(IGDRCL_SRCS_cloc
${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
${NEO_SOURCE_DIR}/offline_compiler/offline_compiler.cpp
${NEO_SOURCE_DIR}/offline_compiler/ocloc_fatbinary.cpp
${OCLOC_DIRECTORY}/source/decoder/binary_decoder.cpp
${OCLOC_DIRECTORY}/source/decoder/binary_encoder.cpp
${OCLOC_DIRECTORY}/source/offline_compiler.cpp
${OCLOC_DIRECTORY}/source/ocloc_fatbinary.cpp
)
set(IGDRCL_SRCS_offline_compiler_mock
@ -24,23 +24,23 @@ ${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_argument_helper.h
)
set(CLOC_LIB_SRCS_UTILITIES
${NEO_SOURCE_DIR}/offline_compiler/utilities/safety_caller.h
${NEO_SOURCE_DIR}/offline_compiler/utilities//get_current_dir.h
${OCLOC_DIRECTORY}/source/utilities/safety_caller.h
${OCLOC_DIRECTORY}/source/utilities//get_current_dir.h
)
if(WIN32)
list(APPEND CLOC_LIB_SRCS_UTILITIES
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_caller_windows.cpp
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/get_current_dir_windows.cpp
${OCLOC_DIRECTORY}/source/utilities/windows/safety_caller_windows.cpp
${OCLOC_DIRECTORY}/source/utilities/windows/safety_guard_windows.h
${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.cpp
${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.h
${OCLOC_DIRECTORY}/source/utilities/windows/get_current_dir_windows.cpp
)
else()
list(APPEND CLOC_LIB_SRCS_UTILITIES
${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/safety_caller_linux.cpp
${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/safety_guard_linux.h
${NEO_SOURCE_DIR}/offline_compiler/utilities/linux/get_current_dir_linux.cpp
${OCLOC_DIRECTORY}/source/utilities/linux/safety_caller_linux.cpp
${OCLOC_DIRECTORY}/source/utilities/linux/safety_guard_linux.h
${OCLOC_DIRECTORY}/source/utilities/linux/get_current_dir_linux.cpp
)
endif()

View File

@ -5,9 +5,9 @@
*
*/
#include "shared/offline_compiler/source/decoder/binary_decoder.h"
#include "shared/source/helpers/array_count.h"
#include "offline_compiler/decoder/binary_decoder.h"
#include "opencl/test/unit_test/helpers/test_files.h"
#include "gmock/gmock.h"

View File

@ -6,7 +6,7 @@
*/
#pragma once
#include "offline_compiler/decoder/binary_decoder.h"
#include "shared/offline_compiler/source/decoder/binary_decoder.h"
#include "mock_iga_wrapper.h"

View File

@ -6,9 +6,9 @@
*/
#pragma once
#include "shared/offline_compiler/source/decoder/binary_encoder.h"
#include "shared/source/helpers/hash.h"
#include "offline_compiler/decoder/binary_encoder.h"
#include "opencl/test/unit_test/offline_compiler/mock/mock_argument_helper.h"
#include "mock_iga_wrapper.h"

View File

@ -6,7 +6,7 @@
*/
#pragma once
#include "offline_compiler/decoder/iga_wrapper.h"
#include "shared/offline_compiler/source/decoder/iga_wrapper.h"
#include <map>
#include <string>

View File

@ -7,7 +7,8 @@
#pragma once
#include "offline_compiler/offline_compiler.h"
#include "shared/offline_compiler/source/offline_compiler.h"
#include "opencl/source/os_interface/os_inc_base.h"
#include "opencl/test/unit_test/helpers/test_files.h"
#include "opencl/test/unit_test/mocks/mock_compilers.h"

View File

@ -5,7 +5,7 @@
*
*/
#include "offline_compiler/ocloc_arg_helper.h"
#include "shared/offline_compiler/source/ocloc_arg_helper.h"
#include <map>
#include <string>

View File

@ -6,7 +6,7 @@
*/
#pragma once
#include "offline_compiler/offline_compiler.h"
#include "shared/offline_compiler/source/offline_compiler.h"
#include <string>

View File

@ -5,10 +5,9 @@
*
*/
#include "shared/offline_compiler/source/ocloc_fatbinary.h"
#include "shared/source/helpers/hw_helper.h"
#include "offline_compiler/ocloc_fatbinary.h"
#include "gtest/gtest.h"
#include <unordered_set>

View File

@ -6,8 +6,8 @@
*/
#pragma once
#include "offline_compiler/multi_command.h"
#include "offline_compiler/offline_compiler.h"
#include "shared/offline_compiler/source/multi_command.h"
#include "shared/offline_compiler/source/offline_compiler.h"
#include "gtest/gtest.h"
#include <CL/cl.h>

View File

@ -18,9 +18,9 @@ if(WIN32)
${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/safety_guard_windows.h
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.cpp
${NEO_SOURCE_DIR}/offline_compiler/utilities/windows/seh_exception.h
${OCLOC_DIRECTORY}/source/utilities/windows/safety_guard_windows.h
${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.cpp
${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.h
)
else()
list(APPEND CLOC_SEGFAULT_TEST_SOURCES

View File

@ -5,7 +5,7 @@
*
*/
#include "offline_compiler/utilities/linux/safety_guard_linux.h"
#include "shared/offline_compiler/source/utilities/linux/safety_guard_linux.h"
#include "../segfault_helper.h"

View File

@ -5,7 +5,8 @@
*
*/
#include "offline_compiler/utilities/windows/safety_guard_windows.h"
#include "shared/offline_compiler/source/utilities/windows/safety_guard_windows.h"
#include "opencl/test/unit_test/offline_compiler/segfault_test/segfault_helper.h"
void generateSegfaultWithSafetyGuard(SegfaultHelper *segfaultHelper) {
@ -14,4 +15,4 @@ void generateSegfaultWithSafetyGuard(SegfaultHelper *segfaultHelper) {
int retVal = 0;
safetyGuard.call<int, SegfaultHelper, decltype(&SegfaultHelper::generateSegfault)>(segfaultHelper, &SegfaultHelper::generateSegfault, retVal);
}
}