diff --git a/runtime/device/device.cpp b/runtime/device/device.cpp index cc61f22c7b..a9605173c5 100644 --- a/runtime/device/device.cpp +++ b/runtime/device/device.cpp @@ -177,10 +177,6 @@ const DeviceInfo &Device::getDeviceInfo() const { return deviceInfo; } -const char *Device::getProductAbbrev() const { - return hardwarePrefix[getHardwareInfo().platform.eProductFamily]; -} - double Device::getProfilingTimerResolution() { return osTime->getDynamicDeviceTimerResolution(getHardwareInfo()); } diff --git a/runtime/device/device.h b/runtime/device/device.h index 55c4e5a1c5..d77be33d43 100644 --- a/runtime/device/device.h +++ b/runtime/device/device.h @@ -57,8 +57,6 @@ class Device : public BaseObject<_cl_device_id> { EngineControl &getEngine(aub_stream::EngineType engineType, bool lowPriority); EngineControl &getDefaultEngine(); - const char *getProductAbbrev() const; - // This helper template is meant to simplify getDeviceInfo template void getCap(const void *&src, diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp index ab4ee54a74..94d76d5722 100644 --- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -23,7 +23,7 @@ std::string getAubFileName(const NEO::Device *pDevice, const std::string baseNam const auto pGtSystemInfo = &pDevice->getHardwareInfo().gtSystemInfo; std::stringstream strfilename; uint32_t subSlicesPerSlice = pGtSystemInfo->SubSliceCount / pGtSystemInfo->SliceCount; - strfilename << pDevice->getProductAbbrev() << "_" << pGtSystemInfo->SliceCount << "x" << subSlicesPerSlice << "x" << pGtSystemInfo->MaxEuPerSubSlice << "_" << baseName; + strfilename << hardwarePrefix[pDevice->getHardwareInfo().platform.eProductFamily] << "_" << pGtSystemInfo->SliceCount << "x" << subSlicesPerSlice << "x" << pGtSystemInfo->MaxEuPerSubSlice << "_" << baseName; return strfilename.str(); } diff --git a/unit_tests/mocks/mock_device.cpp b/unit_tests/mocks/mock_device.cpp index 5d41b324c5..00e516dbd4 100644 --- a/unit_tests/mocks/mock_device.cpp +++ b/unit_tests/mocks/mock_device.cpp @@ -31,6 +31,10 @@ MockDevice::MockDevice() initializeCaps(); } +const char *MockDevice::getProductAbbrev() const { + return hardwarePrefix[getHardwareInfo().platform.eProductFamily]; +} + MockDevice::MockDevice(ExecutionEnvironment *executionEnvironment, uint32_t rootDeviceIndex) : RootDevice(executionEnvironment, rootDeviceIndex) { auto &hwInfo = getHardwareInfo(); diff --git a/unit_tests/mocks/mock_device.h b/unit_tests/mocks/mock_device.h index 0a55c63568..e2bddae8ef 100644 --- a/unit_tests/mocks/mock_device.h +++ b/unit_tests/mocks/mock_device.h @@ -67,6 +67,8 @@ class MockDevice : public RootDevice { } } + const char *getProductAbbrev() const; + template UltCommandStreamReceiver &getUltCommandStreamReceiver() { return reinterpret_cast &>(*engines[defaultEngineIndex].commandStreamReceiver);