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

Revert "Support for L0 to read Device LUID from the WDDM driver using EXT Prop"

Browse Source 
This reverts commit b5b9c3500f.

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>
This commit is contained in:
Spruit, Neil R
2022-10-12 00:11:15 +00:00
committed by Compute-Runtime-Automation
parent 448278ac56
commit 1995fd9d92
16 changed files with 1 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
shared/source/os_interface/windows/os_context_win.cpp
View File

@@ -52,23 +52,6 @@ void OsContextWin::reInitializeContext() {
UNRECOVERABLE_IF(!wddm.createContext(*this));
};
void OsContextWin::getDeviceLuidArray(std::vector<uint8_t> &luidData, size_t arraySize) {
auto *wddm = this->getWddm();
auto *hwDeviceID = wddm->getHwDeviceId();
auto luid = hwDeviceID->getAdapterLuid();
luidData.reserve(arraySize);
for (size_t i = 0; i < arraySize; i++) {
char *luidArray = nullptr;
if (i < 4) {
luidArray = (char *)&luid.LowPart;
luidData.emplace(luidData.end(), luidArray[i]);
} else {
luidArray = (char *)&luid.HighPart;
luidData.emplace(luidData.end(), luidArray[i - 4]);
}
}
};
OsContextWin::~OsContextWin() {
if (contextInitialized && (false == this->wddm.skipResourceCleanup())) {
wddm.getWddmInterface()->destroyHwQueue(hardwareQueue.handle);

1
shared/source/os_interface/windows/os_context_win.h
View File

@@ -35,7 +35,6 @@ class OsContextWin : public OsContext {
MOCKABLE_VIRTUAL WddmResidencyController &getResidencyController() { return residencyController; }
static OsContext *create(OSInterface *osInterface, uint32_t contextId, const EngineDescriptor &engineDescriptor);
void reInitializeContext() override;
void getDeviceLuidArray(std::vector<uint8_t> &luidData, size_t arraySize);
protected:
void initializeContext() override;

32
shared/test/common/os_interface/windows/wddm_fixture.h
View File

@@ -61,38 +61,6 @@ struct WddmFixture : public Test<MockExecutionEnvironmentGmmFixture> {
MockWddmResidentAllocationsContainer *mockTemporaryResources;
};
struct WddmFixtureLuid : public Test<MockExecutionEnvironmentGmmFixture> {
void SetUp() override {
MockExecutionEnvironmentGmmFixture::setUp();
rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get();
osEnvironment = new OsEnvironmentWin();
gdi = new MockGdi();
osEnvironment->gdi.reset(gdi);
executionEnvironment->osEnvironment.reset(osEnvironment);
wddm = static_cast<WddmMock *>(Wddm::createWddm(nullptr, *rootDeviceEnvironment));
rootDeviceEnvironment->osInterface = std::make_unique<OSInterface>();
rootDeviceEnvironment->osInterface->setDriverModel(std::unique_ptr<DriverModel>(wddm));
rootDeviceEnvironment->memoryOperationsInterface = std::make_unique<WddmMemoryOperationsHandler>(wddm);
osInterface = rootDeviceEnvironment->osInterface.get();
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo);
wddm->init();
auto hwInfo = rootDeviceEnvironment->getHardwareInfo();
auto engine = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*osInterface->getDriverModel()->as<Wddm>(), 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode));
osContext->ensureContextInitialized();
mockTemporaryResources = static_cast<MockWddmResidentAllocationsContainer *>(wddm->temporaryResources.get());
}
WddmMock *wddm = nullptr;
OSInterface *osInterface;
RootDeviceEnvironment *rootDeviceEnvironment = nullptr;
OsEnvironmentWin *osEnvironment = nullptr;
std::unique_ptr<OsContextWin> osContext;
MockGdi *gdi = nullptr;
MockWddmResidentAllocationsContainer *mockTemporaryResources;
};
struct WddmFixtureWithMockGdiDll : public GdiDllFixture, public MockExecutionEnvironmentGmmFixture {
void setUp() {
MockExecutionEnvironmentGmmFixture::setUp();

13
shared/test/unit_test/os_interface/windows/wddm_tests.cpp
View File

@@ -6,13 +6,11 @@
*/
#include "shared/source/gmm_helper/gmm.h"
#include "shared/source/helpers/string.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/os_interface/windows/wddm_fixture.h"
#include "shared/test/common/test_macros/hw_test.h"
namespace NEO {
std::unique_ptr<HwDeviceIdWddm> createHwDeviceIdFromAdapterLuid(OsEnvironmentWin &osEnvironment, LUID adapterLuid);
using WddmTests = WddmTestWithMockGdiDll;
@@ -388,17 +386,6 @@ TEST_F(WddmTests, GivenPlatformNotSupportEvictIfNecessaryWhenAdjustingEvictNeede
bool value = wddm->adjustEvictNeededParameter(false);
EXPECT_TRUE(value);
}
using WddmOsContextDeviceLuidTests = WddmFixtureLuid;
TEST_F(WddmFixtureLuid, givenValidOsContextAndLuidDataRequestThenValidDataReturned) {
LUID adapterLuid = {0x12, 0x1234};
wddm->hwDeviceId = NEO::createHwDeviceIdFromAdapterLuid(*osEnvironment, adapterLuid);
std::vector<uint8_t> luidData;
size_t arraySize = 8;
osContext->getDeviceLuidArray(luidData, arraySize);
uint64_t luid = 0;
memcpy_s(&luid, sizeof(uint64_t), luidData.data(), sizeof(uint8_t) * luidData.size());
EXPECT_NE(luid, (uint64_t)0);
}
uint64_t waitForSynchronizationObjectFromCpuCounter = 0u;