Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: correct number of returned L0 drivers" 

This reverts commit dcb351e9dd.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation 2023-11-04 01:53:38 +01:00 committed by Compute-Runtime-Automation
parent 0898458d14
commit ec24eb0a4c
10 changed files with 15 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
level_zero/core/source/driver/driver.cpp
View File

@ -26,7 +26,7 @@ namespace L0 {
_ze_driver_handle_t *GlobalDriverHandle; _ze_driver_handle_t *GlobalDriverHandle;
bool LevelZeroDriverInitialized = false; bool LevelZeroDriverInitialized = false;
uint32_t driverCount = 0; uint32_t driverCount = 1;
void DriverImp::initialize(ze_result_t *result) { void DriverImp::initialize(ze_result_t *result) {
*result = ZE_RESULT_ERROR_UNINITIALIZED; *result = ZE_RESULT_ERROR_UNINITIALIZED;
@ -67,8 +67,6 @@ void DriverImp::initialize(ze_result_t *result) {
executionEnvironment->incRefInternal(); executionEnvironment->incRefInternal();
auto neoDevices = NEO::DeviceFactory::createDevices(*executionEnvironment); auto neoDevices = NEO::DeviceFactory::createDevices(*executionEnvironment);
executionEnvironment->decRefInternal(); executionEnvironment->decRefInternal();
GlobalDriverHandle = nullptr;
driverCount = 0;
if (!neoDevices.empty()) { if (!neoDevices.empty()) {
GlobalDriverHandle = DriverHandle::create(std::move(neoDevices), envVariables, result); GlobalDriverHandle = DriverHandle::create(std::move(neoDevices), envVariables, result);
if (GlobalDriverHandle != nullptr) { if (GlobalDriverHandle != nullptr) {
@ -92,7 +90,6 @@ void DriverImp::initialize(ze_result_t *result) {
GlobalDriver = nullptr; GlobalDriver = nullptr;
} }
} }
driverCount = 1;
} }
} }
} }

2
level_zero/core/test/aub_tests/CMakeLists.txt
View File

