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

Rename functions

Browse Source 
Rename getEngines to getAllEngines
Rename engines to allEngines
Rename getEngineGroups to getRegularEngineGroups
Rename engineGroups to regularEngineGroups

Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2021-12-13 12:45:24 +00:00
committed by Compute-Runtime-Automation
parent 3fd938a124
commit 64aec8dc4e
36 changed files with 185 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
opencl/test/unit_test/device/device_tests.cpp
View File

@ -76,7 +76,7 @@ TEST_F(DeviceTest, WhenDeviceIsCheckedForOcl21ConformanceThenCorrectValueIsRetur
}
TEST_F(DeviceTest, givenDeviceWhenEngineIsCreatedThenSetInitialValueForTag) {
for (auto &engine : pDevice->engines) {
for (auto &engine : pDevice->allEngines) {
auto tagAddress = engine.commandStreamReceiver->getTagAddress();
ASSERT_NE(nullptr, const_cast<uint32_t *>(tagAddress));
EXPECT_EQ(initialHardwareTag, *tagAddress);
@ -190,7 +190,7 @@ HWTEST_F(DeviceTest, WhenDeviceIsCreatedThenActualEngineTypeIsSameAsDefault) {
EXPECT_EQ(defaultEngineType, actualEngineType);
int defaultCounter = 0;
const auto &engines = device->getEngines();
const auto &engines = device->getAllEngines();
for (const auto &engine : engines) {
if (engine.osContext->isDefaultContext()) {
defaultCounter++;
@ -212,7 +212,7 @@ HWTEST_F(DeviceTest, givenNoHwCsrTypeAndModifiedDefaultEngineIndexWhenIsSimulati
CommandStreamReceiverType::CSR_HW};
for (uint32_t i = 0u; i < 3u; ++i) {
auto engineType = pDevice->engines[i].commandStreamReceiver->getType();
auto engineType = pDevice->allEngines[i].commandStreamReceiver->getType();
EXPECT_EQ(exptectedEngineTypes[i], engineType);
}
}
@ -323,7 +323,7 @@ TEST(DeviceCreation, givenDeviceWhenItIsCreatedThenOsContextIsRegistredInMemoryM
auto numEnginesForDevice = HwHelper::get(hwInfo.platform.eRenderCoreFamily).getGpgpuEngineInstances(hwInfo).size();
if (device->getNumGenericSubDevices() > 1) {
numEnginesForDevice *= device->getNumGenericSubDevices();
numEnginesForDevice += device->engines.size();
numEnginesForDevice += device->allEngines.size();
if (device->getSubDevice(0)->getNumSubDevices() > 0) {
numEnginesForDevice += device->getNumSubDevices();
@ -427,7 +427,7 @@ TEST(DeviceCreation, givenMultiRootDeviceWhenTheyAreCreatedThenEachDeviceHasSepe
EXPECT_EQ(numGpgpuEngines, device2->commandStreamReceivers.size());
for (uint32_t i = 0; i < static_cast<uint32_t>(numGpgpuEngines); i++) {
EXPECT_NE(device2->engines[i].commandStreamReceiver, device1->engines[i].commandStreamReceiver);
EXPECT_NE(device2->allEngines[i].commandStreamReceiver, device1->allEngines[i].commandStreamReceiver);
}
}
@ -526,7 +526,7 @@ TEST(DeviceCreation, givenDeviceWhenCheckingParentDeviceThenCorrectValueIsReturn
TEST(DeviceCreation, givenRootDeviceWithSubDevicesWhenCheckingEngineGroupsThenItHasOneNonEmptyGroup) {
UltDeviceFactory deviceFactory{1, 2};
EXPECT_EQ(1u, deviceFactory.rootDevices[0]->getEngineGroups().size());
EXPECT_EQ(1u, deviceFactory.rootDevices[0]->getRegularEngineGroups().size());
}
TEST(DeviceCreation, whenCheckingEngineGroupsThenGroupsAreUnique) {
@ -544,10 +544,10 @@ TEST(DeviceCreation, whenCheckingEngineGroupsThenGroupsAreUnique) {
UltDeviceFactory deviceFactory{1, 0};
std::set<EngineGroupType> uniqueEngineGroupTypes;
for (auto &engineGroup : deviceFactory.rootDevices[0]->getEngineGroups()) {
for (auto &engineGroup : deviceFactory.rootDevices[0]->getRegularEngineGroups()) {
uniqueEngineGroupTypes.insert(engineGroup.engineGroupType);
}
EXPECT_EQ(uniqueEngineGroupTypes.size(), deviceFactory.rootDevices[0]->getEngineGroups().size());
EXPECT_EQ(uniqueEngineGroupTypes.size(), deviceFactory.rootDevices[0]->getRegularEngineGroups().size());
}
}
}
@ -633,10 +633,10 @@ HWTEST_F(DeviceHwTest, givenBothCcsAndRcsEnginesInDeviceWhenGettingEngineGroupsT
EngineControl ccsEngine{nullptr, &ccsContext};
MockDevice device{};
ASSERT_EQ(0u, device.getEngineGroups().size());
ASSERT_EQ(0u, device.getRegularEngineGroups().size());
device.addEngineToEngineGroup(ccsEngine);
device.addEngineToEngineGroup(rcsEngine);
auto &engineGroups = device.getEngineGroups();
auto &engineGroups = device.getRegularEngineGroups();
EXPECT_EQ(1u, engineGroups[0].engines.size());
EXPECT_EQ(EngineGroupType::Compute, engineGroups[0].engineGroupType);
EXPECT_EQ(aub_stream::EngineType::ENGINE_CCS, engineGroups[0].engines[0].getEngineType());
@ -644,10 +644,10 @@ HWTEST_F(DeviceHwTest, givenBothCcsAndRcsEnginesInDeviceWhenGettingEngineGroupsT
EXPECT_EQ(EngineGroupType::RenderCompute, engineGroups[1].engineGroupType);
EXPECT_EQ(aub_stream::EngineType::ENGINE_RCS, engineGroups[1].engines[0].getEngineType());
device.getEngineGroups().clear();
device.getRegularEngineGroups().clear();
device.addEngineToEngineGroup(rcsEngine);
device.addEngineToEngineGroup(ccsEngine);
engineGroups = device.getEngineGroups();
engineGroups = device.getRegularEngineGroups();
EXPECT_EQ(1u, engineGroups[0].engines.size());
EXPECT_EQ(EngineGroupType::RenderCompute, engineGroups[0].engineGroupType);
EXPECT_EQ(aub_stream::EngineType::ENGINE_RCS, engineGroups[0].engines[0].getEngineType());
@ -683,7 +683,7 @@ TEST(DeviceGetEngineTest, givenVariousIndicesWhenGettingEngineGroupIndexFromEngi
const auto nonEmptyEngineGroup = std::vector<EngineControl>{EngineControl{nullptr, nullptr}};
auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<Device>(nullptr));
auto &engineGroups = device->getEngineGroups();
auto &engineGroups = device->getRegularEngineGroups();
engineGroups.resize(3);
engineGroups[0].engineGroupType = static_cast<EngineGroupType>(4);
engineGroups[1].engineGroupType = static_cast<EngineGroupType>(3);
@ -702,8 +702,8 @@ TEST(DeviceGetEngineTest, givenDeferredContextInitializationEnabledWhenCreatingE
auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<Device>(nullptr));
const auto defaultEngineType = getChosenEngineType(device->getHardwareInfo());
EXPECT_NE(0u, device->getEngines().size());
for (const EngineControl &engine : device->getEngines()) {
EXPECT_NE(0u, device->getAllEngines().size());
for (const EngineControl &engine : device->getAllEngines()) {
OsContext *osContext = engine.osContext;
const bool isDefaultEngine = defaultEngineType == osContext->getEngineType() && osContext->isRegular();
const bool shouldBeInitialized = osContext->isImmediateContextInitializationEnabled(isDefaultEngine);
@ -716,8 +716,8 @@ TEST(DeviceGetEngineTest, givenDeferredContextInitializationDisabledWhenCreating
DebugManager.flags.DeferOsContextInitialization.set(0);
auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<Device>(nullptr));
EXPECT_NE(0u, device->getEngines().size());
for (const EngineControl &engine : device->getEngines()) {
EXPECT_NE(0u, device->getAllEngines().size());
for (const EngineControl &engine : device->getAllEngines()) {
EXPECT_TRUE(engine.osContext->isInitialized());
}
}

38
opencl/test/unit_test/device/sub_device_tests.cpp
View File

@ -240,9 +240,9 @@ TEST(RootDevicesTest, givenRootDeviceWithoutSubdevicesWhenCreateEnginesThenDevic
auto executionEnvironment = new MockExecutionEnvironment;
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(&hwInfo);
MockDevice device(executionEnvironment, 0);
EXPECT_EQ(0u, device.engines.size());
EXPECT_EQ(0u, device.allEngines.size());
device.createEngines();
EXPECT_EQ(gpgpuEngines.size(), device.engines.size());
EXPECT_EQ(gpgpuEngines.size(), device.allEngines.size());
}
TEST(RootDevicesTest, givenRootDeviceWithSubdevicesWhenCreateEnginesThenDeviceCreatesSpecialEngine) {
@ -252,11 +252,11 @@ TEST(RootDevicesTest, givenRootDeviceWithSubdevicesWhenCreateEnginesThenDeviceCr
auto executionEnvironment = new MockExecutionEnvironment;
MockDevice device(executionEnvironment, 0);
EXPECT_EQ(0u, device.engines.size());
EXPECT_EQ(0u, device.allEngines.size());
device.createSubDevices();
device.createEngines();
EXPECT_EQ(2u, device.getNumGenericSubDevices());
EXPECT_EQ(1u, device.engines.size());
EXPECT_EQ(1u, device.allEngines.size());
}
TEST(SubDevicesTest, givenRootDeviceWithSubDevicesAndLocalMemoryWhenGettingGlobalMemorySizeThenSubDevicesReturnReducedAmountOfGlobalMemAllocSize) {
@ -346,19 +346,19 @@ struct EngineInstancedDeviceTests : public ::testing::Test {
}
bool hasRootCsrOnly(MockDevice *device) {
return ((device->engines.size() == 1) &&
device->engines[0].osContext->isRootDevice());
return ((device->allEngines.size() == 1) &&
device->allEngines[0].osContext->isRootDevice());
}
bool isEngineInstanced(MockSubDevice *subDevice, aub_stream::EngineType engineType, uint32_t subDeviceIndex, DeviceBitfield deviceBitfield) {
bool isEngineInstanced = !subDevice->engines[0].osContext->isRootDevice();
bool isEngineInstanced = !subDevice->allEngines[0].osContext->isRootDevice();
isEngineInstanced &= subDevice->engineInstanced;
isEngineInstanced &= (subDevice->getNumGenericSubDevices() == 0);
isEngineInstanced &= (subDevice->getNumSubDevices() == 0);
isEngineInstanced &= (engineType == subDevice->engineInstancedType);
isEngineInstanced &= (subDeviceIndex == subDevice->getSubDeviceIndex());
isEngineInstanced &= (deviceBitfield == subDevice->getDeviceBitfield());
isEngineInstanced &= (subDevice->getEngines().size() == 1);
isEngineInstanced &= (subDevice->getAllEngines().size() == 1);
return isEngineInstanced;
}
@ -369,7 +369,7 @@ struct EngineInstancedDeviceTests : public ::testing::Test {
auto gpgpuEngines = HwHelper::get(hwInfo.platform.eRenderCoreFamily).getGpgpuEngineInstances(hwInfo);
for (size_t i = 0; i < gpgpuEngines.size(); i++) {
if (device->engines[i].getEngineType() != gpgpuEngines[i].first) {
if (device->allEngines[i].getEngineType() != gpgpuEngines[i].first) {
return false;
}
}
@ -393,7 +393,7 @@ struct EngineInstancedDeviceTests : public ::testing::Test {
template <typename MockDeviceT>
bool hasEngineInstancedEngines(MockDeviceT *device, aub_stream::EngineType engineType) {
if (device->getEngines().size() != 1) {
if (device->getAllEngines().size() != 1) {
return false;
}
@ -402,7 +402,7 @@ struct EngineInstancedDeviceTests : public ::testing::Test {
EXPECT_EQ(EngineUsage::Regular, defaultOsContext->getEngineUsage());
EXPECT_TRUE(defaultOsContext->isDefaultContext());
auto &engine = device->getEngines()[0];
auto &engine = device->getAllEngines()[0];
EXPECT_EQ(engine.getEngineType(), engineType);
EXPECT_TRUE(engine.osContext->isRegular());
@ -505,7 +505,7 @@ TEST_F(EngineInstancedDeviceTests, givenDebugFlagSetWhenCreatingRootDeviceWithGe
auto subDevice = static_cast<MockSubDevice *>(rootDevice->getSubDevice(i));
ASSERT_NE(nullptr, subDevice);
EXPECT_FALSE(subDevice->engines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->allEngines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->engineInstanced);
EXPECT_EQ(0u, subDevice->getNumGenericSubDevices());
EXPECT_EQ(0u, subDevice->getNumSubDevices());
@ -529,7 +529,7 @@ TEST_F(EngineInstancedDeviceTests, givenDebugFlagSetWhenCreatingRootDeviceWithGe
auto subDevice = static_cast<MockSubDevice *>(rootDevice->getSubDevice(i));
ASSERT_NE(nullptr, subDevice);
EXPECT_FALSE(subDevice->engines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->allEngines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->engineInstanced);
EXPECT_EQ(0u, subDevice->getNumGenericSubDevices());
EXPECT_EQ(0u, subDevice->getNumSubDevices());
@ -555,7 +555,7 @@ TEST_F(EngineInstancedDeviceTests, givenDebugFlagSetWhenCreatingRootDeviceWithGe
auto subDevice = static_cast<MockSubDevice *>(rootDevice->getSubDevice(i));
ASSERT_NE(nullptr, subDevice);
EXPECT_FALSE(subDevice->engines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->allEngines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->engineInstanced);
EXPECT_EQ(0u, subDevice->getNumGenericSubDevices());
EXPECT_EQ(ccsCount, subDevice->getNumSubDevices());
@ -697,7 +697,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskSetWhenCreatingDevicesThenFi
ASSERT_NE(nullptr, subDevice);
EXPECT_FALSE(subDevice->engines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->allEngines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->engineInstanced);
EXPECT_EQ(engineInstancedPerGeneric[i], subDevice->getNumSubDevices());
EXPECT_EQ(0u, subDevice->getNumGenericSubDevices());
@ -740,7 +740,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSingle3rdLevelDeviceWhenC
ASSERT_NE(nullptr, subDevice);
EXPECT_FALSE(subDevice->engines[0].osContext->isRootDevice());
EXPECT_FALSE(subDevice->allEngines[0].osContext->isRootDevice());
if (create2ndLevelAsEngineInstanced[i]) {
auto engineType = static_cast<aub_stream::EngineType>(aub_stream::EngineType::ENGINE_CCS + engineInstanced2ndLevelEngineIndex);
@ -792,7 +792,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSingle3rdLevelDeviceOnlyW
DeviceBitfield deviceBitfield = (1llu << genericDeviceIndex);
EXPECT_FALSE(rootDevice->engines[0].osContext->isRootDevice());
EXPECT_FALSE(rootDevice->allEngines[0].osContext->isRootDevice());
EXPECT_TRUE(rootDevice->engineInstanced);
EXPECT_TRUE(rootDevice->getNumGenericSubDevices() == 0);
EXPECT_TRUE(rootDevice->getNumSubDevices() == 0);
@ -821,7 +821,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSingle2rdLevelDeviceOnlyW
DeviceBitfield deviceBitfield = (1llu << genericDeviceIndex);
EXPECT_FALSE(rootDevice->engines[0].osContext->isRootDevice());
EXPECT_FALSE(rootDevice->allEngines[0].osContext->isRootDevice());
EXPECT_TRUE(rootDevice->engineInstanced);
EXPECT_TRUE(rootDevice->getNumGenericSubDevices() == 0);
EXPECT_TRUE(rootDevice->getNumSubDevices() == 0);
@ -1006,7 +1006,7 @@ HWTEST_F(EngineInstancedDeviceTests, whenCreateMultipleCommandQueuesThenEnginesA
const auto engineGroupType = hwHelper.getEngineGroupType(defaultEngine.getEngineType(), defaultEngine.getEngineUsage(), hwInfo);
auto defaultEngineGroupIndex = clRootDevice->getDevice().getEngineGroupIndexFromEngineGroupType(engineGroupType);
auto engines = clRootDevice->getDevice().getEngineGroups()[defaultEngineGroupIndex].engines;
auto engines = clRootDevice->getDevice().getRegularEngineGroups()[defaultEngineGroupIndex].engines;
for (size_t i = 0; i < cmdQs.size(); i++) {
auto engineIndex = i % engines.size();