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

fix: add missing nullptr check in adjustRootDeviceEnvironments method 

Related-To: NEO-8166
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2023-07-12 12:17:35 +00:00 committed by Compute-Runtime-Automation
parent a6a0b95344
commit 16dd1ebd9a
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/source/execution_environment/execution_environment_drm_or_wddm.cpp
View File

@ -14,7 +14,7 @@
namespace NEO { namespace NEO {
void ExecutionEnvironment::adjustRootDeviceEnvironments() { void ExecutionEnvironment::adjustRootDeviceEnvironments() {
if (rootDeviceEnvironments[0]->osInterface->getDriverModel()->getDriverModelType() == DriverModelType::DRM) { if (!rootDeviceEnvironments.empty() && rootDeviceEnvironments[0]->osInterface->getDriverModel()->getDriverModelType() == DriverModelType::DRM) {
for (auto rootDeviceIndex = 0u; rootDeviceIndex < rootDeviceEnvironments.size(); rootDeviceIndex++) { for (auto rootDeviceIndex = 0u; rootDeviceIndex < rootDeviceEnvironments.size(); rootDeviceIndex++) {
auto drmMemoryOperationsHandler = static_cast<DrmMemoryOperationsHandler *>(rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface.get()); auto drmMemoryOperationsHandler = static_cast<DrmMemoryOperationsHandler *>(rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface.get());
drmMemoryOperationsHandler->setRootDeviceIndex(rootDeviceIndex); drmMemoryOperationsHandler->setRootDeviceIndex(rootDeviceIndex);

15
shared/test/unit_test/os_interface/linux/device_factory_tests_linux.cpp
View File

@ -81,6 +81,7 @@ TEST(SortAndFilterDevicesDrmTest, whenSortingAndFilteringDevicesThenMemoryOperat
DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices); DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices);
DebugManager.flags.ZE_AFFINITY_MASK.set("1,2,3,4,5"); DebugManager.flags.ZE_AFFINITY_MASK.set("1,2,3,4,5");
VariableBackup<uint32_t> osContextCountBackup(&MemoryManager::maxOsContextCount);
VariableBackup<std::map<std::string, std::vector<std::string>>> directoryFilesMapBackup(&directoryFilesMap); VariableBackup<std::map<std::string, std::vector<std::string>>> directoryFilesMapBackup(&directoryFilesMap);
VariableBackup<const char *> pciDevicesDirectoryBackup(&Os::pciDevicesDirectory); VariableBackup<const char *> pciDevicesDirectoryBackup(&Os::pciDevicesDirectory);
VariableBackup<decltype(SysCalls::sysCallsOpen)> mockOpen(&SysCalls::sysCallsOpen, [](const char *pathname, int flags) -> int { VariableBackup<decltype(SysCalls::sysCallsOpen)> mockOpen(&SysCalls::sysCallsOpen, [](const char *pathname, int flags) -> int {
@ -115,3 +116,17 @@ TEST(SortAndFilterDevicesDrmTest, whenSortingAndFilteringDevicesThenMemoryOperat
EXPECT_EQ(rootDeviceIndex, static_cast<DrmMemoryOperationsHandlerBind &>(*executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface).getRootDeviceIndex()); EXPECT_EQ(rootDeviceIndex, static_cast<DrmMemoryOperationsHandlerBind &>(*executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface).getRootDeviceIndex());
} }
} }
TEST(DeviceFactoryAffinityMaskTest, whenAffinityMaskDoesNotSelectAnyDeviceThenEmptyEnvironmentIsReturned) {
static const auto numRootDevices = 6;
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices);
DebugManager.flags.ZE_AFFINITY_MASK.set("100");
VariableBackup<uint32_t> osContextCountBackup(&MemoryManager::maxOsContextCount);
ExecutionEnvironment executionEnvironment{};
bool success = DeviceFactory::prepareDeviceEnvironments(executionEnvironment);
EXPECT_TRUE(success);
EXPECT_EQ(0u, executionEnvironment.rootDeviceEnvironments.size());
}