intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-21 09:14:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: Match config based on device & rev ID

Browse Source 
This change matches the appropriate aot config
for the combination of device ID and revision ID.

Signed-off-by: Daria Hinz <daria.hinz@intel.com>
Related-To: NEO-7905
This commit is contained in:
Daria Hinz
2023-04-24 14:08:59 +00:00
committed by Compute-Runtime-Automation
parent 6c194e7014
commit 1d64b94f30
19 changed files with 375 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
View File

@@ -546,11 +546,33 @@ TEST_F(MockOfflineCompilerTests, givenProductConfigValueWhenInitHwInfoThenCorrec
EXPECT_EQ(mockOfflineCompiler.deviceConfig, config);
}
TEST_F(MockOfflineCompilerTests, givenDeviceIdAndRevisionIdValueWhenInitHwInfoThenCorrectValuesAreSet) {
TEST_F(MockOfflineCompilerTests, givenDeviceIdsFromDevicesFileWhenInitHwInfoThenDeviceConfigValuesIsSet) {
std::vector<unsigned short> deviceIds{
#define NAMEDDEVICE(devId, ignored_product, ignored_devName) devId,
#define DEVICE(devId, ignored_product) devId,
#include "devices.inl"
#undef DEVICE
#undef NAMEDDEVICE
};
if (deviceIds.empty()) {
GTEST_SKIP();
}
MockOfflineCompiler mockOfflineCompiler;
mockOfflineCompiler.argHelper->getPrinterRef().setSuppressMessages(true);
for (const auto &deviceId : deviceIds) {
std::stringstream deviceIDStr;
deviceIDStr << "0x" << std::hex << deviceId;
mockOfflineCompiler.initHardwareInfo(deviceIDStr.str());
EXPECT_NE(mockOfflineCompiler.deviceConfig, AOT::UNKNOWN_ISA);
}
}
TEST_F(MockOfflineCompilerTests, givenDeviceIdValueWhenInitHwInfoThenCorrectValuesAreSet) {
MockOfflineCompiler mockOfflineCompiler;
uint32_t deviceID = 0;
std::stringstream deviceIDStr, expectedOutput;
std::string deviceStr;
uint32_t productConfig = AOT::UNKNOWN_ISA;
auto &allEnabledDeviceConfigs = mockOfflineCompiler.argHelper->productConfigHelper->getDeviceAotInfo();
if (allEnabledDeviceConfigs.empty()) {
@@ -562,6 +584,42 @@ TEST_F(MockOfflineCompilerTests, givenDeviceIdAndRevisionIdValueWhenInitHwInfoTh
deviceID = deviceMapConfig.deviceIds->front();
deviceIDStr << "0x" << std::hex << deviceID;
deviceStr = mockOfflineCompiler.argHelper->productConfigHelper->getAcronymForProductConfig(deviceMapConfig.aotConfig.value);
productConfig = deviceMapConfig.aotConfig.value;
break;
}
}
mockOfflineCompiler.deviceName = deviceIDStr.str();
EXPECT_FALSE(mockOfflineCompiler.deviceName.empty());
testing::internal::CaptureStdout();
mockOfflineCompiler.initHardwareInfo(mockOfflineCompiler.deviceName);
std::string output = testing::internal::GetCapturedStdout();
expectedOutput << "Auto-detected target based on " << deviceIDStr.str() << " device id: " << deviceStr << "\n";
EXPECT_STREQ(output.c_str(), expectedOutput.str().c_str());
EXPECT_EQ(mockOfflineCompiler.hwInfo.platform.usDeviceID, deviceID);
EXPECT_EQ(mockOfflineCompiler.deviceConfig, productConfig);
}
TEST_F(MockOfflineCompilerTests, givenDeviceIdAndRevisionIdValueWhenInitHwInfoThenCorrectValuesAreSet) {
MockOfflineCompiler mockOfflineCompiler;
uint32_t deviceID = 0;
std::stringstream deviceIDStr, expectedOutput;
std::string deviceStr;
uint32_t productConfig = AOT::UNKNOWN_ISA;
auto &allEnabledDeviceConfigs = mockOfflineCompiler.argHelper->productConfigHelper->getDeviceAotInfo();
if (allEnabledDeviceConfigs.empty()) {
GTEST_SKIP();
}
for (const auto &deviceMapConfig : allEnabledDeviceConfigs) {
if (productFamily == deviceMapConfig.hwInfo->platform.eProductFamily) {
deviceID = deviceMapConfig.deviceIds->front();
deviceIDStr << "0x" << std::hex << deviceID;
deviceStr = mockOfflineCompiler.argHelper->productConfigHelper->getAcronymForProductConfig(deviceMapConfig.aotConfig.value);
productConfig = deviceMapConfig.aotConfig.value;
break;
}
}
@@ -578,6 +636,7 @@ TEST_F(MockOfflineCompilerTests, givenDeviceIdAndRevisionIdValueWhenInitHwInfoTh
EXPECT_STREQ(output.c_str(), expectedOutput.str().c_str());
EXPECT_EQ(mockOfflineCompiler.hwInfo.platform.usDeviceID, deviceID);
EXPECT_EQ(mockOfflineCompiler.hwInfo.platform.usRevId, mockOfflineCompiler.revisionId);
EXPECT_EQ(mockOfflineCompiler.deviceConfig, productConfig);
}
TEST_F(MockOfflineCompilerTests, givenProductConfigValueWhenInitHwInfoThenBaseHardwareInfoValuesAreSet) {