Skip to content

Commit 8da78d3

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Correct method naming in mock metrics
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
1 parent d36a383 commit 8da78d3

File tree

4 files changed

+138
-142
lines changed

4 files changed

+138
-142
lines changed

‎level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -360,29 +360,29 @@ void Mock<MetricsLibrary>::setMockedApi(MockMetricsLibraryApi *mockedApi) {
360360
metricSource.setMetricsLibrary(*this);
361361

362362
// Mock metrics library api functions.
363-
contextCreateFunction = mockedApi->ContextCreate;
364-
contextDeleteFunction = mockedApi->ContextDelete;
363+
contextCreateFunction = mockedApi->contextCreate;
364+
contextDeleteFunction = mockedApi->contextDelete;
365365

366-
api.GetParameter = mockedApi->GetParameter;
366+
api.GetParameter = mockedApi->getParameter;
367367

368-
api.CommandBufferGet = mockedApi->CommandBufferGet;
369-
api.CommandBufferGetSize = mockedApi->CommandBufferGetSize;
368+
api.CommandBufferGet = mockedApi->commandBufferGet;
369+
api.CommandBufferGetSize = mockedApi->commandBufferGetSize;
370370

371-
api.QueryCreate = mockedApi->QueryCreate;
372-
api.QueryDelete = mockedApi->QueryDelete;
371+
api.QueryCreate = mockedApi->queryCreate;
372+
api.QueryDelete = mockedApi->queryDelete;
373373

374-
api.OverrideCreate = mockedApi->OverrideCreate;
375-
api.OverrideDelete = mockedApi->OverrideDelete;
374+
api.OverrideCreate = mockedApi->overrideCreate;
375+
api.OverrideDelete = mockedApi->overrideDelete;
376376

377-
api.MarkerCreate = mockedApi->MarkerCreate;
378-
api.MarkerDelete = mockedApi->MarkerDelete;
377+
api.MarkerCreate = mockedApi->markerCreate;
378+
api.MarkerDelete = mockedApi->markerDelete;
379379

380-
api.ConfigurationCreate = mockedApi->ConfigurationCreate;
381-
api.ConfigurationActivate = mockedApi->ConfigurationActivate;
382-
api.ConfigurationDeactivate = mockedApi->ConfigurationDeactivate;
383-
api.ConfigurationDelete = mockedApi->ConfigurationDelete;
380+
api.ConfigurationCreate = mockedApi->configurationCreate;
381+
api.ConfigurationActivate = mockedApi->configurationActivate;
382+
api.ConfigurationDeactivate = mockedApi->configurationDeactivate;
383+
api.ConfigurationDelete = mockedApi->configurationDelete;
384384

385-
api.GetData = mockedApi->GetData;
385+
api.GetData = mockedApi->getData;
386386

387387
// Mock metrics library api.
388388
Mock<MetricsLibrary>::g_mockApi = mockedApi;
@@ -394,67 +394,67 @@ void Mock<MetricsLibrary>::setMockedApi(MockMetricsLibraryApi *mockedApi) {
394394
}
395395
}
396396

397-
StatusCode MockMetricsLibraryApi::ContextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle) {
397+
StatusCode MockMetricsLibraryApi::contextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle) {
398398
return Mock<MetricsLibrary>::g_mockApi->MockContextCreate(clientType, createData, handle);
399399
}
400400

401-
StatusCode MockMetricsLibraryApi::ContextDelete(const ContextHandle_1_0 handle) {
401+
StatusCode MockMetricsLibraryApi::contextDelete(const ContextHandle_1_0 handle) {
402402
return Mock<MetricsLibrary>::g_mockApi->MockContextDelete(handle);
403403
}
404404

405-
StatusCode MockMetricsLibraryApi::GetParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value) {
405+
StatusCode MockMetricsLibraryApi::getParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value) {
406406
return Mock<MetricsLibrary>::g_mockApi->MockGetParameter(parameter, type, value);
407407
}
408408

