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

Add root device index to aub filename

Browse Source 
Related-To: NEO-3691
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-05-18 16:42:05 +00:00
committed by Compute-Runtime-Automation
parent 4ffe456d85
commit 39b4c873e2
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opencl/source/command_stream/aub_command_stream_receiver.cpp
View File

@ -24,7 +24,7 @@
namespace NEO {
AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE] = {};
std::string AUBCommandStreamReceiver::createFullFilePath(const HardwareInfo &hwInfo, const std::string &filename) {
std::string AUBCommandStreamReceiver::createFullFilePath(const HardwareInfo &hwInfo, const std::string &filename, uint32_t rootDeviceIndex) {
std::string hwPrefix = hardwarePrefix[hwInfo.platform.eProductFamily];
// Generate the full filename
@ -36,7 +36,7 @@ std::string AUBCommandStreamReceiver::createFullFilePath(const HardwareInfo &hwI
if (subDevicesCount > 1) {
strfilename << subDevicesCount << "tx";
}
strfilename << gtSystemInfo.SliceCount << "x" << subSlicesPerSlice << "x" << gtSystemInfo.MaxEuPerSubSlice << "_" << filename << ".aub";
strfilename << gtSystemInfo.SliceCount << "x" << subSlicesPerSlice << "x" << gtSystemInfo.MaxEuPerSubSlice << "_" << rootDeviceIndex << "_" << filename << ".aub";
// clean-up any fileName issues because of the file system incompatibilities
auto fileName = strfilename.str();
@ -57,7 +57,7 @@ CommandStreamReceiver *AUBCommandStreamReceiver::create(const std::string &baseN
uint32_t rootDeviceIndex,
const DeviceBitfield deviceBitfield) {
auto hwInfo = executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo();
std::string filePath = AUBCommandStreamReceiver::createFullFilePath(*hwInfo, baseName);
std::string filePath = AUBCommandStreamReceiver::createFullFilePath(*hwInfo, baseName, rootDeviceIndex);
if (DebugManager.flags.AUBDumpCaptureFileName.get() != "unk") {
filePath.assign(DebugManager.flags.AUBDumpCaptureFileName.get());
}

2
opencl/source/command_stream/aub_command_stream_receiver.h
View File

@ -23,7 +23,7 @@ struct AUBCommandStreamReceiver {
ExecutionEnvironment &executionEnvironment,
uint32_t rootDeviceIndex,
const DeviceBitfield deviceBitfield);
static std::string createFullFilePath(const HardwareInfo &hwInfo, const std::string &filename);
static std::string createFullFilePath(const HardwareInfo &hwInfo, const std::string &filename, uint32_t rootDeviceIndex);
using AubFileStream = AubMemDump::AubFileStream;
};

2
opencl/source/command_stream/tbx_command_stream_receiver_hw.inl
View File

@ -164,7 +164,7 @@ CommandStreamReceiver *TbxCommandStreamReceiverHw<GfxFamily>::create(const std::
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
if (withAubDump) {
auto localMemoryEnabled = hwHelper.getEnableLocalMemory(hwInfo);
auto fullName = AUBCommandStreamReceiver::createFullFilePath(hwInfo, baseName);
auto fullName = AUBCommandStreamReceiver::createFullFilePath(hwInfo, baseName, rootDeviceIndex);
if (DebugManager.flags.AUBDumpCaptureFileName.get() != "unk") {
fullName.assign(DebugManager.flags.AUBDumpCaptureFileName.get());
}