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

refactor: correct naming of DrmIoctl enums

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2023-12-12 08:48:32 +00:00
committed by Compute-Runtime-Automation
parent 9121209c41
commit cff6c81be0
35 changed files with 617 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
opencl/test/unit_test/linux/main_linux_dll.cpp
View File

@@ -251,9 +251,9 @@ TEST_F(DrmSimpleTests, givenPrintIoctlTimesWhenCallIoctlThenStatisticsAreGathere
drm->setLowPriorityContextParam(contextId);
EXPECT_EQ(2u, drm->ioctlStatistics.size());
auto euTotalData = drm->ioctlStatistics.find(DrmIoctl::Getparam);
auto euTotalData = drm->ioctlStatistics.find(DrmIoctl::getparam);
ASSERT_TRUE(euTotalData != drm->ioctlStatistics.end());
EXPECT_EQ(DrmIoctl::Getparam, euTotalData->first);
EXPECT_EQ(DrmIoctl::getparam, euTotalData->first);
EXPECT_EQ(2u, euTotalData->second.count);
EXPECT_NE(0, euTotalData->second.totalTime);
EXPECT_NE(initialMin, euTotalData->second.minTime);
@@ -263,9 +263,9 @@ TEST_F(DrmSimpleTests, givenPrintIoctlTimesWhenCallIoctlThenStatisticsAreGathere
EXPECT_NE(initialMax, euTotalData->second.maxTime);
auto firstTime = euTotalData->second.totalTime;
auto lowPriorityData = drm->ioctlStatistics.find(DrmIoctl::GemContextSetparam);
auto lowPriorityData = drm->ioctlStatistics.find(DrmIoctl::gemContextSetparam);
ASSERT_TRUE(lowPriorityData != drm->ioctlStatistics.end());
EXPECT_EQ(DrmIoctl::GemContextSetparam, lowPriorityData->first);
EXPECT_EQ(DrmIoctl::gemContextSetparam, lowPriorityData->first);
EXPECT_EQ(1u, lowPriorityData->second.count);
EXPECT_NE(0, lowPriorityData->second.totalTime);
EXPECT_NE(initialMin, lowPriorityData->second.minTime);
@@ -276,39 +276,39 @@ TEST_F(DrmSimpleTests, givenPrintIoctlTimesWhenCallIoctlThenStatisticsAreGathere
drm->getEuTotal(euTotal);
EXPECT_EQ(drm->ioctlStatistics.size(), 2u);
euTotalData = drm->ioctlStatistics.find(DrmIoctl::Getparam);
euTotalData = drm->ioctlStatistics.find(DrmIoctl::getparam);
ASSERT_TRUE(euTotalData != drm->ioctlStatistics.end());
EXPECT_EQ(DrmIoctl::Getparam, euTotalData->first);
EXPECT_EQ(DrmIoctl::getparam, euTotalData->first);
EXPECT_EQ(3u, euTotalData->second.count);
EXPECT_NE(0u, euTotalData->second.totalTime);
auto secondTime = euTotalData->second.totalTime;
EXPECT_GT(secondTime, firstTime);
lowPriorityData = drm->ioctlStatistics.find(DrmIoctl::GemContextSetparam);
lowPriorityData = drm->ioctlStatistics.find(DrmIoctl::gemContextSetparam);
ASSERT_TRUE(lowPriorityData != drm->ioctlStatistics.end());
EXPECT_EQ(DrmIoctl::GemContextSetparam, lowPriorityData->first);
EXPECT_EQ(DrmIoctl::gemContextSetparam, lowPriorityData->first);
EXPECT_EQ(1u, lowPriorityData->second.count);
EXPECT_NE(0, lowPriorityData->second.totalTime);
drm->destroyDrmContext(contextId);
EXPECT_EQ(3u, drm->ioctlStatistics.size());
euTotalData = drm->ioctlStatistics.find(DrmIoctl::Getparam);
euTotalData = drm->ioctlStatistics.find(DrmIoctl::getparam);
ASSERT_TRUE(euTotalData != drm->ioctlStatistics.end());
EXPECT_EQ(DrmIoctl::Getparam, euTotalData->first);
EXPECT_EQ(DrmIoctl::getparam, euTotalData->first);
EXPECT_EQ(3u, euTotalData->second.count);
EXPECT_NE(0, euTotalData->second.totalTime);
lowPriorityData = drm->ioctlStatistics.find(DrmIoctl::GemContextSetparam);
lowPriorityData = drm->ioctlStatistics.find(DrmIoctl::gemContextSetparam);
ASSERT_TRUE(lowPriorityData != drm->ioctlStatistics.end());
EXPECT_EQ(DrmIoctl::GemContextSetparam, lowPriorityData->first);
EXPECT_EQ(DrmIoctl::gemContextSetparam, lowPriorityData->first);
EXPECT_EQ(1u, lowPriorityData->second.count);
EXPECT_NE(0, lowPriorityData->second.totalTime);
auto destroyData = drm->ioctlStatistics.find(DrmIoctl::GemContextDestroy);
auto destroyData = drm->ioctlStatistics.find(DrmIoctl::gemContextDestroy);
ASSERT_TRUE(destroyData != drm->ioctlStatistics.end());
EXPECT_EQ(DrmIoctl::GemContextDestroy, destroyData->first);
EXPECT_EQ(DrmIoctl::gemContextDestroy, destroyData->first);
EXPECT_EQ(1u, destroyData->second.count);
EXPECT_NE(0, destroyData->second.totalTime);
@@ -446,7 +446,7 @@ TEST_F(DrmTests, GivenErrorCodeWhenCreatingDrmThenDrmCreatedOnlyWithSpecificErro
// check if device works, although there was EINTR error from KMD
getParam.param = I915_PARAM_CHIPSET_ID;
getParam.value = &lDeviceId;
auto ret = drm->ioctl(DrmIoctl::Getparam, &getParam);
auto ret = drm->ioctl(DrmIoctl::getparam, &getParam);
EXPECT_EQ(0, ret);
EXPECT_EQ(deviceId, lDeviceId);
@@ -456,7 +456,7 @@ TEST_F(DrmTests, GivenErrorCodeWhenCreatingDrmThenDrmCreatedOnlyWithSpecificErro
// check if device works, although there was EAGAIN error from KMD
getParam.param = I915_PARAM_CHIPSET_ID;
getParam.value = &lDeviceId;
ret = drm->ioctl(DrmIoctl::Getparam, &getParam);
ret = drm->ioctl(DrmIoctl::getparam, &getParam);
EXPECT_EQ(0, ret);
EXPECT_EQ(deviceId, lDeviceId);
@@ -466,7 +466,7 @@ TEST_F(DrmTests, GivenErrorCodeWhenCreatingDrmThenDrmCreatedOnlyWithSpecificErro
// check if device works, although there was EBUSY error from KMD
getParam.param = I915_PARAM_CHIPSET_ID;
getParam.value = &lDeviceId;
ret = drm->ioctl(DrmIoctl::Getparam, &getParam);
ret = drm->ioctl(DrmIoctl::getparam, &getParam);
EXPECT_EQ(0, ret);
EXPECT_EQ(deviceId, lDeviceId);
@@ -476,7 +476,7 @@ TEST_F(DrmTests, GivenErrorCodeWhenCreatingDrmThenDrmCreatedOnlyWithSpecificErro
// we failed with any other error code
getParam.param = I915_PARAM_CHIPSET_ID;
getParam.value = &lDeviceId;
ret = drm->ioctl(DrmIoctl::Getparam, &getParam);
ret = drm->ioctl(DrmIoctl::getparam, &getParam);
EXPECT_EQ(-1, ret);
EXPECT_EQ(deviceId, lDeviceId);
}

6
opencl/test/unit_test/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp
View File

@@ -28,7 +28,7 @@ TEST(DrmMemoryManagerTest, givenDrmMemoryManagerWhenSharedAllocationIsCreatedFro
MockDrm(int fd, RootDeviceEnvironment &rootDeviceEnvironment) : Drm(std::make_unique<HwDeviceIdDrm>(fd, ""), rootDeviceEnvironment) {}
int ioctl(DrmIoctl request, void *arg) override {
if (request == DrmIoctl::PrimeFdToHandle) {
if (request == DrmIoctl::primeFdToHandle) {
auto *primeToHandleParams = static_cast<PrimeHandle *>(arg);
primeToHandleParams->handle = 10;
}
@@ -87,7 +87,7 @@ TEST(DrmMemoryManagerTest, givenMultipleThreadsWhenSharedAllocationIsCreatedThen
std::atomic<int> closeHandle;
int ioctl(DrmIoctl request, void *arg) override {
if (request == DrmIoctl::PrimeFdToHandle) {
if (request == DrmIoctl::primeFdToHandle) {
auto *primeToHandleParams = static_cast<PrimeHandle *>(arg);
primeToHandleParams->handle = primeFdHandle;
@@ -96,7 +96,7 @@ TEST(DrmMemoryManagerTest, givenMultipleThreadsWhenSharedAllocationIsCreatedThen
EXPECT_EQ(closeHandle.load(), primeFdHandle.load());
}
else if (request == DrmIoctl::GemClose) {
else if (request == DrmIoctl::gemClose) {
closeHandle++;
std::this_thread::yield();