409-
StatusCode MockMetricsLibraryApi::CommandBufferGet(const CommandBufferData_1_0 *data) {
409+
StatusCode MockMetricsLibraryApi::commandBufferGet(const CommandBufferData_1_0 *data) {
410410
return Mock<MetricsLibrary>::g_mockApi->MockCommandBufferGet(data);
411411
}
412412

413-
StatusCode MockMetricsLibraryApi::CommandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size) {
413+
StatusCode MockMetricsLibraryApi::commandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size) {
414414
return Mock<MetricsLibrary>::g_mockApi->MockCommandBufferGetSize(data, size);
415415
}
416416

417-
StatusCode MockMetricsLibraryApi::QueryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle) {
417+
StatusCode MockMetricsLibraryApi::queryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle) {
418418
return Mock<MetricsLibrary>::g_mockApi->MockQueryCreate(createData, handle);
419419
}
420420

421-
StatusCode MockMetricsLibraryApi::QueryDelete(const QueryHandle_1_0 handle) {
421+
StatusCode MockMetricsLibraryApi::queryDelete(const QueryHandle_1_0 handle) {
422422
return Mock<MetricsLibrary>::g_mockApi->MockQueryDelete(handle);
423423
}
424424

425-
StatusCode MockMetricsLibraryApi::OverrideCreate(const OverrideCreateData_1_0 *createData, OverrideHandle_1_0 *handle) {
425+
StatusCode MockMetricsLibraryApi::overrideCreate(const OverrideCreateData_1_0 *createData, OverrideHandle_1_0 *handle) {
426426
return Mock<MetricsLibrary>::g_mockApi->MockOverrideCreate(createData, handle);
427427
}
428428

429-
StatusCode MockMetricsLibraryApi::OverrideDelete(const OverrideHandle_1_0 handle) {
429+
StatusCode MockMetricsLibraryApi::overrideDelete(const OverrideHandle_1_0 handle) {
430430
return Mock<MetricsLibrary>::g_mockApi->MockOverrideDelete(handle);
431431
}
432432

433-
StatusCode MockMetricsLibraryApi::MarkerCreate(const MarkerCreateData_1_0 *createData, MarkerHandle_1_0 *handle) {
433+
StatusCode MockMetricsLibraryApi::markerCreate(const MarkerCreateData_1_0 *createData, MarkerHandle_1_0 *handle) {
434434
return Mock<MetricsLibrary>::g_mockApi->MockMarkerCreate(createData, handle);
435435
}
436436

437-
StatusCode MockMetricsLibraryApi::MarkerDelete(const MarkerHandle_1_0 handle) {
437+
StatusCode MockMetricsLibraryApi::markerDelete(const MarkerHandle_1_0 handle) {
438438
return Mock<MetricsLibrary>::g_mockApi->MockMarkerDelete(handle);
439439
}
440440

441-
StatusCode MockMetricsLibraryApi::ConfigurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle) {
441+
StatusCode MockMetricsLibraryApi::configurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle) {
442442
return Mock<MetricsLibrary>::g_mockApi->MockConfigurationCreate(createData, handle);
443443
}
444444

445-
StatusCode MockMetricsLibraryApi::ConfigurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData) {
445+
StatusCode MockMetricsLibraryApi::configurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData) {
446446
return Mock<MetricsLibrary>::g_mockApi->MockConfigurationActivate(handle, activateData);
447447
}
448448

449-
StatusCode MockMetricsLibraryApi::ConfigurationDeactivate(const ConfigurationHandle_1_0 handle) {
449+
StatusCode MockMetricsLibraryApi::configurationDeactivate(const ConfigurationHandle_1_0 handle) {
450450
return Mock<MetricsLibrary>::g_mockApi->MockConfigurationDeactivate(handle);
451451
}
452452

453-
StatusCode MockMetricsLibraryApi::ConfigurationDelete(const ConfigurationHandle_1_0 handle) {
453+
StatusCode MockMetricsLibraryApi::configurationDelete(const ConfigurationHandle_1_0 handle) {
454454
return Mock<MetricsLibrary>::g_mockApi->MockConfigurationDelete(handle);
455455
}
456456

457-
StatusCode MockMetricsLibraryApi::GetData(GetReportData_1_0 *data) {
457+
StatusCode MockMetricsLibraryApi::getData(GetReportData_1_0 *data) {
458458
return Mock<MetricsLibrary>::g_mockApi->MockGetData(data);
459459
}
460460

‎level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,22 @@ using MetricsLibraryApi::ValueType;
5858
struct MockMetricsLibraryApi {
5959

6060
// Original api functions.
61-
static StatusCode ML_STDCALL ContextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle); // NOLINT(readability-identifier-naming)
62-
static StatusCode ML_STDCALL ContextDelete(const ContextHandle_1_0 handle); // NOLINT(readability-identifier-naming)
63-
static StatusCode ML_STDCALL GetParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value); // NOLINT(readability-identifier-naming)
64-
static StatusCode ML_STDCALL CommandBufferGet(const CommandBufferData_1_0 *data); // NOLINT(readability-identifier-naming)
65-
static StatusCode ML_STDCALL CommandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size); // NOLINT(readability-identifier-naming)
66-
static StatusCode ML_STDCALL QueryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle); // NOLINT(readability-identifier-naming)
67-
static StatusCode ML_STDCALL QueryDelete(const QueryHandle_1_0 handle); // NOLINT(readability-identifier-naming)
68-
static StatusCode ML_STDCALL OverrideCreate(const OverrideCreateData_1_0 *createData, OverrideHandle_1_0 *handle); // NOLINT(readability-identifier-naming)
69-
static StatusCode ML_STDCALL OverrideDelete(const OverrideHandle_1_0 handle); // NOLINT(readability-identifier-naming)
70-
static StatusCode ML_STDCALL MarkerCreate(const MarkerCreateData_1_0 *createData, MarkerHandle_1_0 *handle); // NOLINT(readability-identifier-naming)
71-
static StatusCode ML_STDCALL MarkerDelete(const MarkerHandle_1_0 handle); // NOLINT(readability-identifier-naming)
72-
static StatusCode ML_STDCALL ConfigurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle); // NOLINT(readability-identifier-naming)
73-
static StatusCode ML_STDCALL ConfigurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData); // NOLINT(readability-identifier-naming)
74-
static StatusCode ML_STDCALL ConfigurationDeactivate(const ConfigurationHandle_1_0 handle); // NOLINT(readability-identifier-naming)
75-
static StatusCode ML_STDCALL ConfigurationDelete(const ConfigurationHandle_1_0 handle); // NOLINT(readability-identifier-naming)
76-
static StatusCode ML_STDCALL GetData(GetReportData_1_0 *data); // NOLINT(readability-identifier-naming)
61+
static StatusCode ML_STDCALL contextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle);
62+
static StatusCode ML_STDCALL contextDelete(const ContextHandle_1_0 handle);
63+
static StatusCode ML_STDCALL getParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value);
64+
static StatusCode ML_STDCALL commandBufferGet(const CommandBufferData_1_0 *data);
65+
static StatusCode ML_STDCALL commandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size);
66+
static StatusCode ML_STDCALL queryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle);
67+
static StatusCode ML_STDCALL queryDelete(const QueryHandle_1_0 handle);
68+
static StatusCode ML_STDCALL overrideCreate(const OverrideCreateData_1_0 *createData, OverrideHandle_1_0 *handle);
69+
static StatusCode ML_STDCALL overrideDelete(const OverrideHandle_1_0 handle);
70+
static StatusCode ML_STDCALL markerCreate(const MarkerCreateData_1_0 *createData, MarkerHandle_1_0 *handle);
71+
static StatusCode ML_STDCALL markerDelete(const MarkerHandle_1_0 handle);
72+
static StatusCode ML_STDCALL configurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle);
73+
static StatusCode ML_STDCALL configurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData);
74+
static StatusCode ML_STDCALL configurationDeactivate(const ConfigurationHandle_1_0 handle);
75+
static StatusCode ML_STDCALL configurationDelete(const ConfigurationHandle_1_0 handle);
76+
static StatusCode ML_STDCALL getData(GetReportData_1_0 *data);
7777

