diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt index 33f82d218cf80..818132b2b26fa 100644 --- a/runtime/dll/CMakeLists.txt +++ b/runtime/dll/CMakeLists.txt @@ -17,6 +17,7 @@ set(RUNTIME_SRCS_DLL_BASE ${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp + ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp ${IGDRCL_SOURCE_DIR}/runtime/api/api.cpp ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp diff --git a/runtime/dll/create_command_stream.cpp b/runtime/dll/create_command_stream.cpp index ec515e1bec076..28865d3083505 100644 --- a/runtime/dll/create_command_stream.cpp +++ b/runtime/dll/create_command_stream.cpp @@ -10,10 +10,7 @@ #include "runtime/command_stream/create_command_stream_impl.h" #include "runtime/command_stream/device_command_stream.h" #include "runtime/command_stream/tbx_command_stream_receiver.h" -#include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/hw_info.h" -#include "runtime/helpers/options.h" -#include "runtime/os_interface/device_factory.h" namespace OCLRT { @@ -21,8 +18,4 @@ CommandStreamReceiver *createCommandStream(const HardwareInfo *pHwInfo, Executio return createCommandStreamImpl(pHwInfo, executionEnvironment); } -bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnviornment) { - return getDevicesImpl(hwInfo, numDevicesReturned, executionEnviornment); -} - } // namespace OCLRT diff --git a/runtime/dll/get_devices.cpp b/runtime/dll/get_devices.cpp new file mode 100644 index 0000000000000..db7a65e4d3a33 --- /dev/null +++ b/runtime/dll/get_devices.cpp @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "runtime/command_stream/create_command_stream_impl.h" +#include "runtime/execution_environment/execution_environment.h" +#include "runtime/helpers/hw_info.h" +#include "runtime/os_interface/device_factory.h" + +namespace OCLRT { + +bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnviornment) { + return getDevicesImpl(hwInfo, numDevicesReturned, executionEnviornment); +} + +} // namespace OCLRT diff --git a/unit_tests/tbx/CMakeLists.txt b/unit_tests/tbx/CMakeLists.txt index c2270188cce81..d1b157d1a386b 100644 --- a/unit_tests/tbx/CMakeLists.txt +++ b/unit_tests/tbx/CMakeLists.txt @@ -9,6 +9,7 @@ add_executable(igdrcl_tbx_tests ${CMAKE_CURRENT_SOURCE_DIR}/tbx_tests_configuration.cpp ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp ${IGDRCL_SOURCE_DIR}/runtime/dll/create_command_stream.cpp + ${IGDRCL_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp $ diff --git a/unit_tests/windows/CMakeLists.txt b/unit_tests/windows/CMakeLists.txt index ed50d860a6f9f..855f306a0a47b 100644 --- a/unit_tests/windows/CMakeLists.txt +++ b/unit_tests/windows/CMakeLists.txt @@ -9,18 +9,20 @@ project(igdrcl_windows_dll_tests) set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS $ - $ $ ) add_executable(igdrcl_windows_dll_tests ${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS} ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp + ${IGDRCL_SOURCE_DIR}/runtime/dll/create_command_stream.cpp + ${IGDRCL_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp ${IGDRCL_SOURCE_DIR}/runtime/dll/windows/os_interface.cpp ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp ${IGDRCL_SOURCE_DIR}/unit_tests/ult_configuration.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp ) target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS}) diff --git a/unit_tests/windows/get_devices_tests.cpp b/unit_tests/windows/get_devices_tests.cpp new file mode 100644 index 0000000000000..e3b2dc6169835 --- /dev/null +++ b/unit_tests/windows/get_devices_tests.cpp @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "runtime/execution_environment/execution_environment.h" +#include "runtime/helpers/hw_info.h" +#include "test.h" + +namespace OCLRT { +bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnvironment); +} // namespace OCLRT + +using GetDevicesTests = ::testing::Test; + +HWTEST_F(GetDevicesTests, WhenGetDevicesIsCalledThenSuccessIsReturned) { + OCLRT::HardwareInfo *hwInfo; + size_t numDevicesReturned = 0; + OCLRT::ExecutionEnvironment executionEnviornment; + + auto returnValue = OCLRT::getDevices(&hwInfo, numDevicesReturned, executionEnviornment); + EXPECT_EQ(true, returnValue); +}