Verify DX sharing based on AdapterLuid

Change-Id: I86e970cbc48256e5941f0a071dc549dd22423105
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/source/os_interface/windows/api_win.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/os_interface/windows/os_interface.h"
 #include "shared/source/utilities/api_intercept.h"
 
 #include "opencl/source/api/api.h"
@@ -22,6 +23,18 @@
 
 using namespace NEO;
 
+ClDevice *pickDeviceWithAdapterLuid(Platform *platform, LUID adapterLuid) {
+    ClDevice *deviceToReturn = nullptr;
+    for (auto i = 0u; i < platform->getNumDevices(); i++) {
+        auto device = platform->getClDevice(i);
+        if (device->getRootDeviceEnvironment().osInterface->get()->getWddm()->verifyAdapterLuid(adapterLuid)) {
+            deviceToReturn = device;
+            break;
+        }
+    }
+    return deviceToReturn;
+}
+
 void NEO::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info &paramName, size_t *srcParamSize, void **srcParam) {
     switch (paramName) {
     case CL_MEM_D3D10_RESOURCE_KHR:
@@ -295,6 +308,7 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D10KHR(cl_platform_id platform, cl_d3d10_
     cl_int retCode = CL_SUCCESS;
 
     Platform *platformInternal = nullptr;
+    ClDevice *device = nullptr;
     auto retVal = validateObjects(WithCastToInternal(platform, &platformInternal));
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("platform", platform,
@@ -312,8 +326,6 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D10KHR(cl_platform_id platform, cl_d3d10_
         sharingFcns.getDxgiDescFcn = (D3DSharingFunctions<D3DTypesHelper::D3D10>::GetDxgiDescFcn)DebugManager.injectFcn;
     }
 
-    ClDevice *device = platformInternal->getClDevice(0);
-
     switch (d3dDeviceSource) {
     case CL_D3D10_DEVICE_KHR:
         d3dDevice = (ID3D10Device *)d3dObject;
@@ -328,7 +340,7 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D10KHR(cl_platform_id platform, cl_d3d10_
     }
 
     sharingFcns.getDxgiDescFcn(&dxgiDesc, dxgiAdapter, d3dDevice);
-    if (dxgiDesc.VendorId != INTEL_VENDOR_ID || dxgiDesc.DeviceId != device->getHardwareInfo().platform.usDeviceID) {
+    if (dxgiDesc.VendorId != INTEL_VENDOR_ID) {
         GetInfoHelper::set(numDevices, localNumDevices);
         retVal = CL_DEVICE_NOT_FOUND;
         return retVal;
@@ -337,8 +349,13 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D10KHR(cl_platform_id platform, cl_d3d10_
     switch (d3dDeviceSet) {
     case CL_PREFERRED_DEVICES_FOR_D3D10_KHR:
     case CL_ALL_DEVICES_FOR_D3D10_KHR:
-        GetInfoHelper::set(devices, static_cast<cl_device_id>(device));
-        localNumDevices = 1;
+        device = pickDeviceWithAdapterLuid(platformInternal, dxgiDesc.AdapterLuid);
+        if (device) {
+            GetInfoHelper::set(devices, static_cast<cl_device_id>(device));
+            localNumDevices = 1;
+        } else {
+            retCode = CL_DEVICE_NOT_FOUND;
+        }
         break;
     default:
         retCode = CL_INVALID_VALUE;
@@ -502,6 +519,7 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D11KHR(cl_platform_id platform, cl_d3d11_
     cl_uint localNumDevices = 0;
 
     Platform *platformInternal = nullptr;
+    ClDevice *device = nullptr;
     auto retVal = validateObjects(WithCastToInternal(platform, &platformInternal));
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("platform", platform,
@@ -519,8 +537,6 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D11KHR(cl_platform_id platform, cl_d3d11_
         sharingFcns.getDxgiDescFcn = (D3DSharingFunctions<D3DTypesHelper::D3D11>::GetDxgiDescFcn)DebugManager.injectFcn;
     }
 
-    ClDevice *device = platformInternal->getClDevice(0);
-
     switch (d3dDeviceSource) {
     case CL_D3D11_DEVICE_KHR:
         d3dDevice = (ID3D11Device *)d3dObject;
@@ -536,7 +552,7 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D11KHR(cl_platform_id platform, cl_d3d11_
     }
 
     sharingFcns.getDxgiDescFcn(&dxgiDesc, dxgiAdapter, d3dDevice);
-    if (dxgiDesc.VendorId != INTEL_VENDOR_ID || dxgiDesc.DeviceId != device->getHardwareInfo().platform.usDeviceID) {
+    if (dxgiDesc.VendorId != INTEL_VENDOR_ID) {
         GetInfoHelper::set(numDevices, localNumDevices);
         retVal = CL_DEVICE_NOT_FOUND;
         return retVal;
@@ -545,8 +561,13 @@ cl_int CL_API_CALL clGetDeviceIDsFromD3D11KHR(cl_platform_id platform, cl_d3d11_
     switch (d3dDeviceSet) {
     case CL_PREFERRED_DEVICES_FOR_D3D11_KHR:
     case CL_ALL_DEVICES_FOR_D3D11_KHR:
-        GetInfoHelper::set(devices, static_cast<cl_device_id>(device));
-        localNumDevices = 1;
+        device = pickDeviceWithAdapterLuid(platformInternal, dxgiDesc.AdapterLuid);
+        if (device) {
+            GetInfoHelper::set(devices, static_cast<cl_device_id>(device));
+            localNumDevices = 1;
+        } else {
+            retVal = CL_DEVICE_NOT_FOUND;
+        }
         break;
     default:
         retVal = CL_INVALID_VALUE;

opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/os_interface/windows/os_interface.h"
 #include "shared/source/utilities/arrayref.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
@@ -18,6 +19,7 @@
 #include "opencl/source/sharings/d3d/d3d_surface.h"
 #include "opencl/source/sharings/d3d/d3d_texture.h"
 #include "opencl/test/unit_test/fixtures/d3d_test_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_wddm.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
@@ -562,14 +564,11 @@ INSTANTIATE_TYPED_TEST_CASE_P(D3DSharingTests, D3DTests, D3DTypes);
 
 using D3D10Test = D3DTests<D3DTypesHelper::D3D10>;
 
-TEST_F(D3D10Test, givenIncompatibleD3DAdapterWhenGettingDeviceIdsThenNoDevicesAreReturned) {
+TEST_F(D3D10Test, givenIncompatibleAdapterLuidWhenGettingDeviceIdsThenNoDevicesAreReturned) {
     cl_device_id deviceID;
     cl_uint numDevices = 15;
-    auto clAdapterId = context->getDevice(0)->getHardwareInfo().platform.usDeviceID;
-    auto d3dAdapterId = clAdapterId + 1;
-    mockSharingFcns->mockDxgiDesc.DeviceId = d3dAdapterId;
+    static_cast<WddmMock *>(context->getDevice(0)->getRootDeviceEnvironment().osInterface->get()->getWddm())->verifyAdapterLuidReturnValue = false;
 
-    EXPECT_NE(clAdapterId, d3dAdapterId);
     auto retVal = clGetDeviceIDsFromD3D10KHR(pPlatform, CL_D3D10_DEVICE_KHR, nullptr, CL_ALL_DEVICES_FOR_D3D10_KHR, 1, &deviceID, &numDevices);
 
     EXPECT_EQ(CL_DEVICE_NOT_FOUND, retVal);
@@ -578,14 +577,11 @@ TEST_F(D3D10Test, givenIncompatibleD3DAdapterWhenGettingDeviceIdsThenNoDevicesAr
 
 using D3D11Test = D3DTests<D3DTypesHelper::D3D11>;
 
-TEST_F(D3D11Test, givenIncompatibleD3DAdapterWhenGettingDeviceIdsThenNoDevicesAreReturned) {
+TEST_F(D3D11Test, givenIncompatibleAdapterLuidWhenGettingDeviceIdsThenNoDevicesAreReturned) {
     cl_device_id deviceID;
     cl_uint numDevices = 15;
-    auto clAdapterId = context->getDevice(0)->getHardwareInfo().platform.usDeviceID;
-    auto d3dAdapterId = clAdapterId + 1;
-    mockSharingFcns->mockDxgiDesc.DeviceId = d3dAdapterId;
+    static_cast<WddmMock *>(context->getDevice(0)->getRootDeviceEnvironment().osInterface->get()->getWddm())->verifyAdapterLuidReturnValue = false;
 
-    EXPECT_NE(clAdapterId, d3dAdapterId);
     auto retVal = clGetDeviceIDsFromD3D11KHR(pPlatform, CL_D3D11_DEVICE_KHR, nullptr, CL_ALL_DEVICES_FOR_D3D11_KHR, 1, &deviceID, &numDevices);
 
     EXPECT_EQ(CL_DEVICE_NOT_FOUND, retVal);

opencl/test/unit_test/fixtures/d3d_test_fixture.h

@@ -93,6 +93,8 @@ class D3DTests : public PlatformFixture, public ::testing::Test {
     }
 
     void SetUp() override {
+        VariableBackup<UltHwConfig> backup(&ultHwConfig);
+        ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
         PlatformFixture::SetUp();
         rootDeviceIndex = pPlatform->getClDevice(0)->getRootDeviceIndex();
         context = new MockContext(pPlatform->getClDevice(0));

opencl/test/unit_test/mocks/mock_wddm.h

@@ -88,6 +88,7 @@ class WddmMock : public Wddm {
     uint64_t *getPagingFenceAddress() override;
     void waitOnPagingFenceFromCpu() override;
     void createPagingFenceLogger() override;
+    bool verifyAdapterLuid(LUID adapterLuid) const override { return verifyAdapterLuidReturnValue; }
 
     bool configureDeviceAddressSpace() {
         configureDeviceAddressSpaceResult.called++;
@@ -140,6 +141,7 @@ class WddmMock : public Wddm {
     WddmMockHelpers::CallResult waitOnPagingFenceFromCpuResult;
 
     NTSTATUS createAllocationStatus = STATUS_SUCCESS;
+    bool verifyAdapterLuidReturnValue = true;
     bool mapGpuVaStatus = true;
     bool callBaseDestroyAllocations = true;
     bool failOpenSharedHandle = false;

shared/source/os_interface/windows/wddm/wddm.cpp

@@ -902,6 +902,10 @@ PFND3DKMT_ESCAPE Wddm::getEscapeHandle() const {
     return getGdi()->escape;
 }
 
+bool Wddm::verifyAdapterLuid(LUID adapterLuid) const {
+    return adapterLuid.HighPart == hwDeviceId->getAdapterLuid().HighPart && adapterLuid.LowPart == hwDeviceId->getAdapterLuid().LowPart;
+}
+
 VOID *Wddm::registerTrimCallback(PFND3DKMT_TRIMNOTIFICATIONCALLBACK callback, WddmResidencyController &residencyController) {
     if (DebugManager.flags.DoNotRegisterTrimCallback.get()) {
         return nullptr;

shared/source/os_interface/windows/wddm/wddm.h

@@ -119,6 +119,7 @@ class Wddm {
     D3DKMT_HANDLE getPagingQueue() const { return pagingQueue; }
     D3DKMT_HANDLE getPagingQueueSyncObject() const { return pagingQueueSyncObject; }
     inline Gdi *getGdi() const { return hwDeviceId->getGdi(); }
+    MOCKABLE_VIRTUAL bool verifyAdapterLuid(LUID adapterLuid) const;
 
     PFND3DKMT_ESCAPE getEscapeHandle() const;