7878
// Mocked api functions.
7979
MOCK_METHOD(StatusCode, MockContextCreate, (ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle));

‎opencl/test/unit_test/os_interface/mock_performance_counters.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ bool MockMetricsLibrary::commandBufferGetSize(const CommandBufferData_1_0 &comma
114114
void *MockMetricsLibraryDll::getProcAddress(const std::string &procName) {
115115
if (procName == METRICS_LIBRARY_CONTEXT_CREATE_1_0) {
116116
return validContextCreate
117-
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::ContextCreate)
117+
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::contextCreate)
118118
: nullptr;
119119
} else if (procName == METRICS_LIBRARY_CONTEXT_DELETE_1_0) {
120120
return validContextDelete
121-
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::ContextDelete)
121+
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::contextDelete)
122122
: nullptr;
123123
} else {
124124
return nullptr;
@@ -135,7 +135,7 @@ bool MockMetricsLibraryDll::isLoaded() {
135135
//////////////////////////////////////////////////////
136136
// MockMetricsLibraryValidInterface::ContextCreate
137137
//////////////////////////////////////////////////////
138-
StatusCode MockMetricsLibraryValidInterface::ContextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle) {
138+
StatusCode MockMetricsLibraryValidInterface::contextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle) {
139139

140140
// Validate input.
141141
EXPECT_EQ(clientType.Api, ClientApi::OpenCL);
@@ -157,7 +157,7 @@ StatusCode MockMetricsLibraryValidInterface::ContextCreate(ClientType_1_0 client
157157
//////////////////////////////////////////////////////
158158
// MockMetricsLibraryValidInterface::ContextDelete
159159
//////////////////////////////////////////////////////
160-
StatusCode MockMetricsLibraryValidInterface::ContextDelete(const ContextHandle_1_0 handle) {
160+
StatusCode MockMetricsLibraryValidInterface::contextDelete(const ContextHandle_1_0 handle) {
161161

162162
auto validHandle = handle.IsValid();
163163
auto library = static_cast<MockMetricsLibraryValidInterface *>(handle.data);
@@ -178,7 +178,7 @@ StatusCode MockMetricsLibraryValidInterface::ContextDelete(const ContextHandle_1
178178
//////////////////////////////////////////////////////
179179
// MockMetricsLibraryInterface::QueryCreate
180180
//////////////////////////////////////////////////////
181-
StatusCode MockMetricsLibraryValidInterface::QueryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle) {
181+
StatusCode MockMetricsLibraryValidInterface::queryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle) {
182182

183183
EXPECT_NE(handle, nullptr);
184184
EXPECT_NE(createData, nullptr);
@@ -193,7 +193,7 @@ StatusCode MockMetricsLibraryValidInterface::QueryCreate(const QueryCreateData_1
193193
//////////////////////////////////////////////////////
194194
// MockMetricsLibraryValidInterface::QueryDelete
195195
//////////////////////////////////////////////////////
196-
StatusCode MockMetricsLibraryValidInterface::QueryDelete(const QueryHandle_1_0 handle) {
196+
StatusCode MockMetricsLibraryValidInterface::queryDelete(const QueryHandle_1_0 handle) {
197197

198198
if (handle.IsValid()) {
199199
delete (uint32_t *)handle.data;
@@ -205,7 +205,7 @@ StatusCode MockMetricsLibraryValidInterface::QueryDelete(const QueryHandle_1_0 h
205205
//////////////////////////////////////////////////////
206206
// MockMetricsLibraryValidInterface::CommandBufferGetSize
207207
//////////////////////////////////////////////////////
208-
StatusCode MockMetricsLibraryValidInterface::CommandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size) {
208+
StatusCode MockMetricsLibraryValidInterface::commandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size) {
209209
auto library = static_cast<MockMetricsLibraryValidInterface *>(data->HandleContext.data);
210210
EXPECT_NE(data, nullptr);
211211
EXPECT_TRUE(data->HandleContext.IsValid());
@@ -225,7 +225,7 @@ StatusCode MockMetricsLibraryValidInterface::CommandBufferGetSize(const CommandB
225225
//////////////////////////////////////////////////////
226226
// MockMetricsLibraryValidInterface::CommandBufferGet
227227
//////////////////////////////////////////////////////
228-
StatusCode MockMetricsLibraryValidInterface::CommandBufferGet(const CommandBufferData_1_0 *data) {
228+
StatusCode MockMetricsLibraryValidInterface::commandBufferGet(const CommandBufferData_1_0 *data) {
229229
EXPECT_NE(data, nullptr);
230230
EXPECT_TRUE(data->HandleContext.IsValid());
231231
EXPECT_TRUE(data->QueryHwCounters.Handle.IsValid());
@@ -239,7 +239,7 @@ StatusCode MockMetricsLibraryValidInterface::CommandBufferGet(const CommandBuffe
239239
//////////////////////////////////////////////////////
240240
// MockMetricsLibraryValidInterface::CommandBufferGet
241241
//////////////////////////////////////////////////////
242-
StatusCode MockMetricsLibraryValidInterface::GetParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value) {
242+
StatusCode MockMetricsLibraryValidInterface::getParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value) {
243243
EXPECT_NE(type, nullptr);
244244
EXPECT_NE(value, nullptr);
245245
switch (parameter) {
@@ -261,7 +261,7 @@ StatusCode MockMetricsLibraryValidInterface::GetParameter(const ParameterType pa
261261
//////////////////////////////////////////////////////
262262
// MockMetricsLibraryValidInterface::ConfigurationCreate
263263
//////////////////////////////////////////////////////
264-
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle) {
264+
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::configurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle) {
265265
EXPECT_NE(createData, nullptr);
266266
EXPECT_NE(handle, nullptr);
267267
EXPECT_TRUE(createData->HandleContext.IsValid());
@@ -288,7 +288,7 @@ StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationCreate(cons
288288
//////////////////////////////////////////////////////
289289
// MockMetricsLibraryValidInterface::ConfigurationActivate
290290
//////////////////////////////////////////////////////
291-
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData) {
291+
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::configurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData) {
292292
auto api = static_cast<MockMetricsLibraryValidInterface *>(handle.data);
293293
return api->validActivateConfigurationOa
294294
? StatusCode::Success
@@ -298,7 +298,7 @@ StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationActivate(co
298298
//////////////////////////////////////////////////////
299299
// MockMetricsLibraryValidInterface::ConfigurationDelete
300300
//////////////////////////////////////////////////////
301-
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationDelete(const ConfigurationHandle_1_0 handle) {
301+
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::configurationDelete(const ConfigurationHandle_1_0 handle) {
302302
EXPECT_TRUE(handle.IsValid());
303303

304304
return StatusCode::Success;
@@ -307,7 +307,7 @@ StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationDelete(cons
307307
//////////////////////////////////////////////////////
308308
// MockMetricsLibraryValidInterface::GetData
309309
//////////////////////////////////////////////////////
310-
StatusCode MockMetricsLibraryValidInterface::GetData(GetReportData_1_0 *data) {
310+
StatusCode MockMetricsLibraryValidInterface::getData(GetReportData_1_0 *data) {
311311
EXPECT_NE(data, nullptr);
312312
EXPECT_EQ(data->Type, ObjectType::QueryHwCounters);
313313
EXPECT_TRUE(data->Query.Handle.IsValid());

0 commit comments

Comments
 (0)