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

Correct method naming in mock metrics

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-08-17 11:19:23 +00:00
committed by Compute-Runtime-Automation
parent d36a383a84
commit 8da78d3ed4
4 changed files with 135 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
opencl/test/unit_test/os_interface/mock_performance_counters.cpp
View File

@ -114,11 +114,11 @@ bool MockMetricsLibrary::commandBufferGetSize(const CommandBufferData_1_0 &comma
void *MockMetricsLibraryDll::getProcAddress(const std::string &procName) {
if (procName == METRICS_LIBRARY_CONTEXT_CREATE_1_0) {
return validContextCreate
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::ContextCreate)
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::contextCreate)
: nullptr;
} else if (procName == METRICS_LIBRARY_CONTEXT_DELETE_1_0) {
return validContextDelete
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::ContextDelete)
? reinterpret_cast<void *>(&MockMetricsLibraryValidInterface::contextDelete)
: nullptr;
} else {
return nullptr;
@ -135,7 +135,7 @@ bool MockMetricsLibraryDll::isLoaded() {
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::ContextCreate
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::ContextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle) {
StatusCode MockMetricsLibraryValidInterface::contextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle) {
// Validate input.
EXPECT_EQ(clientType.Api, ClientApi::OpenCL);
@ -157,7 +157,7 @@ StatusCode MockMetricsLibraryValidInterface::ContextCreate(ClientType_1_0 client
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::ContextDelete
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::ContextDelete(const ContextHandle_1_0 handle) {
StatusCode MockMetricsLibraryValidInterface::contextDelete(const ContextHandle_1_0 handle) {
auto validHandle = handle.IsValid();
auto library = static_cast<MockMetricsLibraryValidInterface *>(handle.data);
@ -178,7 +178,7 @@ StatusCode MockMetricsLibraryValidInterface::ContextDelete(const ContextHandle_1
//////////////////////////////////////////////////////
// MockMetricsLibraryInterface::QueryCreate
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::QueryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle) {
StatusCode MockMetricsLibraryValidInterface::queryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle) {
EXPECT_NE(handle, nullptr);
EXPECT_NE(createData, nullptr);
@ -193,7 +193,7 @@ StatusCode MockMetricsLibraryValidInterface::QueryCreate(const QueryCreateData_1
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::QueryDelete
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::QueryDelete(const QueryHandle_1_0 handle) {
StatusCode MockMetricsLibraryValidInterface::queryDelete(const QueryHandle_1_0 handle) {
if (handle.IsValid()) {
delete (uint32_t *)handle.data;
@ -205,7 +205,7 @@ StatusCode MockMetricsLibraryValidInterface::QueryDelete(const QueryHandle_1_0 h
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::CommandBufferGetSize
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::CommandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size) {
StatusCode MockMetricsLibraryValidInterface::commandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size) {
auto library = static_cast<MockMetricsLibraryValidInterface *>(data->HandleContext.data);
EXPECT_NE(data, nullptr);
EXPECT_TRUE(data->HandleContext.IsValid());
@ -225,7 +225,7 @@ StatusCode MockMetricsLibraryValidInterface::CommandBufferGetSize(const CommandB
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::CommandBufferGet
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::CommandBufferGet(const CommandBufferData_1_0 *data) {
StatusCode MockMetricsLibraryValidInterface::commandBufferGet(const CommandBufferData_1_0 *data) {
EXPECT_NE(data, nullptr);
EXPECT_TRUE(data->HandleContext.IsValid());
EXPECT_TRUE(data->QueryHwCounters.Handle.IsValid());
@ -239,7 +239,7 @@ StatusCode MockMetricsLibraryValidInterface::CommandBufferGet(const CommandBuffe
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::CommandBufferGet
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::GetParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value) {
StatusCode MockMetricsLibraryValidInterface::getParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value) {
EXPECT_NE(type, nullptr);
EXPECT_NE(value, nullptr);
switch (parameter) {
@ -261,7 +261,7 @@ StatusCode MockMetricsLibraryValidInterface::GetParameter(const ParameterType pa
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::ConfigurationCreate
//////////////////////////////////////////////////////
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle) {
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::configurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle) {
EXPECT_NE(createData, nullptr);
EXPECT_NE(handle, nullptr);
EXPECT_TRUE(createData->HandleContext.IsValid());
@ -288,7 +288,7 @@ StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationCreate(cons
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::ConfigurationActivate
//////////////////////////////////////////////////////
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData) {
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::configurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData) {
auto api = static_cast<MockMetricsLibraryValidInterface *>(handle.data);
return api->validActivateConfigurationOa
? StatusCode::Success
@ -298,7 +298,7 @@ StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationActivate(co
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::ConfigurationDelete
//////////////////////////////////////////////////////
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationDelete(const ConfigurationHandle_1_0 handle) {
StatusCode ML_STDCALL MockMetricsLibraryValidInterface::configurationDelete(const ConfigurationHandle_1_0 handle) {
EXPECT_TRUE(handle.IsValid());
return StatusCode::Success;
@ -307,7 +307,7 @@ StatusCode ML_STDCALL MockMetricsLibraryValidInterface::ConfigurationDelete(cons
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface::GetData
//////////////////////////////////////////////////////
StatusCode MockMetricsLibraryValidInterface::GetData(GetReportData_1_0 *data) {
StatusCode MockMetricsLibraryValidInterface::getData(GetReportData_1_0 *data) {
EXPECT_NE(data, nullptr);
EXPECT_EQ(data->Type, ObjectType::QueryHwCounters);
EXPECT_TRUE(data->Query.Handle.IsValid());

152
opencl/test/unit_test/os_interface/mock_performance_counters.h
View File

@ -66,123 +66,119 @@ struct MI_REPORT_PERF_COUNT {
}
};
// clang-format off
//////////////////////////////////////////////////////
// MockMetricsLibrary
//////////////////////////////////////////////////////
class MockMetricsLibrary : public MetricsLibrary {
public:
uint32_t openCount = 0;
uint32_t openCount = 0;
uint32_t contextCount = 0;
uint32_t queryCount = 0;
bool validOpen = true;
bool validGetData = true;
uint32_t queryCount = 0;
bool validOpen = true;
bool validGetData = true;
// Library open / close functions.
bool open() override;
// Context create / destroy functions.
bool contextCreate (const ClientType_1_0 &client, ClientOptionsSubDeviceData_1_0 &subDevice, ClientOptionsSubDeviceIndexData_1_0 &subDeviceIndex, ClientOptionsSubDeviceCountData_1_0 &subDeviceCount, ClientData_1_0& clientData, ContextCreateData_1_0 &createData, ContextHandle_1_0 &handle) override;
bool contextDelete (const ContextHandle_1_0 &handle) override;
bool contextCreate(const ClientType_1_0 &client, ClientOptionsSubDeviceData_1_0 &subDevice, ClientOptionsSubDeviceIndexData_1_0 &subDeviceIndex, ClientOptionsSubDeviceCountData_1_0 &subDeviceCount, ClientData_1_0 &clientData, ContextCreateData_1_0 &createData, ContextHandle_1_0 &handle) override;
bool contextDelete(const ContextHandle_1_0 &handle) override;
// HwCounters functions.
bool hwCountersCreate (const ContextHandle_1_0 &context, const uint32_t slots, const ConfigurationHandle_1_0 mmio, QueryHandle_1_0 &handle) override;
bool hwCountersDelete (const QueryHandle_1_0 &handle) override;
bool hwCountersGetReport (const QueryHandle_1_0 &handle, const uint32_t slot, const uint32_t slotsCount, const uint32_t dataSize, void *data) override;
bool hwCountersCreate(const ContextHandle_1_0 &context, const uint32_t slots, const ConfigurationHandle_1_0 mmio, QueryHandle_1_0 &handle) override;
bool hwCountersDelete(const QueryHandle_1_0 &handle) override;
bool hwCountersGetReport(const QueryHandle_1_0 &handle, const uint32_t slot, const uint32_t slotsCount, const uint32_t dataSize, void *data) override;
uint32_t hwCountersGetApiReportSize() override;
uint32_t hwCountersGetGpuReportSize() override;
// Command buffer functions.
bool commandBufferGet (CommandBufferData_1_0 &data) override;
bool commandBufferGetSize (const CommandBufferData_1_0 &commandBufferData, CommandBufferSize_1_0 &commandBufferSize) override;
bool commandBufferGet(CommandBufferData_1_0 &data) override;
bool commandBufferGetSize(const CommandBufferData_1_0 &commandBufferData, CommandBufferSize_1_0 &commandBufferSize) override;
// Oa configuration functions.
bool oaConfigurationCreate (const ContextHandle_1_0 &context, ConfigurationHandle_1_0 &handle) override { return true; }
bool oaConfigurationDelete (const ConfigurationHandle_1_0 &handle) override { return true; }
bool oaConfigurationActivate (const ConfigurationHandle_1_0 &handle) override { return true; }
bool oaConfigurationDeactivate (const ConfigurationHandle_1_0 &handle) override { return true; }
bool oaConfigurationCreate(const ContextHandle_1_0 &context, ConfigurationHandle_1_0 &handle) override { return true; }
bool oaConfigurationDelete(const ConfigurationHandle_1_0 &handle) override { return true; }
bool oaConfigurationActivate(const ConfigurationHandle_1_0 &handle) override { return true; }
bool oaConfigurationDeactivate(const ConfigurationHandle_1_0 &handle) override { return true; }
// User mmio configuration functions.
bool userConfigurationCreate (const ContextHandle_1_0 &context, ConfigurationHandle_1_0 &handle) override { return true; }
bool userConfigurationDelete (const ConfigurationHandle_1_0 &handle) override { return true; }
bool userConfigurationCreate(const ContextHandle_1_0 &context, ConfigurationHandle_1_0 &handle) override { return true; }
bool userConfigurationDelete(const ConfigurationHandle_1_0 &handle) override { return true; }
};
//////////////////////////////////////////////////////
// MockMetricsLibraryValidInterface
//////////////////////////////////////////////////////
class MockMetricsLibraryValidInterface: public MetricsLibraryInterface {
class MockMetricsLibraryValidInterface : public MetricsLibraryInterface {
public:
uint32_t contextCount = 0;
bool validCreateConfigurationOa = true;
bool validCreateConfigurationUser = true;
bool validActivateConfigurationOa = true;
bool validGpuReportSize = true;
uint32_t contextCount = 0;
bool validCreateConfigurationOa = true;
bool validCreateConfigurationUser = true;
bool validActivateConfigurationOa = true;
bool validGpuReportSize = true;
static StatusCode ML_STDCALL ContextCreate ( ClientType_1_0 clientType, ContextCreateData_1_0* createData, ContextHandle_1_0* handle ); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ContextDelete (const ContextHandle_1_0 handle); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL GetParameter (const ParameterType parameter, ValueType *type, TypedValue_1_0 *value); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL CommandBufferGet (const CommandBufferData_1_0 *data); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL CommandBufferGetSize (const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL QueryCreate (const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL QueryDelete (const QueryHandle_1_0 handle); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationCreate (const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationActivate (const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationDeactivate (const ConfigurationHandle_1_0 handle) { return StatusCode::Success; } // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationDelete (const ConfigurationHandle_1_0 handle); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL GetData (GetReportData_1_0 *data); // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL contextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle);
static StatusCode ML_STDCALL contextDelete(const ContextHandle_1_0 handle);
static StatusCode ML_STDCALL getParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value);
static StatusCode ML_STDCALL commandBufferGet(const CommandBufferData_1_0 *data);
static StatusCode ML_STDCALL commandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size);
static StatusCode ML_STDCALL queryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle);
static StatusCode ML_STDCALL queryDelete(const QueryHandle_1_0 handle);
static StatusCode ML_STDCALL configurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle);
static StatusCode ML_STDCALL configurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData);
static StatusCode ML_STDCALL configurationDeactivate(const ConfigurationHandle_1_0 handle) { return StatusCode::Success; }
static StatusCode ML_STDCALL configurationDelete(const ConfigurationHandle_1_0 handle);
static StatusCode ML_STDCALL getData(GetReportData_1_0 *data);
MockMetricsLibraryValidInterface()
{
contextCreate = &ContextCreate;
contextDelete = &ContextDelete;
functions.GetParameter = &GetParameter;
functions.CommandBufferGet = &CommandBufferGet;
functions.CommandBufferGetSize = &CommandBufferGetSize;
functions.QueryCreate = &QueryCreate;
functions.QueryDelete = &QueryDelete;
functions.ConfigurationCreate = &ConfigurationCreate;
functions.ConfigurationActivate = &ConfigurationActivate;
functions.ConfigurationDeactivate = &ConfigurationDeactivate;
functions.ConfigurationDelete = &ConfigurationDelete;
functions.GetData = &GetData;
MockMetricsLibraryValidInterface() {
MetricsLibraryInterface::contextCreate = &MockMetricsLibraryValidInterface::contextCreate;
MetricsLibraryInterface::contextDelete = &MockMetricsLibraryValidInterface::contextDelete;
functions.GetParameter = &getParameter;
functions.CommandBufferGet = &commandBufferGet;
functions.CommandBufferGetSize = &commandBufferGetSize;
functions.QueryCreate = &queryCreate;
functions.QueryDelete = &queryDelete;
functions.ConfigurationCreate = &configurationCreate;
functions.ConfigurationActivate = &configurationActivate;
functions.ConfigurationDeactivate = &configurationDeactivate;
functions.ConfigurationDelete = &configurationDelete;
functions.GetData = &getData;
}
};
//////////////////////////////////////////////////////
// MockMetricsLibraryInvalidInterface
//////////////////////////////////////////////////////
class MockMetricsLibraryInvalidInterface: public MetricsLibraryInterface {
class MockMetricsLibraryInvalidInterface : public MetricsLibraryInterface {
public:
static StatusCode ML_STDCALL ContextCreate ( ClientType_1_0 clientType, ContextCreateData_1_0* createData, ContextHandle_1_0* handle ){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ContextDelete (const ContextHandle_1_0 handle){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL GetParameter (const ParameterType parameter, ValueType *type, TypedValue_1_0 *value){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL CommandBufferGet (const CommandBufferData_1_0 *data){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL CommandBufferGetSize (const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL QueryCreate (const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL QueryDelete (const QueryHandle_1_0 handle){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationCreate (const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationActivate (const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationDeactivate (const ConfigurationHandle_1_0 handle){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL ConfigurationDelete (const ConfigurationHandle_1_0 handle){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL GetData (GetReportData_1_0 *data){ return StatusCode::Failed;} // NOLINT(readability-identifier-naming)
static StatusCode ML_STDCALL contextCreate(ClientType_1_0 clientType, ContextCreateData_1_0 *createData, ContextHandle_1_0 *handle) { return StatusCode::Failed; }
static StatusCode ML_STDCALL contextDelete(const ContextHandle_1_0 handle) { return StatusCode::Failed; }
static StatusCode ML_STDCALL getParameter(const ParameterType parameter, ValueType *type, TypedValue_1_0 *value) { return StatusCode::Failed; }
static StatusCode ML_STDCALL commandBufferGet(const CommandBufferData_1_0 *data) { return StatusCode::Failed; }
static StatusCode ML_STDCALL commandBufferGetSize(const CommandBufferData_1_0 *data, CommandBufferSize_1_0 *size) { return StatusCode::Failed; }
static StatusCode ML_STDCALL queryCreate(const QueryCreateData_1_0 *createData, QueryHandle_1_0 *handle) { return StatusCode::Failed; }
static StatusCode ML_STDCALL queryDelete(const QueryHandle_1_0 handle) { return StatusCode::Failed; }
static StatusCode ML_STDCALL configurationCreate(const ConfigurationCreateData_1_0 *createData, ConfigurationHandle_1_0 *handle) { return StatusCode::Failed; }
static StatusCode ML_STDCALL configurationActivate(const ConfigurationHandle_1_0 handle, const ConfigurationActivateData_1_0 *activateData) { return StatusCode::Failed; }
static StatusCode ML_STDCALL configurationDeactivate(const ConfigurationHandle_1_0 handle) { return StatusCode::Failed; }
static StatusCode ML_STDCALL configurationDelete(const ConfigurationHandle_1_0 handle) { return StatusCode::Failed; }
static StatusCode ML_STDCALL getData(GetReportData_1_0 *data) { return StatusCode::Failed; }
MockMetricsLibraryInvalidInterface()
{
contextCreate = &ContextCreate;
contextDelete = &ContextDelete;
functions.GetParameter = &GetParameter;
functions.CommandBufferGet = &CommandBufferGet;
functions.CommandBufferGetSize = &CommandBufferGetSize;
functions.QueryCreate = &QueryCreate;
functions.QueryDelete = &QueryDelete;
functions.ConfigurationCreate = &ConfigurationCreate;
functions.ConfigurationActivate = &ConfigurationActivate;
functions.ConfigurationDeactivate = &ConfigurationDeactivate;
functions.ConfigurationDelete = &ConfigurationDelete;
functions.GetData = &GetData;
MockMetricsLibraryInvalidInterface() {
MetricsLibraryInterface::contextCreate = &MockMetricsLibraryInvalidInterface::contextCreate;
MetricsLibraryInterface::contextDelete = &MockMetricsLibraryInvalidInterface::contextDelete;
functions.GetParameter = &getParameter;
functions.CommandBufferGet = &commandBufferGet;
functions.CommandBufferGetSize = &commandBufferGetSize;
functions.QueryCreate = &queryCreate;
functions.QueryDelete = &queryDelete;
functions.ConfigurationCreate = &configurationCreate;
functions.ConfigurationActivate = &configurationActivate;
functions.ConfigurationDeactivate = &configurationDeactivate;
functions.ConfigurationDelete = &configurationDelete;
functions.GetData = &getData;
}
};
// clang-format on
//////////////////////////////////////////////////////
// MockMetricsLibraryDll