From 67216047db953a461776e8560dc6afeda8d2967c Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 10 Jun 2021 19:43:22 +0000 Subject: [PATCH] Fix clang-tidy issues Signed-off-by: Mateusz Jablonski --- opencl/test/unit_test/mocks/mock_gmm_memory_base.h | 10 +++++----- .../os_interface/windows/mock_kmdaf_listener.h | 14 +++++++------- .../windows/wddm_kmdaf_listener_tests.cpp | 6 +++--- ..._configure_device_address_space_drm_or_wddm.cpp | 4 ++-- .../gmm_configure_device_address_space_wddm.cpp | 8 ++++---- .../source/gmm_helper/windows/gmm_memory_base.cpp | 6 +++--- shared/source/gmm_helper/windows/gmm_memory_base.h | 10 +++++----- .../os_interface/windows/hw_device_id_win.cpp | 2 +- .../source/os_interface/windows/kmdaf_listener.cpp | 8 ++++---- .../source/os_interface/windows/kmdaf_listener.h | 4 ++-- .../os_interface/windows/kmdaf_listener_stub.cpp | 4 ++-- .../windows/wddm/adapter_factory_dxcore.cpp | 2 +- .../windows/wddm_residency_controller.cpp | 9 +++++---- 13 files changed, 44 insertions(+), 43 deletions(-) diff --git a/opencl/test/unit_test/mocks/mock_gmm_memory_base.h b/opencl/test/unit_test/mocks/mock_gmm_memory_base.h index 42b7696801..542152093e 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_memory_base.h +++ b/opencl/test/unit_test/mocks/mock_gmm_memory_base.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,8 +22,8 @@ class MockGmmMemoryBase : public GmmMemory { bool configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter, GMM_ESCAPE_HANDLE hDevice, GMM_ESCAPE_FUNC_TYPE pfnEscape, - GMM_GFX_SIZE_T SvmSize, - BOOLEAN BDWL3Coherency) override { + GMM_GFX_SIZE_T svmSize, + BOOLEAN bdwL3Coherency) override { return true; } @@ -67,7 +67,7 @@ class GmockGmmMemoryBase : public GmmMemory { bool(GMM_ESCAPE_HANDLE hAdapter, GMM_ESCAPE_HANDLE hDevice, GMM_ESCAPE_FUNC_TYPE pfnEscape, - GMM_GFX_SIZE_T SvmSize, - BOOLEAN BDWL3Coherency)); + GMM_GFX_SIZE_T svmSize, + BOOLEAN bdwL3Coherency)); }; } // namespace NEO diff --git a/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h b/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h index 5c8947fa2b..7cb5782bd4 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h +++ b/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,20 +30,20 @@ struct KmDafListenerMock : public KmDafListener { notifyUnlockParametrization.pfnEscape = pfnEscape; } - inline void notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) override { + inline void notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) override { notifyMapGpuVAParametrization.ftrKmdDaf = ftrKmdDaf; notifyMapGpuVAParametrization.hAdapter = hAdapter; notifyMapGpuVAParametrization.hDevice = hDevice; notifyMapGpuVAParametrization.hAllocation = hAllocation; - notifyMapGpuVAParametrization.GpuVirtualAddress = GpuVirtualAddress; + notifyMapGpuVAParametrization.gpuVirtualAddress = gpuVirtualAddress; notifyMapGpuVAParametrization.pfnEscape = pfnEscape; } - inline void notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) override { + inline void notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) override { notifyUnmapGpuVAParametrization.ftrKmdDaf = ftrKmdDaf; notifyUnmapGpuVAParametrization.hAdapter = hAdapter; notifyUnmapGpuVAParametrization.hDevice = hDevice; - notifyUnmapGpuVAParametrization.GpuVirtualAddress = GpuVirtualAddress; + notifyUnmapGpuVAParametrization.gpuVirtualAddress = gpuVirtualAddress; notifyUnmapGpuVAParametrization.pfnEscape = pfnEscape; } @@ -96,7 +96,7 @@ struct KmDafListenerMock : public KmDafListener { D3DKMT_HANDLE hAdapter = 0; D3DKMT_HANDLE hDevice = 0; D3DKMT_HANDLE hAllocation = 0; - D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress = 0; + D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress = 0; PFND3DKMT_ESCAPE pfnEscape = nullptr; } notifyMapGpuVAParametrization; @@ -104,7 +104,7 @@ struct KmDafListenerMock : public KmDafListener { bool ftrKmdDaf = false; D3DKMT_HANDLE hAdapter = 0; D3DKMT_HANDLE hDevice = 0; - D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress = 0; + D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress = 0; PFND3DKMT_ESCAPE pfnEscape = nullptr; } notifyUnmapGpuVAParametrization; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp index 47aa4bc9f5..16585ca797 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -93,7 +93,7 @@ TEST_F(WddmKmDafListenerTest, givenWddmWhenMapGpuVirtualAddressIsCalledThenKmDaf EXPECT_EQ(wddmWithKmDafMock->getAdapter(), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.hAdapter); EXPECT_EQ(wddmWithKmDafMock->getDeviceHandle(), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.hDevice); EXPECT_EQ(ALLOCATION_HANDLE, wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.hAllocation); - EXPECT_EQ(GmmHelper::decanonize(gpuPtr), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.GpuVirtualAddress); + EXPECT_EQ(GmmHelper::decanonize(gpuPtr), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.gpuVirtualAddress); EXPECT_EQ(wddmWithKmDafMock->getGdi()->escape, wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.pfnEscape); } @@ -105,7 +105,7 @@ TEST_F(WddmKmDafListenerTest, givenWddmWhenFreeGpuVirtualAddressIsCalledThenKmDa EXPECT_EQ(wddmWithKmDafMock->featureTable->ftrKmdDaf, wddmWithKmDafMock->getKmDafListenerMock().notifyUnmapGpuVAParametrization.ftrKmdDaf); EXPECT_EQ(wddmWithKmDafMock->getAdapter(), wddmWithKmDafMock->getKmDafListenerMock().notifyUnmapGpuVAParametrization.hAdapter); EXPECT_EQ(wddmWithKmDafMock->getDeviceHandle(), wddmWithKmDafMock->getKmDafListenerMock().notifyUnmapGpuVAParametrization.hDevice); - EXPECT_EQ(GPUVA, wddmWithKmDafMock->getKmDafListenerMock().notifyUnmapGpuVAParametrization.GpuVirtualAddress); + EXPECT_EQ(GPUVA, wddmWithKmDafMock->getKmDafListenerMock().notifyUnmapGpuVAParametrization.gpuVirtualAddress); EXPECT_EQ(wddmWithKmDafMock->getGdi()->escape, wddmWithKmDafMock->getKmDafListenerMock().notifyUnmapGpuVAParametrization.pfnEscape); } @@ -184,7 +184,7 @@ TEST_F(WddmKmDafListenerTest, givenWddmWhenCreateAllocationsAndMapGpuVaIsCalledT EXPECT_EQ(wddmWithKmDafMock->getAdapter(), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.hAdapter); EXPECT_EQ(wddmWithKmDafMock->getDeviceHandle(), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.hDevice); EXPECT_EQ(osHandle.handle, wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.hAllocation); - EXPECT_EQ(GmmHelper::decanonize(osHandle.gpuPtr), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.GpuVirtualAddress); + EXPECT_EQ(GmmHelper::decanonize(osHandle.gpuPtr), wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.gpuVirtualAddress); EXPECT_EQ(wddmWithKmDafMock->getGdi()->escape, wddmWithKmDafMock->getKmDafListenerMock().notifyMapGpuVAParametrization.pfnEscape); } diff --git a/shared/source/gmm_helper/windows/gmm_configure_device_address_space_drm_or_wddm.cpp b/shared/source/gmm_helper/windows/gmm_configure_device_address_space_drm_or_wddm.cpp index 9baed942d4..638a2dbbe0 100644 --- a/shared/source/gmm_helper/windows/gmm_configure_device_address_space_drm_or_wddm.cpp +++ b/shared/source/gmm_helper/windows/gmm_configure_device_address_space_drm_or_wddm.cpp @@ -16,8 +16,8 @@ namespace NEO { bool GmmMemoryBase::configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter, GMM_ESCAPE_HANDLE hDevice, GMM_ESCAPE_FUNC_TYPE pfnEscape, - GMM_GFX_SIZE_T SvmSize, - BOOLEAN BDWL3Coherency) { + GMM_GFX_SIZE_T svmSize, + BOOLEAN bdwL3Coherency) { return true; } diff --git a/shared/source/gmm_helper/windows/gmm_configure_device_address_space_wddm.cpp b/shared/source/gmm_helper/windows/gmm_configure_device_address_space_wddm.cpp index 769058fc2d..c5690bae9d 100644 --- a/shared/source/gmm_helper/windows/gmm_configure_device_address_space_wddm.cpp +++ b/shared/source/gmm_helper/windows/gmm_configure_device_address_space_wddm.cpp @@ -16,16 +16,16 @@ namespace NEO { bool GmmMemoryBase::configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter, GMM_ESCAPE_HANDLE hDevice, GMM_ESCAPE_FUNC_TYPE pfnEscape, - GMM_GFX_SIZE_T SvmSize, - BOOLEAN BDWL3Coherency) { + GMM_GFX_SIZE_T svmSize, + BOOLEAN bdwL3Coherency) { return clientContext.ConfigureDeviceAddressSpace( {hAdapter}, {hDevice}, {pfnEscape}, - SvmSize, + svmSize, 0, 0, - BDWL3Coherency, + bdwL3Coherency, 0, 0) != 0; } diff --git a/shared/source/gmm_helper/windows/gmm_memory_base.cpp b/shared/source/gmm_helper/windows/gmm_memory_base.cpp index 9d5d776aa3..997864c270 100644 --- a/shared/source/gmm_helper/windows/gmm_memory_base.cpp +++ b/shared/source/gmm_helper/windows/gmm_memory_base.cpp @@ -19,12 +19,12 @@ GmmMemoryBase::GmmMemoryBase(GmmClientContext *gmmClientContext) : clientContext bool GmmMemoryBase::configureDevice(GMM_ESCAPE_HANDLE hAdapter, GMM_ESCAPE_HANDLE hDevice, GMM_ESCAPE_FUNC_TYPE pfnEscape, - GMM_GFX_SIZE_T SvmSize, - BOOLEAN BDWL3Coherency, + GMM_GFX_SIZE_T svmSize, + BOOLEAN bdwL3Coherency, uintptr_t &minAddress, bool obtainMinAddress) { minAddress = windowsMinAddress; - auto retVal = configureDeviceAddressSpace(hAdapter, hDevice, pfnEscape, SvmSize, BDWL3Coherency); + auto retVal = configureDeviceAddressSpace(hAdapter, hDevice, pfnEscape, svmSize, bdwL3Coherency); if (obtainMinAddress) { minAddress = getInternalGpuVaRangeLimit(); } diff --git a/shared/source/gmm_helper/windows/gmm_memory_base.h b/shared/source/gmm_helper/windows/gmm_memory_base.h index 9192cea451..188f96aa1b 100644 --- a/shared/source/gmm_helper/windows/gmm_memory_base.h +++ b/shared/source/gmm_helper/windows/gmm_memory_base.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,14 +19,14 @@ class GmmMemoryBase { MOCKABLE_VIRTUAL bool configureDeviceAddressSpace(GMM_ESCAPE_HANDLE hAdapter, GMM_ESCAPE_HANDLE hDevice, GMM_ESCAPE_FUNC_TYPE pfnEscape, - GMM_GFX_SIZE_T SvmSize, - BOOLEAN BDWL3Coherency); + GMM_GFX_SIZE_T svmSize, + BOOLEAN bdwL3Coherency); bool configureDevice(GMM_ESCAPE_HANDLE hAdapter, GMM_ESCAPE_HANDLE hDevice, GMM_ESCAPE_FUNC_TYPE pfnEscape, - GMM_GFX_SIZE_T SvmSize, - BOOLEAN BDWL3Coherency, + GMM_GFX_SIZE_T svmSize, + BOOLEAN bdwL3Coherency, uintptr_t &minAddress, bool obtainMinAddress); diff --git a/shared/source/os_interface/windows/hw_device_id_win.cpp b/shared/source/os_interface/windows/hw_device_id_win.cpp index 81d1d88ac7..c8b8ef851f 100644 --- a/shared/source/os_interface/windows/hw_device_id_win.cpp +++ b/shared/source/os_interface/windows/hw_device_id_win.cpp @@ -12,7 +12,7 @@ namespace NEO { HwDeviceIdWddm::~HwDeviceIdWddm() { - NTSTATUS status = STATUS_UNSUCCESSFUL; + [[maybe_unused]] NTSTATUS status = STATUS_UNSUCCESSFUL; D3DKMT_CLOSEADAPTER CloseAdapter = {0}; CloseAdapter.hAdapter = adapter; status = static_cast(osEnvironment)->gdi->closeAdapter(&CloseAdapter); diff --git a/shared/source/os_interface/windows/kmdaf_listener.cpp b/shared/source/os_interface/windows/kmdaf_listener.cpp index 48c392c292..cc19015e34 100644 --- a/shared/source/os_interface/windows/kmdaf_listener.cpp +++ b/shared/source/os_interface/windows/kmdaf_listener.cpp @@ -21,12 +21,12 @@ void KmDafListener::notifyUnlock(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_ KM_DAF_NOTIFY_UNLOCK(ftrKmdDaf, hAdapter, hDevice, phAllocation, allocations, pfnEscape); } -void KmDafListener::notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { - KM_DAF_NOTIFY_MAP_GPUVA(ftrKmdDaf, hAdapter, hDevice, hAllocation, GpuVirtualAddress, pfnEscape); +void KmDafListener::notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { + KM_DAF_NOTIFY_MAP_GPUVA(ftrKmdDaf, hAdapter, hDevice, hAllocation, gpuVirtualAddress, pfnEscape); } -void KmDafListener::notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { - KM_DAF_NOTIFY_UNMAP_GPUVA(ftrKmdDaf, hAdapter, hDevice, GpuVirtualAddress, pfnEscape); +void KmDafListener::notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { + KM_DAF_NOTIFY_UNMAP_GPUVA(ftrKmdDaf, hAdapter, hDevice, gpuVirtualAddress, pfnEscape); } void KmDafListener::notifyMakeResident(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE *phAllocation, ULONG allocations, PFND3DKMT_ESCAPE pfnEscape) { diff --git a/shared/source/os_interface/windows/kmdaf_listener.h b/shared/source/os_interface/windows/kmdaf_listener.h index b9d6b1d64d..4feae5c77f 100644 --- a/shared/source/os_interface/windows/kmdaf_listener.h +++ b/shared/source/os_interface/windows/kmdaf_listener.h @@ -18,9 +18,9 @@ struct KmDafListener { MOCKABLE_VIRTUAL void notifyUnlock(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE *phAllocation, ULONG allocations, PFND3DKMT_ESCAPE pfnEscape); - MOCKABLE_VIRTUAL void notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape); + MOCKABLE_VIRTUAL void notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape); - MOCKABLE_VIRTUAL void notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape); + MOCKABLE_VIRTUAL void notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape); MOCKABLE_VIRTUAL void notifyMakeResident(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE *phAllocation, ULONG allocations, PFND3DKMT_ESCAPE pfnEscape); diff --git a/shared/source/os_interface/windows/kmdaf_listener_stub.cpp b/shared/source/os_interface/windows/kmdaf_listener_stub.cpp index eb3a170a32..70932a4c2d 100644 --- a/shared/source/os_interface/windows/kmdaf_listener_stub.cpp +++ b/shared/source/os_interface/windows/kmdaf_listener_stub.cpp @@ -15,10 +15,10 @@ void KmDafListener::notifyLock(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HA void KmDafListener::notifyUnlock(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE *phAllocation, ULONG allocations, PFND3DKMT_ESCAPE pfnEscape) { } -void KmDafListener::notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { +void KmDafListener::notifyMapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { } -void KmDafListener::notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS GpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { +void KmDafListener::notifyUnmapGpuVA(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, D3DGPU_VIRTUAL_ADDRESS gpuVirtualAddress, PFND3DKMT_ESCAPE pfnEscape) { } void KmDafListener::notifyMakeResident(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE *phAllocation, ULONG allocations, PFND3DKMT_ESCAPE pfnEscape) { diff --git a/shared/source/os_interface/windows/wddm/adapter_factory_dxcore.cpp b/shared/source/os_interface/windows/wddm/adapter_factory_dxcore.cpp index 029d442356..20485c7a94 100644 --- a/shared/source/os_interface/windows/wddm/adapter_factory_dxcore.cpp +++ b/shared/source/os_interface/windows/wddm/adapter_factory_dxcore.cpp @@ -76,7 +76,7 @@ bool DxCoreAdapterFactory::getAdapterDesc(uint32_t ordinal, AdapterDesc &outAdap } IDXCoreAdapter *adapter = nullptr; - HRESULT hr = adaptersInSnapshot->GetAdapter(ordinal, __uuidof(adapter), (void **)&adapter); + [[maybe_unused]] HRESULT hr = adaptersInSnapshot->GetAdapter(ordinal, __uuidof(adapter), (void **)&adapter); if ((hr != S_OK) || (adapter == nullptr)) { return false; } diff --git a/shared/source/os_interface/windows/wddm_residency_controller.cpp b/shared/source/os_interface/windows/wddm_residency_controller.cpp index 24314939a6..4565c8849b 100644 --- a/shared/source/os_interface/windows/wddm_residency_controller.cpp +++ b/shared/source/os_interface/windows/wddm_residency_controller.cpp @@ -194,12 +194,13 @@ bool WddmResidencyController::makeResidentResidencyAllocations(const ResidencyCo DBG_LOG(ResidencyDebugEnable, "Residency:", __FUNCTION__, "allocation =", allocation, residencyData.resident[osContextId] ? "resident" : "not resident"); - UNRECOVERABLE_IF(allocation->fragmentsStorage.fragmentCount > maxFragments); + const auto fragmentCount = allocation->fragmentsStorage.fragmentCount; + UNRECOVERABLE_IF(fragmentCount > maxFragments); if (allocation->getTrimCandidateListPosition(this->osContextId) != trimListUnusedPosition) { DBG_LOG(ResidencyDebugEnable, "Residency:", __FUNCTION__, "allocation =", allocation, "on trimCandidateList"); this->removeFromTrimCandidateList(allocation, false); } else { - for (uint32_t allocationId = 0; allocationId < allocation->fragmentsStorage.fragmentCount; allocationId++) { + for (uint32_t allocationId = 0; allocationId < fragmentCount; allocationId++) { fragmentResidency[allocationId] = allocation->fragmentsStorage.fragmentStorageData[allocationId].residency->resident[osContextId]; DBG_LOG(ResidencyDebugEnable, "Residency:", __FUNCTION__, "fragment handle =", static_cast(allocation->fragmentsStorage.fragmentStorageData[allocationId].osHandleStorage)->handle, @@ -207,8 +208,8 @@ bool WddmResidencyController::makeResidentResidencyAllocations(const ResidencyCo } } - if (allocation->fragmentsStorage.fragmentCount > 0) { - for (uint32_t allocationId = 0; allocationId < allocation->fragmentsStorage.fragmentCount; allocationId++) { + if (fragmentCount > 0) { + for (uint32_t allocationId = 0; allocationId < fragmentCount; allocationId++) { if (!fragmentResidency[allocationId]) { handlesForResidency.push_back(static_cast(allocation->fragmentsStorage.fragmentStorageData[allocationId].osHandleStorage)->handle); totalHandlesCount++;