Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add minor fixes in residency logging mocks

Browse Source 
Change-Id: I4e37248ffdf61494ab8d3c63979a56ef0f97deb2
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2020-03-19 10:53:05 +01:00
committed by sys_ocldev
parent 13e053f538
commit b7c0a1077b
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opencl/test/unit_test/mocks/mock_wddm_residency_logger.h
View File

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

6
opencl/test/unit_test/mocks/mock_wddm_residency_logger_functions.h
View File

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

9
opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
View File

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