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

Setup device registry path in GMM_INIT_IN_ARGS 

Change-Id: If4eed9cb16bd0bba24a0d5803488e00ef48a3fa5
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2020-08-05 13:58:44 +02:00 committed by sys_ocldev
parent 7d9d4e743a
commit 171c40d58a
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opencl/test/unit_test/mocks/mock_wddm.h
View File

@ -32,6 +32,7 @@ class WddmMock : public Wddm {
using Wddm::currentPagingFenceValue; using Wddm::currentPagingFenceValue;
using Wddm::dedicatedVideoMemory; using Wddm::dedicatedVideoMemory;
using Wddm::device; using Wddm::device;
using Wddm::deviceRegistryPath;
using Wddm::featureTable; using Wddm::featureTable;
using Wddm::getSystemInfo; using Wddm::getSystemInfo;
using Wddm::gmmMemory; using Wddm::gmmMemory;

4
opencl/test/unit_test/windows/os_interface_tests.cpp
View File

@ -26,6 +26,8 @@ TEST(osInterfaceTests, whenOsInterfaceSetupGmmInputArgsThenArgsAreSet) {
wddm->init(); wddm->init();
EXPECT_NE(nullptr, rootDeviceEnvironment.osInterface.get()); EXPECT_NE(nullptr, rootDeviceEnvironment.osInterface.get());
wddm->deviceRegistryPath = "registyPath";
auto expectedRegistryPath = wddm->deviceRegistryPath.c_str();
auto &adapterBDF = wddm->adapterBDF; auto &adapterBDF = wddm->adapterBDF;
adapterBDF.Bus = 0x12; adapterBDF.Bus = 0x12;
adapterBDF.Device = 0x34; adapterBDF.Device = 0x34;
@ -33,9 +35,11 @@ TEST(osInterfaceTests, whenOsInterfaceSetupGmmInputArgsThenArgsAreSet) {
GMM_INIT_IN_ARGS gmmInputArgs = {}; GMM_INIT_IN_ARGS gmmInputArgs = {};
EXPECT_NE(0, memcmp(&adapterBDF, &gmmInputArgs.stAdapterBDF, sizeof(ADAPTER_BDF))); EXPECT_NE(0, memcmp(&adapterBDF, &gmmInputArgs.stAdapterBDF, sizeof(ADAPTER_BDF)));
EXPECT_STRNE(expectedRegistryPath, gmmInputArgs.DeviceRegistryPath);
rootDeviceEnvironment.osInterface->setGmmInputArgs(&gmmInputArgs); rootDeviceEnvironment.osInterface->setGmmInputArgs(&gmmInputArgs);
EXPECT_EQ(0, memcmp(&adapterBDF, &gmmInputArgs.stAdapterBDF, sizeof(ADAPTER_BDF))); EXPECT_EQ(0, memcmp(&adapterBDF, &gmmInputArgs.stAdapterBDF, sizeof(ADAPTER_BDF)));
EXPECT_EQ(GMM_CLIENT::GMM_OCL_VISTA, gmmInputArgs.ClientType); EXPECT_EQ(GMM_CLIENT::GMM_OCL_VISTA, gmmInputArgs.ClientType);
EXPECT_STREQ(expectedRegistryPath, gmmInputArgs.DeviceRegistryPath);
} }

1
shared/source/os_interface/windows/wddm/wddm.cpp
View File

@ -1017,6 +1017,7 @@ void Wddm::setGmmInputArg(void *args) {
gmmInArgs->stAdapterBDF = this->adapterBDF; gmmInArgs->stAdapterBDF = this->adapterBDF;
gmmInArgs->ClientType = GMM_CLIENT::GMM_OCL_VISTA; gmmInArgs->ClientType = GMM_CLIENT::GMM_OCL_VISTA;
gmmInArgs->DeviceRegistryPath = const_cast<char *>(deviceRegistryPath.c_str());
} }
void Wddm::updatePagingFenceValue(uint64_t newPagingFenceValue) { void Wddm::updatePagingFenceValue(uint64_t newPagingFenceValue) {