@ -36,8 +36,6 @@ if(DEFINED AUB_STREAM_PROJECT_NAME)
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${L0_CORE_ENABLERS} ${L0_CORE_ENABLERS}
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h
${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp ${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp

25
level_zero/core/test/common/ult_config_listener_l0.cpp
View File

@ -1,25 +0,0 @@
/*
* Copyright (C) 2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "level_zero/core/test/common/ult_config_listener_l0.h"
#include "level_zero/core/source/driver/driver.h"
void L0::UltConfigListenerL0::OnTestStart(const ::testing::TestInfo &testInfo) {
BaseUltConfigListener::OnTestStart(testInfo);
GlobalDriverHandle = nullptr;
driverCount = 0;
}
void L0::UltConfigListenerL0::OnTestEnd(const ::testing::TestInfo &testInfo) {
EXPECT_EQ(nullptr, GlobalDriverHandle);
EXPECT_EQ(0u, driverCount);
BaseUltConfigListener::OnTestEnd(testInfo);
}

19
level_zero/core/test/common/ult_config_listener_l0.h
View File

@ -1,19 +0,0 @@
/*
* Copyright (C) 2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "shared/test/common/base_ult_config_listener.h"
namespace L0 {
class UltConfigListenerL0 : public NEO::BaseUltConfigListener {
private:
void OnTestStart(const ::testing::TestInfo &) override;
void OnTestEnd(const ::testing::TestInfo &) override;
};
} // namespace L0

4
level_zero/core/test/common/ult_specific_config_l0.cpp
View File

@ -5,11 +5,11 @@
* *
*/ */
#include "shared/test/common/base_ult_config_listener.h"
#include "shared/test/common/helpers/test_files.h" #include "shared/test/common/helpers/test_files.h"
#include "shared/test/common/tests_configuration.h" #include "shared/test/common/tests_configuration.h"
#include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/cmdlist/cmdlist.h"
#include "level_zero/core/test/common/ult_config_listener_l0.h"
using namespace NEO; using namespace NEO;
void cleanTestHelpers() {} void cleanTestHelpers() {}
@ -52,5 +52,5 @@ std::string getBaseExecutionDir() {
} }
void addUltListener(::testing::TestEventListeners &listeners) { void addUltListener(::testing::TestEventListeners &listeners) {
listeners.Append(new L0::UltConfigListenerL0); listeners.Append(new BaseUltConfigListener);
} }

2
level_zero/core/test/unit_tests/CMakeLists.txt
View File

@ -31,8 +31,6 @@ target_sources(${TARGET_NAME} PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h ${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
${NEO_SOURCE_DIR}/level_zero/core/test/common/test_modules/gen_kernel.cmake ${NEO_SOURCE_DIR}/level_zero/core/test/common/test_modules/gen_kernel.cmake
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.h
) )
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE

8
level_zero/core/test/unit_tests/fixtures/device_fixture.h
View File

@ -10,7 +10,6 @@
#include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/hw_info.h"
#include "shared/source/os_interface/os_time.h" #include "shared/source/os_interface/os_time.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/context/context_imp.h"
#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/device/device_imp.h"
@ -31,8 +30,6 @@ struct Context;
struct Device; struct Device;
struct ContextImp; struct ContextImp;
extern uint32_t driverCount;
extern _ze_driver_handle_t *GlobalDriverHandle;
namespace ult { namespace ult {
class MockBuiltins; class MockBuiltins;
@ -54,8 +51,6 @@ struct DeviceFixture {
const uint32_t rootDeviceIndex = 0u; const uint32_t rootDeviceIndex = 0u;
template <typename HelperType> template <typename HelperType>
HelperType &getHelper() const; HelperType &getHelper() const;
VariableBackup<_ze_driver_handle_t *> globalDriverHandleBackup{&GlobalDriverHandle};
VariableBackup<uint32_t> driverCountBackup{&driverCount};
}; };
struct DriverHandleGetMemHandlePtrMock : public L0::DriverHandleImp { struct DriverHandleGetMemHandlePtrMock : public L0::DriverHandleImp {
@ -116,9 +111,6 @@ struct MultiDeviceFixture {
uint32_t numRootDevices = 4u; uint32_t numRootDevices = 4u;
uint32_t numSubDevices = 2u; uint32_t numSubDevices = 2u;
L0::ContextImp *context = nullptr; L0::ContextImp *context = nullptr;
VariableBackup<_ze_driver_handle_t *> globalDriverHandleBackup{&GlobalDriverHandle};
VariableBackup<uint32_t> driverCountBackup{&driverCount};
}; };
struct MultiDeviceFixtureHierarchy : public MultiDeviceFixture { struct MultiDeviceFixtureHierarchy : public MultiDeviceFixture {

42
level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
View File

@ -413,12 +413,7 @@ TEST(DriverTest, givenNullEnvVariableWhenCreatingDriverThenEnableProgramDebuggin
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
struct DriverImpTest : public ::testing::Test { TEST(DriverImpTest, givenDriverImpWhenInitializedThenEnvVariablesAreRead) {
VariableBackup<_ze_driver_handle_t *> globalDriverHandleBackup{&GlobalDriverHandle};
VariableBackup<uint32_t> driverCountBackup{&driverCount};
};
TEST_F(DriverImpTest, givenDriverImpWhenInitializedThenEnvVariablesAreRead) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -436,7 +431,7 @@ TEST_F(DriverImpTest, givenDriverImpWhenInitializedThenEnvVariablesAreRead) {
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, givenMissingMetricApiDependenciesWhenInitializingDriverImpThenGlobalDriverHandleIsNull) { TEST(DriverImpTest, givenMissingMetricApiDependenciesWhenInitializingDriverImpThenGlobalDriverHandleIsNull) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -460,7 +455,7 @@ TEST_F(DriverImpTest, givenMissingMetricApiDependenciesWhenInitializingDriverImp
EXPECT_EQ(nullptr, L0::GlobalDriver); EXPECT_EQ(nullptr, L0::GlobalDriver);
} }
TEST_F(DriverImpTest, givenEnabledProgramDebuggingWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsTrue) { TEST(DriverImpTest, givenEnabledProgramDebuggingWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsTrue) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -482,7 +477,7 @@ TEST_F(DriverImpTest, givenEnabledProgramDebuggingWhenCreatingExecutionEnvironme
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, whenCreatingExecutionEnvironmentThenDefaultHierarchyIsEnabled) { TEST(DriverImpTest, whenCreatingExecutionEnvironmentThenDefaultHierarchyIsEnabled) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -505,7 +500,7 @@ TEST_F(DriverImpTest, whenCreatingExecutionEnvironmentThenDefaultHierarchyIsEnab
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, givenFlatDeviceHierarchyWhenCreatingExecutionEnvironmentThenFlatHierarchyIsEnabled) { TEST(DriverImpTest, givenFlatDeviceHierarchyWhenCreatingExecutionEnvironmentThenFlatHierarchyIsEnabled) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -527,7 +522,7 @@ TEST_F(DriverImpTest, givenFlatDeviceHierarchyWhenCreatingExecutionEnvironmentTh
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, givenCompositeDeviceHierarchyWhenCreatingExecutionEnvironmentThenCompositeHierarchyIsEnabled) { TEST(DriverImpTest, givenCompositeDeviceHierarchyWhenCreatingExecutionEnvironmentThenCompositeHierarchyIsEnabled) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -549,7 +544,7 @@ TEST_F(DriverImpTest, givenCompositeDeviceHierarchyWhenCreatingExecutionEnvironm
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, givenCombinedDeviceHierarchyWhenCreatingExecutionEnvironmentThenCombinedHierarchyIsEnabled) { TEST(DriverImpTest, givenCombinedDeviceHierarchyWhenCreatingExecutionEnvironmentThenCombinedHierarchyIsEnabled) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -571,7 +566,7 @@ TEST_F(DriverImpTest, givenCombinedDeviceHierarchyWhenCreatingExecutionEnvironme
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, givenEnableProgramDebuggingWithValue2WhenCreatingExecutionEnvironmentThenDebuggingEnabledIsTrue) { TEST(DriverImpTest, givenEnableProgramDebuggingWithValue2WhenCreatingExecutionEnvironmentThenDebuggingEnabledIsTrue) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -593,7 +588,7 @@ TEST_F(DriverImpTest, givenEnableProgramDebuggingWithValue2WhenCreatingExecution
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, givenEnabledFP64EmulationWhenCreatingExecutionEnvironmentThenFP64EmulationIsEnabled) { TEST(DriverImpTest, givenEnabledFP64EmulationWhenCreatingExecutionEnvironmentThenFP64EmulationIsEnabled) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -615,11 +610,8 @@ TEST_F(DriverImpTest, givenEnabledFP64EmulationWhenCreatingExecutionEnvironmentT
L0::GlobalDriver = nullptr; L0::GlobalDriver = nullptr;
} }
TEST_F(DriverImpTest, givenEnabledProgramDebuggingAndEnabledExperimentalOpenCLWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsFalse) { TEST(DriverImpTest, givenEnabledProgramDebuggingAndEnabledExperimentalOpenCLWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsFalse) {
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
VariableBackup<_ze_driver_handle_t *> globalDriverHandleBackup{&GlobalDriverHandle};
VariableBackup<uint32_t> driverCountBackup{&driverCount};
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -642,7 +634,7 @@ TEST_F(DriverImpTest, givenEnabledProgramDebuggingAndEnabledExperimentalOpenCLWh
delete L0::GlobalDriver; delete L0::GlobalDriver;
} }
TEST_F(DriverImpTest, givenEnableProgramDebuggingWithValue2AndEnabledExperimentalOpenCLWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsFalse) { TEST(DriverImpTest, givenEnableProgramDebuggingWithValue2AndEnabledExperimentalOpenCLWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsFalse) {
DebugManagerStateRestore restorer; DebugManagerStateRestore restorer;
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -666,7 +658,7 @@ TEST_F(DriverImpTest, givenEnableProgramDebuggingWithValue2AndEnabledExperimenta
delete L0::GlobalDriver; delete L0::GlobalDriver;
} }
TEST_F(DriverImpTest, givenNoProgramDebuggingEnvVarWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsFalse) { TEST(DriverImpTest, givenNoProgramDebuggingEnvVarWhenCreatingExecutionEnvironmentThenDebuggingEnabledIsFalse) {
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
hwInfo.capabilityTable.levelZeroSupported = true; hwInfo.capabilityTable.levelZeroSupported = true;
@ -905,7 +897,6 @@ struct DriverHandleTest : public ::testing::Test {
driverHandle = whiteboxCast(DriverHandle::create(std::move(devices), envVariables, &returnValue)); driverHandle = whiteboxCast(DriverHandle::create(std::move(devices), envVariables, &returnValue));
L0::GlobalDriverHandle = driverHandle; L0::GlobalDriverHandle = driverHandle;
L0::driverCount = 1;
} }
void TearDown() override { void TearDown() override {
delete driverHandle; delete driverHandle;
@ -913,17 +904,8 @@ struct DriverHandleTest : public ::testing::Test {
L0::GlobalDriverHandle = nullptr; L0::GlobalDriverHandle = nullptr;
} }
L0::DriverHandle *driverHandle; L0::DriverHandle *driverHandle;
VariableBackup<_ze_driver_handle_t *> globalDriverHandleBackup{&GlobalDriverHandle};
VariableBackup<uint32_t> driverCountBackup{&driverCount};
}; };
TEST(DriverHandleNegativeTest, givenNotInitializedDriverWhenZeDriverGetIsCalledThenReturnZeroCount) {
uint32_t count = 0u;
auto result = zeDriverGet(&count, nullptr);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
EXPECT_EQ(0U, count);
}
TEST_F(DriverHandleTest, givenInitializedDriverWhenZeDriverGetIsCalledThenDriverHandleCountIsObtained) { TEST_F(DriverHandleTest, givenInitializedDriverWhenZeDriverGetIsCalledThenDriverHandleCountIsObtained) {
uint32_t count = 0; uint32_t count = 0;
auto result = zeDriverGet(&count, nullptr); auto result = zeDriverGet(&count, nullptr);

2
level_zero/sysman/test/unit_tests/CMakeLists.txt
View File

@ -25,8 +25,6 @@ add_executable(${TARGET_NAME}
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h
${NEO_SOURCE_DIR}/level_zero/core/source/dll/create_builtin_functions_lib.cpp ${NEO_SOURCE_DIR}/level_zero/core/source/dll/create_builtin_functions_lib.cpp

2
level_zero/tools/test/unit_tests/CMakeLists.txt
View File

@ -25,8 +25,6 @@ add_executable(${TARGET_NAME}
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_specific_config_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.cpp
${NEO_SOURCE_DIR}/level_zero/core/test/common/ult_config_listener_l0.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h
${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp