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

fix: Append device id to ambigous device names

Browse Source 
Related-To: NEO-7537
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2023-01-13 08:35:43 +01:00
committed by Compute-Runtime-Automation
parent e8b0024b5c
commit 91a9b925f7
10 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/cl_device/cl_device.h
View File

@@ -139,7 +139,7 @@ class ClDevice : public BaseObject<_cl_device_id> {
void initializeOpenclCAllVersions();
void initializeOsSpecificCaps();
void setupFp64Flags();
const std::string getClDeviceName(const HardwareInfo &hwInfo) const;
const std::string getClDeviceName() const;
Device &device;
ClDevice &rootClDevice;

4
opencl/source/cl_device/cl_device_caps.cpp
View File

@@ -79,7 +79,7 @@ void ClDevice::initializeCaps() {
if (DebugManager.flags.OverrideDeviceName.get() != "unk") {
name.assign(DebugManager.flags.OverrideDeviceName.get().c_str());
} else {
name = getClDeviceName(hwInfo);
name = getClDeviceName();
if (driverInfo) {
name.assign(driverInfo->getDeviceName(name).c_str());
}
@@ -449,7 +449,7 @@ void ClDevice::initializeOpenclCAllVersions() {
}
}
const std::string ClDevice::getClDeviceName(const HardwareInfo &hwInfo) const {
const std::string ClDevice::getClDeviceName() const {
return this->getDevice().getDeviceInfo().name;
}

4
opencl/test/unit_test/device/device_caps_tests.cpp
View File

@@ -119,7 +119,7 @@ TEST_F(DeviceGetCapsTest, WhenCreatingDeviceThenCapsArePopulatedCorrectly) {
EXPECT_NE(nullptr, caps.builtInKernels);
std::string strDriverName = caps.name;
std::string strDeviceName = device->getClDeviceName(*defaultHwInfo.get());
std::string strDeviceName = device->getClDeviceName();
EXPECT_NE(std::string::npos, strDriverName.find(strDeviceName));
@@ -1230,7 +1230,7 @@ TEST_F(DeviceGetCapsTest, givenSystemWithNoDriverInfoWhenGettingNameAndVersionTh
const auto &caps = device->getDeviceInfo();
std::string tempName = device->getClDeviceName(*defaultHwInfo.get());
std::string tempName = device->getClDeviceName();
#define QTR(a) #a
#define TOSTR(b) QTR(b)

27
opencl/test/unit_test/device/get_device_name_tests.cpp
View File

@@ -16,21 +16,18 @@ using namespace NEO;
using DeviceNameTest = ::testing::Test;
TEST_F(DeviceNameTest, WhenCallingGetClDeviceNameThenReturnDeviceNameWithoutDeviceIdAppendedAtTheEnd) {
auto clDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(defaultHwInfo.get()));
TEST_F(DeviceNameTest, WhenCallingGetClDeviceNameThenReturnDeviceNameFromBaseDevice) {
{
auto clDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(defaultHwInfo.get()));
std::string deviceName = "Intel(R) Graphics";
EXPECT_STREQ(deviceName.c_str(), clDevice->device.getDeviceName(*defaultHwInfo.get()).c_str());
EXPECT_STREQ(clDevice->device.getDeviceName().c_str(), clDevice->getClDeviceName().c_str());
}
EXPECT_STREQ(deviceName.c_str(), clDevice->getClDeviceName(*defaultHwInfo.get()).c_str());
}
TEST_F(DeviceNameTest, GivenDeviceWithNameWhenCallingGetClDeviceNameThenReturnCustomDeviceName) {
HardwareInfo localHwInfo = *defaultHwInfo;
localHwInfo.capabilityTable.deviceName = "Custom Device";
auto clDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&localHwInfo));
std::string deviceName = "Custom Device";
EXPECT_STREQ(deviceName.c_str(), clDevice->device.getDeviceName(localHwInfo).c_str());
{
HardwareInfo localHwInfo = *defaultHwInfo;
localHwInfo.capabilityTable.deviceName = "Custom Device";
auto clDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&localHwInfo));
EXPECT_STREQ(clDevice->device.getDeviceName().c_str(), clDevice->getClDeviceName().c_str());
}
}