From b7c0a1077b8ca6db73b458e47622790fa67bb014 Mon Sep 17 00:00:00 2001
From: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
Date: Thu, 19 Mar 2020 10:53:05 +0100
Subject: [PATCH] Add minor fixes in residency logging mocks

Change-Id: I4e37248ffdf61494ab8d3c63979a56ef0f97deb2
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
---
 opencl/test/unit_test/mocks/mock_wddm_residency_logger.h | 5 +----
 .../mocks/mock_wddm_residency_logger_functions.h         | 6 +++---
 .../test/unit_test/os_interface/windows/wddm20_tests.cpp | 9 +--------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/opencl/test/unit_test/mocks/mock_wddm_residency_logger.h b/opencl/test/unit_test/mocks/mock_wddm_residency_logger.h
index 44f093748b..15af044c6d 100644
--- a/opencl/test/unit_test/mocks/mock_wddm_residency_logger.h
+++ b/opencl/test/unit_test/mocks/mock_wddm_residency_logger.h
@@ -17,9 +17,6 @@ struct MockWddmResidencyLogger : public WddmResidencyLogger {
     using WddmResidencyLogger::pendingMakeResident;
     using WddmResidencyLogger::pendingTime;
     using WddmResidencyLogger::waitStartTime;
-
-    MockWddmResidencyLogger(D3DKMT_HANDLE device, VOID *fenceValueCpuVirtualAddress)
-        : WddmResidencyLogger(device, fenceValueCpuVirtualAddress) {
-    }
+    using WddmResidencyLogger::WddmResidencyLogger;
 };
 } // namespace NEO
diff --git a/opencl/test/unit_test/mocks/mock_wddm_residency_logger_functions.h b/opencl/test/unit_test/mocks/mock_wddm_residency_logger_functions.h
index 235d5b54bb..165e3bb3bd 100644
--- a/opencl/test/unit_test/mocks/mock_wddm_residency_logger_functions.h
+++ b/opencl/test/unit_test/mocks/mock_wddm_residency_logger_functions.h
@@ -14,17 +14,17 @@ extern uint32_t mockFopenCalled;
 extern uint32_t mockVfptrinfCalled;
 extern uint32_t mockFcloseCalled;
 
-FILE *mockFopen(const char *filename, const char *mode) {
+inline FILE *mockFopen(const char *filename, const char *mode) {
     mockFopenCalled++;
     return reinterpret_cast<FILE *>(0x40);
 }
 
-int mockVfptrinf(FILE *stream, const char *format, va_list arg) {
+inline int mockVfptrinf(FILE *stream, const char *format, va_list arg) {
     mockVfptrinfCalled++;
     return 0x10;
 }
 
-int mockFclose(FILE *stream) {
+inline int mockFclose(FILE *stream) {
     mockFcloseCalled++;
     return 0;
 }
diff --git a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
index 8049400f7d..3b6abfd433 100644
--- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
@@ -28,6 +28,7 @@
 #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "opencl/test/unit_test/mocks/mock_wddm_residency_logger.h"
+#include "opencl/test/unit_test/mocks/mock_wddm_residency_logger_functions.h"
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
 #include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h"
 #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h"
@@ -1281,14 +1282,6 @@ TEST(HwDeviceId, whenHwDeviceIdIsDestroyedThenAdapterIsClosed) {
     EXPECT_EQ(adapter, GdiWithMockedCloseFunc::closeAdapterCalledArgPassed);
 }
 
-namespace NEO {
-namespace ResLog {
-extern uint32_t mockFopenCalled;
-extern uint32_t mockVfptrinfCalled;
-extern uint32_t mockFcloseCalled;
-} // namespace ResLog
-} // namespace NEO
-
 TEST_F(WddmTest, WhenResidencyLoggingEnabledThenExpectLoggerCreated) {
     NEO::ResLog::mockFopenCalled = 0;
     NEO::ResLog::mockVfptrinfCalled = 0;