intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename member variables to camelCase

Browse Source 
Signed-off-by: Fabian Zwolinski <fabian.zwolinski@intel.com>
This commit is contained in:
Fabian Zwolinski
2023-04-26 10:13:07 +00:00
committed by Compute-Runtime-Automation
parent 5adc1816ff
commit c441e9e971
64 changed files with 1192 additions and 1192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
shared/test/common/os_interface/linux/device_command_stream_fixture.cpp
View File

@@ -43,12 +43,12 @@ void Ioctls::reset() {
}
void DrmMockCustom::testIoctls() {
if (this->ioctl_expected.total == -1)
if (this->ioctlExpected.total == -1)
return;
#define NEO_IOCTL_EXPECT_EQ(PARAM) \
if (this->ioctl_expected.PARAM >= 0) { \
EXPECT_EQ(this->ioctl_expected.PARAM, this->ioctl_cnt.PARAM); \
#define NEO_IOCTL_EXPECT_EQ(PARAM) \
if (this->ioctlExpected.PARAM >= 0) { \
EXPECT_EQ(this->ioctlExpected.PARAM, this->ioctlCnt.PARAM); \
}
NEO_IOCTL_EXPECT_EQ(execbuffer2);
NEO_IOCTL_EXPECT_EQ(gemUserptr);
@@ -71,7 +71,7 @@ void DrmMockCustom::testIoctls() {
}
int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
auto ext = ioctl_res_ext.load();
auto ext = ioctlResExt.load();
// store flags
switch (request) {
@@ -80,7 +80,7 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
this->execBuffer = *execbuf;
this->execBufferBufferObjects =
*reinterpret_cast<NEO::MockExecObject *>(this->execBuffer.getBuffersPtr());
ioctl_cnt.execbuffer2++;
ioctlCnt.execbuffer2++;
execBufferExtensions(execbuf);
} break;
@@ -88,34 +88,34 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
auto *userPtrParams = static_cast<NEO::GemUserPtr *>(arg);
userPtrParams->handle = returnHandle;
returnHandle++;
ioctl_cnt.gemUserptr++;
ioctlCnt.gemUserptr++;
} break;
case DrmIoctl::GemCreate: {
auto *createParams = static_cast<NEO::GemCreate *>(arg);
this->createParamsSize = createParams->size;
this->createParamsHandle = createParams->handle = 1u;
ioctl_cnt.gemCreate++;
ioctlCnt.gemCreate++;
} break;
case DrmIoctl::GemSetTiling: {
auto *setTilingParams = static_cast<NEO::GemSetTiling *>(arg);
setTilingMode = setTilingParams->tilingMode;
setTilingHandle = setTilingParams->handle;
setTilingStride = setTilingParams->stride;
ioctl_cnt.gemSetTiling++;
ioctlCnt.gemSetTiling++;
} break;
case DrmIoctl::GemGetTiling: {
auto *getTilingParams = static_cast<NEO::GemGetTiling *>(arg);
getTilingParams->tilingMode = getTilingModeOut;
getTilingHandleIn = getTilingParams->handle;
ioctl_cnt.gemGetTiling++;
ioctlCnt.gemGetTiling++;
} break;
case DrmIoctl::PrimeFdToHandle: {
auto *primeToHandleParams = static_cast<NEO::PrimeHandle *>(arg);
// return BO
primeToHandleParams->handle = outputHandle;
inputFd = primeToHandleParams->fileDescriptor;
ioctl_cnt.primeFdToHandle++;
ioctlCnt.primeFdToHandle++;
if (failOnPrimeFdToHandle == true) {
return -1;
}
@@ -129,32 +129,32 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
if (incrementOutputFdAfterCall) {
outputFd++;
}
ioctl_cnt.handleToPrimeFd++;
ioctlCnt.handleToPrimeFd++;
} break;
case DrmIoctl::GemSetDomain: {
auto setDomainParams = static_cast<NEO::GemSetDomain *>(arg);
setDomainHandle = setDomainParams->handle;
setDomainReadDomains = setDomainParams->readDomains;
setDomainWriteDomain = setDomainParams->writeDomain;
ioctl_cnt.gemSetDomain++;
ioctlCnt.gemSetDomain++;
} break;
case DrmIoctl::GemWait: {
auto gemWaitParams = static_cast<NEO::GemWait *>(arg);
gemWaitTimeout = gemWaitParams->timeoutNs;
ioctl_cnt.gemWait++;
ioctlCnt.gemWait++;
} break;
case DrmIoctl::GemClose:
ioctl_cnt.gemClose++;
ioctlCnt.gemClose++;
break;
case DrmIoctl::RegRead:
ioctl_cnt.regRead++;
ioctlCnt.regRead++;
break;
case DrmIoctl::Getparam: {
ioctl_cnt.contextGetParam++;
ioctlCnt.contextGetParam++;
auto getParam = static_cast<NEO::GetParam *>(arg);
recordedGetParam = *getParam;
*getParam->value = getParamRetValue;
@@ -164,7 +164,7 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
} break;
case DrmIoctl::GemContextGetparam: {
ioctl_cnt.contextGetParam++;
ioctlCnt.contextGetParam++;
auto getContextParam = static_cast<NEO::GemContextParam *>(arg);
recordedGetContextParam = *getContextParam;
getContextParam->value = getContextParamRetValue;
@@ -172,17 +172,17 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
case DrmIoctl::GemContextCreateExt: {
auto contextCreateParam = static_cast<NEO::GemContextCreateExt *>(arg);
contextCreateParam->contextId = ++ioctl_cnt.contextCreate;
contextCreateParam->contextId = ++ioctlCnt.contextCreate;
} break;
case DrmIoctl::GemContextDestroy: {
ioctl_cnt.contextDestroy++;
ioctlCnt.contextDestroy++;
} break;
case DrmIoctl::GemMmapOffset: {
auto mmapOffsetParams = reinterpret_cast<NEO::GemMmapOffset *>(arg);
mmapOffsetHandle = mmapOffsetParams->handle;
mmapOffsetParams->offset = mmapOffsetExpected;
mmapOffsetFlags = mmapOffsetParams->flags;
ioctl_cnt.gemMmapOffset++;
ioctlCnt.gemMmapOffset++;
if (failOnMmapOffset == true) {
return -1;
}
@@ -192,7 +192,7 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
createExtSize = createExtParams->size;
createExtHandle = createExtParams->handle;
createExtExtensions = createExtParams->extensions;
ioctl_cnt.gemCreateExt++;
ioctlCnt.gemCreateExt++;
} break;
case DrmIoctl::GemVmBind: {
} break;
@@ -210,20 +210,20 @@ int DrmMockCustom::ioctl(DrmIoctl request, void *arg) {
}
}
if (!ext->no.empty() && std::find(ext->no.begin(), ext->no.end(), ioctl_cnt.total.load()) != ext->no.end()) {
ioctl_cnt.total.fetch_add(1);
if (!ext->no.empty() && std::find(ext->no.begin(), ext->no.end(), ioctlCnt.total.load()) != ext->no.end()) {
ioctlCnt.total.fetch_add(1);
return ext->res;
}
ioctl_cnt.total.fetch_add(1);
return ioctl_res.load();
ioctlCnt.total.fetch_add(1);
return ioctlRes.load();
}
DrmMockCustom::DrmMockCustom(RootDeviceEnvironment &rootDeviceEnvironment)
: Drm(std::make_unique<HwDeviceIdDrm>(mockFd, mockPciPath), rootDeviceEnvironment) {
reset();
auto &gfxCoreHelper = rootDeviceEnvironment.getHelper<NEO::GfxCoreHelper>();
ioctl_expected.contextCreate = static_cast<int>(gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment).size());
ioctl_expected.contextDestroy = ioctl_expected.contextCreate.load();
ioctlExpected.contextCreate = static_cast<int>(gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment).size());
ioctlExpected.contextDestroy = ioctlExpected.contextCreate.load();
setupIoctlHelper(rootDeviceEnvironment.getHardwareInfo()->platform.eProductFamily);
createVirtualMemoryAddressSpace(NEO::GfxCoreHelper::getSubDevicesCount(rootDeviceEnvironment.getHardwareInfo()));
isVmBindAvailable(); // NOLINT(clang-analyzer-optin.cplusplus.VirtualCall)

