intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 14:02:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable NodeMask Generation thru L0 LUID Extension

Browse Source 
Related-To: LOCI-3250

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>
This commit is contained in:
Spruit, Neil R
2022-12-08 00:05:54 +00:00
committed by Compute-Runtime-Automation
parent aafe562bce
commit 4fce3ede9b
20 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
View File

@@ -29,7 +29,7 @@ namespace SysCalls {
extern const wchar_t *currentLibraryPath;
}
extern uint32_t numRootDevicesToEnum;
std::unique_ptr<HwDeviceIdWddm> createHwDeviceIdFromAdapterLuid(OsEnvironmentWin &osEnvironment, LUID adapterLuid);
std::unique_ptr<HwDeviceIdWddm> createHwDeviceIdFromAdapterLuid(OsEnvironmentWin &osEnvironment, LUID adapterLuid, uint32_t adapterNodeOrdinalIn);
} // namespace NEO
using namespace NEO;
@@ -1490,7 +1490,7 @@ TEST(HwDeviceId, whenHwDeviceIdIsDestroyedThenAdapterIsClosed) {
D3DKMT_HANDLE adapter = 0x1234;
{
HwDeviceIdWddm hwDeviceId{adapter, {}, osEnv.get(), std::make_unique<UmKmDataTranslator>()};
HwDeviceIdWddm hwDeviceId{adapter, {}, 1u, osEnv.get(), std::make_unique<UmKmDataTranslator>()};
}
EXPECT_EQ(1u, GdiWithMockedCloseFunc::closeAdapterCalled);
EXPECT_EQ(adapter, GdiWithMockedCloseFunc::closeAdapterCalledArgPassed);
@@ -1706,7 +1706,7 @@ TEST(VerifyAdapterType, whenAdapterDoesntSupportRenderThenDontCreateHwDeviceId)
osEnv->gdi.reset(gdi.release());
LUID shadowAdapterLuid = {0xdd, 0xdd};
auto hwDeviceId = createHwDeviceIdFromAdapterLuid(*osEnv, shadowAdapterLuid);
auto hwDeviceId = createHwDeviceIdFromAdapterLuid(*osEnv, shadowAdapterLuid, 1u);
EXPECT_EQ(nullptr, hwDeviceId.get());
}
@@ -1716,7 +1716,7 @@ TEST(VerifyAdapterType, whenAdapterSupportsRenderThenCreateHwDeviceId) {
osEnv->gdi.reset(gdi.release());
LUID adapterLuid = {0x12, 0x1234};
auto hwDeviceId = createHwDeviceIdFromAdapterLuid(*osEnv, adapterLuid);
auto hwDeviceId = createHwDeviceIdFromAdapterLuid(*osEnv, adapterLuid, 1u);
EXPECT_NE(nullptr, hwDeviceId.get());
}

2
opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp
View File

@@ -30,7 +30,7 @@ class WddmWithKmDafMock : public Wddm {
using Wddm::mapGpuVirtualAddress;
WddmWithKmDafMock(RootDeviceEnvironment &rootDeviceEnvironment)
: Wddm(std::make_unique<HwDeviceIdWddm>(ADAPTER_HANDLE, LUID{}, rootDeviceEnvironment.executionEnvironment.osEnvironment.get(), std::make_unique<UmKmDataTranslator>()),
: Wddm(std::make_unique<HwDeviceIdWddm>(ADAPTER_HANDLE, LUID{}, 1u, rootDeviceEnvironment.executionEnvironment.osEnvironment.get(), std::make_unique<UmKmDataTranslator>()),
rootDeviceEnvironment) {
kmDafListener.reset(new KmDafListenerMock);
}

1
opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@@ -725,6 +725,7 @@ TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenCreateFromNTHandleIsCall
translator->isEnabled = true;
std::unique_ptr<NEO::HwDeviceIdWddm> hwDeviceId = std::make_unique<NEO::HwDeviceIdWddm>(wddm->hwDeviceId->getAdapter(),
wddm->hwDeviceId->getAdapterLuid(),
1u,
executionEnvironment->osEnvironment.get(),
std::move(translator));
wddm->hwDeviceId.reset(hwDeviceId.release());