From 28319a8e81ccf1eab8f21ff1b8bce0dba5fd3e87 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 2 Jan 2023 08:41:11 +0000 Subject: [PATCH] Refactor: don't pass redundant hw info to applyAdditionalContextFlags Wddm already contains reference to root device environment Related-To: NEO-6853 Signed-off-by: Mateusz Jablonski --- shared/source/os_interface/windows/wddm/wddm.cpp | 5 ++--- shared/source/os_interface/windows/wddm/wddm.h | 4 ++-- .../os_interface/windows/wddm_additional_context_flags.cpp | 4 ++-- shared/test/common/mocks/mock_wddm.cpp | 6 +++--- shared/test/common/mocks/mock_wddm.h | 4 ++-- shared/test/common/os_interface/linux/sys_calls_win.cpp | 4 ++-- .../test/common/os_interface/windows/ult_dxcore_factory.cpp | 6 +++--- .../test/common/os_interface/windows/ult_dxcore_factory.h | 6 +++--- shared/test/common/os_interface/windows/wddm_calls.cpp | 6 +++--- 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp index 237778a15d..e8b58ff82e 100644 --- a/shared/source/os_interface/windows/wddm/wddm.cpp +++ b/shared/source/os_interface/windows/wddm/wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -918,8 +918,7 @@ bool Wddm::createContext(OsContextWin &osContext) { privateData.pHwContextId = &hwContextId; privateData.NoRingFlushes = DebugManager.flags.UseNoRingFlushesKmdMode.get(); - auto &rootDeviceEnvironment = this->getRootDeviceEnvironment(); - applyAdditionalContextFlags(privateData, osContext, *rootDeviceEnvironment.getHardwareInfo()); + applyAdditionalContextFlags(privateData, osContext); createContext.EngineAffinity = 0; createContext.Flags.NullRendering = static_cast(DebugManager.flags.EnableNullHardware.get()); diff --git a/shared/source/os_interface/windows/wddm/wddm.h b/shared/source/os_interface/windows/wddm/wddm.h index 38e60d532c..d66116b1fa 100644 --- a/shared/source/os_interface/windows/wddm/wddm.h +++ b/shared/source/os_interface/windows/wddm/wddm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -66,7 +66,7 @@ class Wddm : public DriverModel { bool mapGpuVirtualAddress(AllocationStorageData *allocationStorageData); MOCKABLE_VIRTUAL D3DGPU_VIRTUAL_ADDRESS reserveGpuVirtualAddress(D3DGPU_VIRTUAL_ADDRESS baseAddress, D3DGPU_VIRTUAL_ADDRESS minimumAddress, D3DGPU_VIRTUAL_ADDRESS maximumAddress, D3DGPU_SIZE_T size); MOCKABLE_VIRTUAL bool createContext(OsContextWin &osContext); - MOCKABLE_VIRTUAL void applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext, const HardwareInfo &hwInfo); + MOCKABLE_VIRTUAL void applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext); MOCKABLE_VIRTUAL void applyAdditionalMapGPUVAFields(D3DDDI_MAPGPUVIRTUALADDRESS &mapGPUVA, Gmm *gmm); MOCKABLE_VIRTUAL bool freeGpuVirtualAddress(D3DGPU_VIRTUAL_ADDRESS &gpuPtr, uint64_t size); MOCKABLE_VIRTUAL NTSTATUS createAllocation(const void *alignedCpuPtr, const Gmm *gmm, D3DKMT_HANDLE &outHandle, D3DKMT_HANDLE &outResourceHandle, uint64_t *outSharedHandle); diff --git a/shared/source/os_interface/windows/wddm_additional_context_flags.cpp b/shared/source/os_interface/windows/wddm_additional_context_flags.cpp index f7ed17d9a6..69c39d3823 100644 --- a/shared/source/os_interface/windows/wddm_additional_context_flags.cpp +++ b/shared/source/os_interface/windows/wddm_additional_context_flags.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "shared/source/os_interface/windows/wddm/wddm.h" namespace NEO { -void Wddm::applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext, const HardwareInfo &hwInfo) { +void Wddm::applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext) { } } // namespace NEO diff --git a/shared/test/common/mocks/mock_wddm.cpp b/shared/test/common/mocks/mock_wddm.cpp index a71f8231d2..0d428b11e5 100644 --- a/shared/test/common/mocks/mock_wddm.cpp +++ b/shared/test/common/mocks/mock_wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -170,9 +170,9 @@ bool WddmMock::createContext(OsContextWin &osContext) { return createContextResult.success = Wddm::createContext(osContext); } -void WddmMock::applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext, const HardwareInfo &hwInfo) { +void WddmMock::applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext) { applyAdditionalContextFlagsResult.called++; - Wddm::applyAdditionalContextFlags(privateData, osContext, hwInfo); + Wddm::applyAdditionalContextFlags(privateData, osContext); } bool WddmMock::destroyContext(D3DKMT_HANDLE context) { diff --git a/shared/test/common/mocks/mock_wddm.h b/shared/test/common/mocks/mock_wddm.h index 1835555613..b63afd5a1a 100644 --- a/shared/test/common/mocks/mock_wddm.h +++ b/shared/test/common/mocks/mock_wddm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -71,7 +71,7 @@ class WddmMock : public Wddm { bool destroyAllocation(WddmAllocation *alloc, OsContextWin *osContext); bool openSharedHandle(D3DKMT_HANDLE handle, WddmAllocation *alloc) override; bool createContext(OsContextWin &osContext) override; - void applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext, const HardwareInfo &hwInfo) override; + void applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext) override; bool destroyContext(D3DKMT_HANDLE context) override; bool queryAdapterInfo() override; bool submit(uint64_t commandBuffer, size_t size, void *commandHeader, WddmSubmitArguments &submitArguments) override; diff --git a/shared/test/common/os_interface/linux/sys_calls_win.cpp b/shared/test/common/os_interface/linux/sys_calls_win.cpp index af18c43475..035681f82a 100644 --- a/shared/test/common/os_interface/linux/sys_calls_win.cpp +++ b/shared/test/common/os_interface/linux/sys_calls_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,7 +30,7 @@ Wddm::CreateDXGIFactoryFcn getCreateDxgiFactory() { } Wddm::DXCoreCreateAdapterFactoryFcn getDXCoreCreateAdapterFactory() { - return ULTDXCoreCreateAdapterFactory; + return ultDxCoreCreateAdapterFactory; } Wddm::GetSystemInfoFcn getGetSystemInfo() { diff --git a/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp b/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp index c8bcafe2de..6beec48ba7 100644 --- a/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp +++ b/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,12 +11,12 @@ namespace NEO { -HRESULT WINAPI ULTDXCoreCreateAdapterFactory(REFIID riid, void **ppFactory) { +HRESULT WINAPI ultDxCoreCreateAdapterFactory(REFIID riid, void **ppFactory) { *reinterpret_cast(ppFactory) = new UltDXCoreAdapterFactory; return S_OK; } -void WINAPI ULTGetSystemInfo(SYSTEM_INFO *pSystemInfo) { +void WINAPI ultGetSystemInfo(SYSTEM_INFO *pSystemInfo) { #ifdef _WIN32 pSystemInfo->lpMaximumApplicationAddress = is32bit ? (LPVOID)MemoryConstants::max32BitAppAddress : (LPVOID)MemoryConstants::max64BitAppAddress; #endif diff --git a/shared/test/common/os_interface/windows/ult_dxcore_factory.h b/shared/test/common/os_interface/windows/ult_dxcore_factory.h index 6c170821e3..564b3bc8fa 100644 --- a/shared/test/common/os_interface/windows/ult_dxcore_factory.h +++ b/shared/test/common/os_interface/windows/ult_dxcore_factory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -284,7 +284,7 @@ class UltDXCoreAdapterFactory : public IDXCoreAdapterFactory { } }; -HRESULT WINAPI ULTDXCoreCreateAdapterFactory(REFIID riid, void **ppFactory); -void WINAPI ULTGetSystemInfo(SYSTEM_INFO *pSystemInfo); +HRESULT WINAPI ultDxCoreCreateAdapterFactory(REFIID riid, void **ppFactory); +void WINAPI ultGetSystemInfo(SYSTEM_INFO *pSystemInfo); } // namespace NEO diff --git a/shared/test/common/os_interface/windows/wddm_calls.cpp b/shared/test/common/os_interface/windows/wddm_calls.cpp index 047783aabe..a94184d33f 100644 --- a/shared/test/common/os_interface/windows/wddm_calls.cpp +++ b/shared/test/common/os_interface/windows/wddm_calls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,10 +16,10 @@ Wddm::CreateDXGIFactoryFcn getCreateDxgiFactory() { } Wddm::DXCoreCreateAdapterFactoryFcn getDXCoreCreateAdapterFactory() { - return ULTDXCoreCreateAdapterFactory; + return ultDxCoreCreateAdapterFactory; } Wddm::GetSystemInfoFcn getGetSystemInfo() { - return ULTGetSystemInfo; + return ultGetSystemInfo; } } // namespace NEO