18
shared/test/common/os_interface/linux/device_command_stream_fixture.h
View File

@@ -146,26 +146,26 @@ class DrmMockCustom : public Drm {
}
void reset() {
ioctl_res = 0;
ioctl_cnt.reset();
ioctl_expected.reset();
ioctl_res_ext = &NONE;
ioctlRes = 0;
ioctlCnt.reset();
ioctlExpected.reset();
ioctlResExt = &none;
}
virtual void execBufferExtensions(void *execbuf) {
}
Ioctls ioctl_cnt{};
Ioctls ioctl_expected{};
Ioctls ioctlCnt{};
Ioctls ioctlExpected{};
IoctlResExt NONE = {-1, 0};
IoctlResExt none = {-1, 0};
WaitUserFenceCall waitUserFenceCall{};
IsVmBindAvailableCall getSetPairAvailableCall{};
IsVmBindAvailableCall isVmBindAvailableCall{};
std::atomic<int> ioctl_res;
std::atomic<IoctlResExt *> ioctl_res_ext;
std::atomic<int> ioctlRes;
std::atomic<IoctlResExt *> ioctlResExt;
// DRM_IOCTL_I915_GEM_EXECBUFFER2
NEO::MockExecBuffer execBuffer{};

6
shared/test/common/os_interface/linux/drm_buffer_object_fixture.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 Intel Corporation
* Copyright (C) 2022-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -86,8 +86,8 @@ class DrmBufferObjectFixture {
void tearDown() {
delete bo;
if (this->mock->ioctl_expected.total >= 0) {
EXPECT_EQ(this->mock->ioctl_expected.total, this->mock->ioctl_cnt.total);
if (this->mock->ioctlExpected.total >= 0) {
EXPECT_EQ(this->mock->ioctlExpected.total, this->mock->ioctlCnt.total);
}
mock->reset();
osContext.reset(nullptr);

22
shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp
View File

@@ -76,25 +76,25 @@ void DrmMemoryManagerFixture::tearDown() {
int enginesCount = static_cast<int>(device->getMemoryManager()->getRegisteredEnginesCount());
mock->ioctl_expected.contextDestroy = enginesCount;
mock->ioctl_expected.gemClose = enginesCount;
mock->ioctl_expected.gemWait = enginesCount;
mock->ioctlExpected.contextDestroy = enginesCount;
mock->ioctlExpected.gemClose = enginesCount;
mock->ioctlExpected.gemWait = enginesCount;
auto csr = static_cast<TestedDrmCommandStreamReceiver<DEFAULT_TEST_FAMILY_NAME> *>(device->getDefaultEngine().commandStreamReceiver);
if (csr->globalFenceAllocation) {
mock->ioctl_expected.gemClose += enginesCount;
mock->ioctl_expected.gemWait += enginesCount;
mock->ioctlExpected.gemClose += enginesCount;
mock->ioctlExpected.gemWait += enginesCount;
}
if (csr->getPreemptionAllocation()) {
mock->ioctl_expected.gemClose += enginesCount;
mock->ioctl_expected.gemWait += enginesCount;
mock->ioctlExpected.gemClose += enginesCount;
mock->ioctlExpected.gemWait += enginesCount;
}
if (csr->getKernelArgsBufferAllocation()) {
mock->ioctl_expected.gemClose += enginesCount;
mock->ioctl_expected.gemWait += enginesCount;
mock->ioctlExpected.gemClose += enginesCount;
mock->ioctlExpected.gemWait += enginesCount;
}
mock->ioctl_expected.gemWait += additionalDestroyDeviceIoctls.gemWait.load();
mock->ioctl_expected.gemClose += additionalDestroyDeviceIoctls.gemClose.load();
mock->ioctlExpected.gemWait += additionalDestroyDeviceIoctls.gemWait.load();
mock->ioctlExpected.gemClose += additionalDestroyDeviceIoctls.gemClose.load();
delete device;
if (dontTestIoctlInTearDown) {
mock->reset();