From dbedc2802ddf97946508e12ba8bbabb0947dbd48 Mon Sep 17 00:00:00 2001 From: "Spruit, Neil R" Date: Mon, 23 Jan 2023 22:58:36 +0000 Subject: [PATCH] Enable LUID Extension by Default Related-To: LOCI-3884 Signed-off-by: Spruit, Neil R --- .../sources/device/device_drm/test_device.cpp | 3 +-- .../sources/device/device_drm_or_wddm/test_device.cpp | 10 ---------- .../sources/device/device_wddm/test_device.cpp | 2 -- shared/source/debug_settings/debug_variables_base.inl | 2 +- shared/test/common/test_files/igdrcl.config | 2 +- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp index 9073938082..c8c73ca7e0 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp @@ -24,7 +24,6 @@ namespace ult { using LuidDeviceTest = Test; TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndDRMDriverTypeThenUnsupportedReturned) { - DebugManager.flags.EnableL0ReadLUIDExtension.set(true); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface()); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::make_unique()); ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; @@ -32,10 +31,10 @@ TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndDRMDriverTypeThenUns deviceProperties.pNext = &deviceLuidProperties; ze_result_t result = device->getProperties(&deviceProperties); EXPECT_EQ(result, ZE_RESULT_ERROR_UNSUPPORTED_FEATURE); - DebugManager.flags.EnableL0ReadLUIDExtension.set(false); } TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndDebugVariableFalseThenSuccessReturned) { + DebugManagerStateRestore restorer; DebugManager.flags.EnableL0ReadLUIDExtension.set(false); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface()); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::make_unique()); diff --git a/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp index 3566a77828..fd8b5c890a 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp @@ -76,17 +76,14 @@ class MockOsContextWin : public OsContextWin { using LuidDeviceTest = Test; TEST_F(LuidDeviceTest, givenOsContextWinAndGetDeviceNodeMaskThenNodeMaskIsAtLeast1) { - DebugManager.flags.EnableL0ReadLUIDExtension.set(true); auto luidMock = new MockDriverModelWDDMLUID(*neoDevice->executionEnvironment->rootDeviceEnvironments[0]); auto defaultEngine = defaultHwInfo->capabilityTable.defaultEngineType; OsContextWin osContext(*luidMock, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor({defaultEngine, EngineUsage::Regular})); EXPECT_GE(osContext.getDeviceNodeMask(), 1u); delete luidMock; - DebugManager.flags.EnableL0ReadLUIDExtension.set(false); } TEST_F(LuidDeviceTest, givenOsContextWinAndGetLUIDArrayThenLUIDisValid) { - DebugManager.flags.EnableL0ReadLUIDExtension.set(true); auto luidMock = new MockDriverModelWDDMLUID(*neoDevice->executionEnvironment->rootDeviceEnvironments[0]); auto defaultEngine = defaultHwInfo->capabilityTable.defaultEngineType; OsContextWin osContext(*luidMock, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor({defaultEngine, EngineUsage::Regular})); @@ -97,11 +94,9 @@ TEST_F(LuidDeviceTest, givenOsContextWinAndGetLUIDArrayThenLUIDisValid) { memcpy_s(&luid, sizeof(uint64_t), luidData.data(), sizeof(uint8_t) * luidData.size()); EXPECT_NE(luid, (uint64_t)0); delete luidMock; - DebugManager.flags.EnableL0ReadLUIDExtension.set(false); } TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndWDDMDriverTypeThenSuccessReturned) { - DebugManager.flags.EnableL0ReadLUIDExtension.set(true); auto defaultEngine = defaultHwInfo->capabilityTable.defaultEngineType; auto luidMock = new MockDriverModelWDDMLUID(*neoDevice->executionEnvironment->rootDeviceEnvironments[0]); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface()); @@ -124,11 +119,9 @@ TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndWDDMDriverTypeThenSu EXPECT_EQ(lowLUID, (uint32_t)adapterLuid.LowPart); EXPECT_EQ(highLUID, (uint32_t)adapterLuid.HighPart); EXPECT_NE(deviceLuidProperties.nodeMask, (uint32_t)0); - DebugManager.flags.EnableL0ReadLUIDExtension.set(false); } TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndDRMDriverTypeThenUnsupportedReturned) { - DebugManager.flags.EnableL0ReadLUIDExtension.set(true); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface()); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::make_unique()); ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; @@ -136,18 +129,15 @@ TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndDRMDriverTypeThenUns deviceProperties.pNext = &deviceLuidProperties; ze_result_t result = device->getProperties(&deviceProperties); EXPECT_EQ(result, ZE_RESULT_ERROR_UNSUPPORTED_FEATURE); - DebugManager.flags.EnableL0ReadLUIDExtension.set(false); } TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureAndAndNoOsInterfaceThenUninitReturned) { - DebugManager.flags.EnableL0ReadLUIDExtension.set(true); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(nullptr); ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; ze_device_luid_ext_properties_t deviceLuidProperties = {ZE_STRUCTURE_TYPE_DEVICE_LUID_EXT_PROPERTIES}; deviceProperties.pNext = &deviceLuidProperties; ze_result_t result = device->getProperties(&deviceProperties); EXPECT_EQ(result, ZE_RESULT_ERROR_UNINITIALIZED); - DebugManager.flags.EnableL0ReadLUIDExtension.set(false); } } // namespace ult diff --git a/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device.cpp index ef3bb56700..8f23625757 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device.cpp @@ -66,7 +66,6 @@ struct LuidDeviceTest : public ::testing::Test { }; TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureThenLuidAndNodeMaskSetForWDDMDriverType) { - DebugManager.flags.EnableL0ReadLUIDExtension.set(true); NEO::MockDevice *neoDevice = nullptr; std::unique_ptr> driverHandle; L0::Device *device = nullptr; @@ -110,7 +109,6 @@ TEST_F(LuidDeviceTest, givenLuidDevicePropertiesStructureThenLuidAndNodeMaskSetF EXPECT_EQ(lowLUID, (uint32_t)adapterLuid.LowPart); EXPECT_EQ(highLUID, (uint32_t)adapterLuid.HighPart); EXPECT_NE(deviceLuidProperties.nodeMask, (uint32_t)0); - DebugManager.flags.EnableL0ReadLUIDExtension.set(false); } } // namespace ult diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index e93e184c4b..2469e3cbce 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -342,7 +342,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, DirectSubmissionRelaxedOrderingQueueSizeLimit, - DECLARE_DEBUG_VARIABLE(bool, DirectSubmissionPrintBuffers, false, "Print address of submitted command buffers") /*FEATURE FLAGS*/ -DECLARE_DEBUG_VARIABLE(bool, EnableL0ReadLUIDExtension, false, "Enables Support for L0 Extension for reading the LUID from WDDM.") +DECLARE_DEBUG_VARIABLE(bool, EnableL0ReadLUIDExtension, true, "Enables Support for L0 Extension for reading the LUID from WDDM.") DECLARE_DEBUG_VARIABLE(bool, EnableL0EuCount, false, "Enables Support for L0 Extension for querying total nubmer of EUs.") DECLARE_DEBUG_VARIABLE(bool, USMEvictAfterMigration, false, "Evict USM allocation after implicit migration to GPU") DECLARE_DEBUG_VARIABLE(bool, EnableNV12, true, "Enables NV12 extension") diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config index d8358b5808..d921fe1660 100644 --- a/shared/test/common/test_files/igdrcl.config +++ b/shared/test/common/test_files/igdrcl.config @@ -108,7 +108,7 @@ DirectSubmissionDisableCacheFlush = -1 DirectSubmissionDisableMonitorFence = -1 DirectSubmissionPrintBuffers = 0 DirectSubmissionMaxRingBuffers = -1 -EnableL0ReadLUIDExtension = 0 +EnableL0ReadLUIDExtension = -1 EnableL0EuCount = 0 USMEvictAfterMigration = 0 EnableDirectSubmissionController = -1