Fix clang-tidy issues

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-06-10 19:43:22 +00:00
committed by Compute-Runtime-Automation
parent 4d6d5ba90e
commit 67216047db
13 changed files with 44 additions and 43 deletions

View File

@ -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;

View File

@ -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);
}