Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Remove old aub_mem_dump logic and related tests 

Related-To: NEO-14718

Signed-off-by: Aleksandra Nizio <aleksandra.nizio@intel.com>
This commit is contained in:
Aleksandra Nizio 2025-05-12 14:53:41 +00:00 committed by Compute-Runtime-Automation
parent c703983110
commit fa1e3fd6a2
26 changed files with 343 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opencl/test/unit_test/api/cl_enqueue_verify_memory.inl
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019-2024 Intel Corporation * Copyright (C) 2019-2025 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@ -13,10 +13,7 @@
#include "opencl/test/unit_test/api/cl_api_tests.h" #include "opencl/test/unit_test/api/cl_api_tests.h"
using namespace NEO; using namespace NEO;
namespace AubMemDump {
#include "aub_services.h" #include "aub_services.h"
}
TEST(CheckVerifyMemoryRelatedApiConstants, givenVerifyMemoryRelatedApiConstantsWhenVerifyingTheirValueThenCorrectValuesAreReturned) { TEST(CheckVerifyMemoryRelatedApiConstants, givenVerifyMemoryRelatedApiConstantsWhenVerifyingTheirValueThenCorrectValuesAreReturned) {
EXPECT_EQ(AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual, CL_MEM_COMPARE_EQUAL); EXPECT_EQ(AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual, CL_MEM_COMPARE_EQUAL);

7
shared/source/aub_mem_dump/aub_header.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2023 Intel Corporation * Copyright (C) 2018-2025 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@ -14,7 +14,7 @@
#else #else
#pragma pack(push, 4) #pragma pack(push, 4)
#endif #endif
namespace AubMemDump {
inline void setMisalignedUint64(uint64_t *address, const uint64_t value) { inline void setMisalignedUint64(uint64_t *address, const uint64_t value) {
uint32_t *addressBits = reinterpret_cast<uint32_t *>(address); uint32_t *addressBits = reinterpret_cast<uint32_t *>(address);
addressBits[0] = static_cast<uint32_t>(value); addressBits[0] = static_cast<uint32_t>(value);
@ -62,7 +62,6 @@ struct AubCmdDumpBmpHd {
} }
}; };
static_assert(44 == sizeof(AubCmdDumpBmpHd), "Invalid size for AubCmdDumpBmpHd"); static_assert(44 == sizeof(AubCmdDumpBmpHd), "Invalid size for AubCmdDumpBmpHd");
struct AubPpgttContextCreate { struct AubPpgttContextCreate {
AubCmdHdr header; AubCmdHdr header;
uint32_t handle; uint32_t handle;
@ -112,7 +111,7 @@ struct AubCaptureBinaryDumpHD {
} }
}; };
static_assert(56 == sizeof(AubCaptureBinaryDumpHD), "Invalid size for AubCaptureBinaryDumpHD"); static_assert(56 == sizeof(AubCaptureBinaryDumpHD), "Invalid size for AubCaptureBinaryDumpHD");
} // namespace AubMemDump
#ifndef WIN32 #ifndef WIN32
#pragma pack() #pragma pack()
#else #else

6
shared/source/aub_mem_dump/aub_mem_dump.h
View File

@ -9,16 +9,14 @@
#include "shared/source/aub_mem_dump/aub_data.h" #include "shared/source/aub_mem_dump/aub_data.h"
#include <fstream> #include <fstream>
#include <mutex>
#include <string> #include <string>
namespace NEO { namespace NEO {
class AubHelper; class AubHelper;
} }
namespace AubMemDump {
#include "aub_services.h" #include "aub_services.h"
namespace AubMemDump {
inline constexpr uint32_t rcsRegisterBase = 0x2000; inline constexpr uint32_t rcsRegisterBase = 0x2000;
#ifndef BIT #ifndef BIT
@ -137,11 +135,9 @@ struct AubFileStream : public AubStream {
MOCKABLE_VIRTUAL void expectMemory(uint64_t physAddress, const void *memory, size_t size, MOCKABLE_VIRTUAL void expectMemory(uint64_t physAddress, const void *memory, size_t size,
uint32_t addressSpace, uint32_t compareOperation); uint32_t addressSpace, uint32_t compareOperation);
MOCKABLE_VIRTUAL bool addComment(const char *message); MOCKABLE_VIRTUAL bool addComment(const char *message);
[[nodiscard]] MOCKABLE_VIRTUAL std::unique_lock<std::mutex> lockStream();
std::ofstream fileHandle; std::ofstream fileHandle;
std::string fileName; std::string fileName;
std::mutex mutex;
}; };
template <int addressingBits> template <int addressingBits>

3
shared/source/aub_mem_dump/definitions/aub_services.h
View File

@ -16,7 +16,7 @@
#else #else
#pragma pack(push, 4) #pragma pack(push, 4)
#endif #endif
namespace AubMemDump {
struct CmdServicesMemTraceVersion { struct CmdServicesMemTraceVersion {
union { union {
AubCmdHdr header; AubCmdHdr header;
@ -1445,6 +1445,7 @@ struct CmdServicesMemTraceDumpCompress {
TrmodeYs = 2 }; TrmodeYs = 2 };
}; };
}; };
} // namespace AubMemDump
#ifndef WIN32 #ifndef WIN32
#pragma pack() #pragma pack()
#else #else

8
shared/source/command_stream/aub_command_stream_receiver.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2024 Intel Corporation * Copyright (C) 2018-2025 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@ -8,6 +8,7 @@
#include "shared/source/command_stream/aub_command_stream_receiver.h" #include "shared/source/command_stream/aub_command_stream_receiver.h"
#include "shared/source/aub/aub_helper.h" #include "shared/source/aub/aub_helper.h"
#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/execution_environment.h"
#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/execution_environment/root_device_environment.h"
@ -300,9 +301,4 @@ bool AubFileStream::addComment(const char *message) {
} }
return true; return true;
} }
std::unique_lock<std::mutex> AubFileStream::lockStream() {
return std::unique_lock<std::mutex>(mutex);
}
} // namespace AubMemDump } // namespace AubMemDump

8
shared/source/command_stream/aub_command_stream_receiver_hw.h
View File

@ -9,6 +9,8 @@
#include "shared/source/command_stream/command_stream_receiver_simulated_hw.h" #include "shared/source/command_stream/command_stream_receiver_simulated_hw.h"
#include "shared/source/memory_manager/residency_container.h" #include "shared/source/memory_manager/residency_container.h"
#include <mutex>
namespace NEO { namespace NEO {
class PDPE; class PDPE;
class PML4; class PML4;
@ -106,6 +108,12 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa
int getAddressSpaceFromPTEBits(uint64_t entryBits) const; int getAddressSpaceFromPTEBits(uint64_t entryBits) const;
std::mutex mutex;
[[nodiscard]] MOCKABLE_VIRTUAL std::unique_lock<std::mutex> lockStream() {
return std::unique_lock<std::mutex>(mutex);
}
protected: protected:
constexpr static uint32_t getMaskAndValueForPollForCompletion(); constexpr static uint32_t getMaskAndValueForPollForCompletion();

21
shared/source/command_stream/aub_command_stream_receiver_hw_base.inl
View File

@ -104,13 +104,13 @@ AUBCommandStreamReceiverHw<GfxFamily>::~AUBCommandStreamReceiverHw() {
template <typename GfxFamily> template <typename GfxFamily>
void AUBCommandStreamReceiverHw<GfxFamily>::openFile(const std::string &fileName) { void AUBCommandStreamReceiverHw<GfxFamily>::openFile(const std::string &fileName) {
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
initFile(fileName); initFile(fileName);
} }
template <typename GfxFamily> template <typename GfxFamily>
bool AUBCommandStreamReceiverHw<GfxFamily>::reopenFile(const std::string &fileName) { bool AUBCommandStreamReceiverHw<GfxFamily>::reopenFile(const std::string &fileName) {
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (isFileOpen()) { if (isFileOpen()) {
if (fileName != getFileName()) { if (fileName != getFileName()) {
@ -182,7 +182,7 @@ const std::string AUBCommandStreamReceiverHw<GfxFamily>::getFileName() {
template <typename GfxFamily> template <typename GfxFamily>
void AUBCommandStreamReceiverHw<GfxFamily>::initializeEngine() { void AUBCommandStreamReceiverHw<GfxFamily>::initializeEngine() {
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
isEngineInitialized = true; isEngineInitialized = true;
if (hardwareContextController) { if (hardwareContextController) {
@ -426,7 +426,7 @@ bool AUBCommandStreamReceiverHw<GfxFamily>::addPatchInfoComments() {
template <typename GfxFamily> template <typename GfxFamily>
void AUBCommandStreamReceiverHw<GfxFamily>::submitBatchBufferAub(uint64_t batchBufferGpuAddress, const void *batchBuffer, size_t batchBufferSize, uint32_t memoryBank, uint64_t entryBits) { void AUBCommandStreamReceiverHw<GfxFamily>::submitBatchBufferAub(uint64_t batchBufferGpuAddress, const void *batchBuffer, size_t batchBufferSize, uint32_t memoryBank, uint64_t entryBits) {
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (hardwareContextController) { if (hardwareContextController) {
if (batchBufferSize) { if (batchBufferSize) {
@ -602,7 +602,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::pollForCompletionImpl() {
} }
} }
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (hardwareContextController) { if (hardwareContextController) {
hardwareContextController->pollForCompletion(); hardwareContextController->pollForCompletion();
@ -682,7 +682,7 @@ bool AUBCommandStreamReceiverHw<GfxFamily>::writeMemory(GraphicsAllocation &gfxA
return false; return false;
} }
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (aubManager) { if (aubManager) {
this->writeMemoryWithAubManager(gfxAllocation, isChunkCopy, gpuVaChunkOffset, chunkSize); this->writeMemoryWithAubManager(gfxAllocation, isChunkCopy, gpuVaChunkOffset, chunkSize);
@ -712,7 +712,7 @@ bool AUBCommandStreamReceiverHw<GfxFamily>::writeMemory(AllocationView &allocati
template <typename GfxFamily> template <typename GfxFamily>
void AUBCommandStreamReceiverHw<GfxFamily>::writeMMIO(uint32_t offset, uint32_t value) { void AUBCommandStreamReceiverHw<GfxFamily>::writeMMIO(uint32_t offset, uint32_t value) {
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (hardwareContextController) { if (hardwareContextController) {
hardwareContextController->writeMMIO(offset, value); hardwareContextController->writeMMIO(offset, value);
@ -733,7 +733,7 @@ bool AUBCommandStreamReceiverHw<GfxFamily>::expectMemory(const void *gfxAddress,
size_t length, uint32_t compareOperation) { size_t length, uint32_t compareOperation) {
pollForCompletion(); pollForCompletion();
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (hardwareContextController) { if (hardwareContextController) {
hardwareContextController->expectMemory(reinterpret_cast<uint64_t>(gfxAddress), srcAddress, length, compareOperation); hardwareContextController->expectMemory(reinterpret_cast<uint64_t>(gfxAddress), srcAddress, length, compareOperation);
@ -807,7 +807,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::dumpAllocation(GraphicsAllocation &g
pollForCompletion(); pollForCompletion();
} }
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (hardwareContextController) { if (hardwareContextController) {
auto surfaceInfo = std::unique_ptr<aub_stream::SurfaceInfo>(AubAllocDump::getDumpSurfaceInfo<GfxFamily>(gfxAllocation, *this->peekGmmHelper(), dumpFormat)); auto surfaceInfo = std::unique_ptr<aub_stream::SurfaceInfo>(AubAllocDump::getDumpSurfaceInfo<GfxFamily>(gfxAllocation, *this->peekGmmHelper(), dumpFormat));
@ -838,11 +838,12 @@ AubSubCaptureStatus AUBCommandStreamReceiverHw<GfxFamily>::checkAndActivateAubSu
template <typename GfxFamily> template <typename GfxFamily>
void AUBCommandStreamReceiverHw<GfxFamily>::addAubComment(const char *message) { void AUBCommandStreamReceiverHw<GfxFamily>::addAubComment(const char *message) {
auto streamLocked = getAubStream()->lockStream(); auto streamLocked = lockStream();
if (aubManager) { if (aubManager) {
aubManager->addComment(message); aubManager->addComment(message);
return; return;
} }
getAubStream()->addComment(message); getAubStream()->addComment(message);
} }

6
shared/source/command_stream/command_stream_receiver.cpp
View File

@ -42,13 +42,11 @@
#include "shared/source/utilities/tag_allocator.h" #include "shared/source/utilities/tag_allocator.h"
#include "shared/source/utilities/wait_util.h" #include "shared/source/utilities/wait_util.h"
#include "aub_services.h"
#include <array> #include <array>
#include <iostream> #include <iostream>
namespace AubMemDump {
#include "aub_services.h"
}
namespace NEO { namespace NEO {
// Global table of CommandStreamReceiver factories for HW and tests // Global table of CommandStreamReceiver factories for HW and tests

80
shared/source/gen12lp/hw_info_adln.cpp
View File

@ -33,46 +33,46 @@ const PLATFORM ADLN::platform = {
const RuntimeCapabilityTable ADLN::capabilityTable{ const RuntimeCapabilityTable ADLN::capabilityTable{
EngineDirectSubmissionInitVec{ EngineDirectSubmissionInitVec{
{aub_stream::ENGINE_RCS, {true, true}}, {aub_stream::ENGINE_RCS, {true, true}},
{aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines
{0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties
MemoryConstants::max64BitAppAddress, // gpuAddressSpace MemoryConstants::max64BitAppAddress, // gpuAddressSpace
0, // sharedSystemMemCapabilities 0, // sharedSystemMemCapabilities
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"", // deviceName "", // deviceName
nullptr, // preferredPlatformName nullptr, // preferredPlatformName
PreemptionMode::ThreadGroup, // defaultPreemptionMode PreemptionMode::ThreadGroup, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType aub_stream::ENGINE_RCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Adln, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Adln, // aubDeviceId
1, // extraQuantityThreadsPerEU 1, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(ADLN::GRF), // grfSize sizeof(ADLN::GRF), // grfSize
36u, // timestampValidBits 36u, // timestampValidBits
32u, // kernelTimestampValidBits 32u, // kernelTimestampValidBits
false, // blitterOperationsSupported false, // blitterOperationsSupported
true, // ftrSupportsInteger64BitAtomics true, // ftrSupportsInteger64BitAtomics
false, // ftrSupportsFP64 false, // ftrSupportsFP64
false, // ftrSupportsFP64Emulation false, // ftrSupportsFP64Emulation
false, // ftrSupports64BitMath false, // ftrSupports64BitMath
false, // ftrSupportsCoherency false, // ftrSupportsCoherency
false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedBuffers
false, // ftrRenderCompressedImages false, // ftrRenderCompressedImages
true, // instrumentationEnabled true, // instrumentationEnabled
true, // ftr64KBpages true, // ftr64KBpages
false, // supportCacheFlushAfterWalker false, // supportCacheFlushAfterWalker
true, // supportsImages true, // supportsImages
true, // supportsOcl21Features true, // supportsOcl21Features
false, // supportsOnDemandPageFaults false, // supportsOnDemandPageFaults
false, // supportsIndependentForwardProgress false, // supportsIndependentForwardProgress
true, // isIntegratedDevice true, // isIntegratedDevice
true, // supportsMediaBlock true, // supportsMediaBlock
false, // p2pAccessSupported false, // p2pAccessSupported
false, // p2pAtomicAccessSupported false, // p2pAtomicAccessSupported
true, // fusedEuEnabled true, // fusedEuEnabled
false, // l0DebuggerSupported; false, // l0DebuggerSupported;
true, // supportsFloatAtomics true, // supportsFloatAtomics
0 // cxlType 0 // cxlType
}; };
WorkaroundTable ADLN::workaroundTable = {}; WorkaroundTable ADLN::workaroundTable = {};

80
shared/source/gen12lp/hw_info_adlp.cpp
View File

@ -33,46 +33,46 @@ const PLATFORM ADLP::platform = {
const RuntimeCapabilityTable ADLP::capabilityTable{ const RuntimeCapabilityTable ADLP::capabilityTable{
EngineDirectSubmissionInitVec{ EngineDirectSubmissionInitVec{
{aub_stream::ENGINE_RCS, {true, true}}, {aub_stream::ENGINE_RCS, {true, true}},
{aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines
{0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties
MemoryConstants::max64BitAppAddress, // gpuAddressSpace MemoryConstants::max64BitAppAddress, // gpuAddressSpace
0, // sharedSystemMemCapabilities 0, // sharedSystemMemCapabilities
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"", // deviceName "", // deviceName
nullptr, // preferredPlatformName nullptr, // preferredPlatformName
PreemptionMode::ThreadGroup, // defaultPreemptionMode PreemptionMode::ThreadGroup, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType aub_stream::ENGINE_RCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Adlp, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Adlp, // aubDeviceId
1, // extraQuantityThreadsPerEU 1, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(ADLP::GRF), // grfSize sizeof(ADLP::GRF), // grfSize
36u, // timestampValidBits 36u, // timestampValidBits
32u, // kernelTimestampValidBits 32u, // kernelTimestampValidBits
false, // blitterOperationsSupported false, // blitterOperationsSupported
true, // ftrSupportsInteger64BitAtomics true, // ftrSupportsInteger64BitAtomics
false, // ftrSupportsFP64 false, // ftrSupportsFP64
false, // ftrSupportsFP64Emulation false, // ftrSupportsFP64Emulation
false, // ftrSupports64BitMath false, // ftrSupports64BitMath
false, // ftrSupportsCoherency false, // ftrSupportsCoherency
false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedBuffers
false, // ftrRenderCompressedImages false, // ftrRenderCompressedImages
true, // instrumentationEnabled true, // instrumentationEnabled
true, // ftr64KBpages true, // ftr64KBpages
false, // supportCacheFlushAfterWalker false, // supportCacheFlushAfterWalker
true, // supportsImages true, // supportsImages
true, // supportsOcl21Features true, // supportsOcl21Features
false, // supportsOnDemandPageFaults false, // supportsOnDemandPageFaults
false, // supportsIndependentForwardProgress false, // supportsIndependentForwardProgress
true, // isIntegratedDevice true, // isIntegratedDevice
true, // supportsMediaBlock true, // supportsMediaBlock
false, // p2pAccessSupported false, // p2pAccessSupported
false, // p2pAtomicAccessSupported false, // p2pAtomicAccessSupported
true, // fusedEuEnabled true, // fusedEuEnabled
false, // l0DebuggerSupported; false, // l0DebuggerSupported;
true, // supportsFloatAtomics true, // supportsFloatAtomics
0 // cxlType 0 // cxlType
}; };
WorkaroundTable ADLP::workaroundTable = {}; WorkaroundTable ADLP::workaroundTable = {};

80
shared/source/gen12lp/hw_info_adls.cpp
View File

@ -33,46 +33,46 @@ const PLATFORM ADLS::platform = {
const RuntimeCapabilityTable ADLS::capabilityTable{ const RuntimeCapabilityTable ADLS::capabilityTable{
EngineDirectSubmissionInitVec{ EngineDirectSubmissionInitVec{
{aub_stream::ENGINE_RCS, {true, true}}, {aub_stream::ENGINE_RCS, {true, true}},
{aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines
{0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties
MemoryConstants::max64BitAppAddress, // gpuAddressSpace MemoryConstants::max64BitAppAddress, // gpuAddressSpace
0, // sharedSystemMemCapabilities 0, // sharedSystemMemCapabilities
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"", // deviceName "", // deviceName
nullptr, // preferredPlatformName nullptr, // preferredPlatformName
PreemptionMode::ThreadGroup, // defaultPreemptionMode PreemptionMode::ThreadGroup, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType aub_stream::ENGINE_RCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Adls, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Adls, // aubDeviceId
1, // extraQuantityThreadsPerEU 1, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(ADLS::GRF), // grfSize sizeof(ADLS::GRF), // grfSize
36u, // timestampValidBits 36u, // timestampValidBits
32u, // kernelTimestampValidBits 32u, // kernelTimestampValidBits
false, // blitterOperationsSupported false, // blitterOperationsSupported
true, // ftrSupportsInteger64BitAtomics true, // ftrSupportsInteger64BitAtomics
false, // ftrSupportsFP64 false, // ftrSupportsFP64
false, // ftrSupportsFP64Emulation false, // ftrSupportsFP64Emulation
false, // ftrSupports64BitMath false, // ftrSupports64BitMath
false, // ftrSupportsCoherency false, // ftrSupportsCoherency
false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedBuffers
false, // ftrRenderCompressedImages false, // ftrRenderCompressedImages
true, // instrumentationEnabled true, // instrumentationEnabled
true, // ftr64KBpages true, // ftr64KBpages
false, // supportCacheFlushAfterWalker false, // supportCacheFlushAfterWalker
true, // supportsImages true, // supportsImages
true, // supportsOcl21Features true, // supportsOcl21Features
false, // supportsOnDemandPageFaults false, // supportsOnDemandPageFaults
false, // supportsIndependentForwardProgress false, // supportsIndependentForwardProgress
true, // isIntegratedDevice true, // isIntegratedDevice
true, // supportsMediaBlock true, // supportsMediaBlock
false, // p2pAccessSupported false, // p2pAccessSupported
false, // p2pAtomicAccessSupported false, // p2pAtomicAccessSupported
true, // fusedEuEnabled true, // fusedEuEnabled
false, // l0DebuggerSupported; false, // l0DebuggerSupported;
true, // supportsFloatAtomics true, // supportsFloatAtomics
0 // cxlType 0 // cxlType
}; };
WorkaroundTable ADLS::workaroundTable = {}; WorkaroundTable ADLS::workaroundTable = {};

80
shared/source/gen12lp/hw_info_dg1.cpp
View File

@ -33,46 +33,46 @@ const PLATFORM DG1::platform = {
const RuntimeCapabilityTable DG1::capabilityTable{ const RuntimeCapabilityTable DG1::capabilityTable{
EngineDirectSubmissionInitVec{ EngineDirectSubmissionInitVec{
{aub_stream::ENGINE_RCS, {true, true}}, {aub_stream::ENGINE_RCS, {true, true}},
{aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines
{0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties
MemoryConstants::max64BitAppAddress, // gpuAddressSpace MemoryConstants::max64BitAppAddress, // gpuAddressSpace
0, // sharedSystemMemCapabilities 0, // sharedSystemMemCapabilities
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"", // deviceName "", // deviceName
nullptr, // preferredPlatformName nullptr, // preferredPlatformName
PreemptionMode::ThreadGroup, // defaultPreemptionMode PreemptionMode::ThreadGroup, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType aub_stream::ENGINE_RCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Dg1, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Dg1, // aubDeviceId
1, // extraQuantityThreadsPerEU 1, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(DG1::GRF), // grfSize sizeof(DG1::GRF), // grfSize
36u, // timestampValidBits 36u, // timestampValidBits
32u, // kernelTimestampValidBits 32u, // kernelTimestampValidBits
false, // blitterOperationsSupported false, // blitterOperationsSupported
true, // ftrSupportsInteger64BitAtomics true, // ftrSupportsInteger64BitAtomics
false, // ftrSupportsFP64 false, // ftrSupportsFP64
false, // ftrSupportsFP64Emulation false, // ftrSupportsFP64Emulation
false, // ftrSupports64BitMath false, // ftrSupports64BitMath
false, // ftrSupportsCoherency false, // ftrSupportsCoherency
false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedBuffers
false, // ftrRenderCompressedImages false, // ftrRenderCompressedImages
true, // ftr64KBpages true, // ftr64KBpages
true, // instrumentationEnabled true, // instrumentationEnabled
true, // supportCacheFlushAfterWalker true, // supportCacheFlushAfterWalker
true, // supportsImages, true, // supportsImages,
true, // supportsOcl21Features true, // supportsOcl21Features
false, // supportsOnDemandPageFaults false, // supportsOnDemandPageFaults
false, // supportsIndependentForwardProgress false, // supportsIndependentForwardProgress
false, // isIntegratedDevice false, // isIntegratedDevice
true, // supportsMediaBlock true, // supportsMediaBlock
true, // p2pAccessSupported true, // p2pAccessSupported
false, // p2pAtomicAccessSupported false, // p2pAtomicAccessSupported
true, // fusedEuEnabled true, // fusedEuEnabled
true, // l0DebuggerSupported; true, // l0DebuggerSupported;
true, // supportsFloatAtomics true, // supportsFloatAtomics
0 // cxlType 0 // cxlType
}; };
WorkaroundTable DG1::workaroundTable = {}; WorkaroundTable DG1::workaroundTable = {};

80
shared/source/gen12lp/hw_info_rkl.cpp
View File

@ -33,46 +33,46 @@ const PLATFORM RKL::platform = {
const RuntimeCapabilityTable RKL::capabilityTable{ const RuntimeCapabilityTable RKL::capabilityTable{
EngineDirectSubmissionInitVec{ EngineDirectSubmissionInitVec{
{aub_stream::ENGINE_RCS, {true, true}}, {aub_stream::ENGINE_RCS, {true, true}},
{aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines
{0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties
MemoryConstants::max48BitAddress, // gpuAddressSpace MemoryConstants::max48BitAddress, // gpuAddressSpace
0, // sharedSystemMemCapabilities 0, // sharedSystemMemCapabilities
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"", // deviceName "", // deviceName
nullptr, // preferredPlatformName nullptr, // preferredPlatformName
PreemptionMode::ThreadGroup, // defaultPreemptionMode PreemptionMode::ThreadGroup, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType aub_stream::ENGINE_RCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Tgllp, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Tgllp, // aubDeviceId
1, // extraQuantityThreadsPerEU 1, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(RKL::GRF), // grfSize sizeof(RKL::GRF), // grfSize
36u, // timestampValidBits 36u, // timestampValidBits
32u, // kernelTimestampValidBits 32u, // kernelTimestampValidBits
false, // blitterOperationsSupported false, // blitterOperationsSupported
true, // ftrSupportsInteger64BitAtomics true, // ftrSupportsInteger64BitAtomics
false, // ftrSupportsFP64 false, // ftrSupportsFP64
false, // ftrSupportsFP64Emulation false, // ftrSupportsFP64Emulation
false, // ftrSupports64BitMath false, // ftrSupports64BitMath
false, // ftrSupportsCoherency false, // ftrSupportsCoherency
false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedBuffers
false, // ftrRenderCompressedImages false, // ftrRenderCompressedImages
true, // ftr64KBpages true, // ftr64KBpages
true, // instrumentationEnabled true, // instrumentationEnabled
false, // supportCacheFlushAfterWalker false, // supportCacheFlushAfterWalker
true, // supportsImages true, // supportsImages
true, // supportsOcl21Features true, // supportsOcl21Features
false, // supportsOnDemandPageFaults false, // supportsOnDemandPageFaults
false, // supportsIndependentForwardProgress false, // supportsIndependentForwardProgress
true, // isIntegratedDevice true, // isIntegratedDevice
true, // supportsMediaBlock true, // supportsMediaBlock
false, // p2pAccessSupported false, // p2pAccessSupported
false, // p2pAtomicAccessSupported false, // p2pAtomicAccessSupported
true, // fusedEuEnabled true, // fusedEuEnabled
false, // l0DebuggerSupported; false, // l0DebuggerSupported;
true, // supportsFloatAtomics true, // supportsFloatAtomics
0 // cxlType 0 // cxlType
}; };
WorkaroundTable RKL::workaroundTable = {}; WorkaroundTable RKL::workaroundTable = {};

80
shared/source/gen12lp/hw_info_tgllp.cpp
View File

@ -33,46 +33,46 @@ const PLATFORM TGLLP::platform = {
const RuntimeCapabilityTable TGLLP::capabilityTable{ const RuntimeCapabilityTable TGLLP::capabilityTable{
EngineDirectSubmissionInitVec{ EngineDirectSubmissionInitVec{
{aub_stream::ENGINE_RCS, {true, true}}, {aub_stream::ENGINE_RCS, {true, true}},
{aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines {aub_stream::ENGINE_CCS, {true, true}}}, // directSubmissionEngines
{0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties
MemoryConstants::max64BitAppAddress, // gpuAddressSpace MemoryConstants::max64BitAppAddress, // gpuAddressSpace
0, // sharedSystemMemCapabilities 0, // sharedSystemMemCapabilities
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"", // deviceName "", // deviceName
nullptr, // preferredPlatformName nullptr, // preferredPlatformName
PreemptionMode::ThreadGroup, // defaultPreemptionMode PreemptionMode::ThreadGroup, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType aub_stream::ENGINE_RCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Tgllp, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Tgllp, // aubDeviceId
1, // extraQuantityThreadsPerEU 1, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(TGLLP::GRF), // grfSize sizeof(TGLLP::GRF), // grfSize
36u, // timestampValidBits 36u, // timestampValidBits
32u, // kernelTimestampValidBits 32u, // kernelTimestampValidBits
false, // blitterOperationsSupported false, // blitterOperationsSupported
true, // ftrSupportsInteger64BitAtomics true, // ftrSupportsInteger64BitAtomics
false, // ftrSupportsFP64 false, // ftrSupportsFP64
false, // ftrSupportsFP64Emulation false, // ftrSupportsFP64Emulation
false, // ftrSupports64BitMath false, // ftrSupports64BitMath
false, // ftrSupportsCoherency false, // ftrSupportsCoherency
false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedBuffers
false, // ftrRenderCompressedImages false, // ftrRenderCompressedImages
true, // instrumentationEnabled true, // instrumentationEnabled
true, // ftr64KBpages true, // ftr64KBpages
false, // supportCacheFlushAfterWalker false, // supportCacheFlushAfterWalker
true, // supportsImages true, // supportsImages
true, // supportsOcl21Features true, // supportsOcl21Features
false, // supportsOnDemandPageFaults false, // supportsOnDemandPageFaults
false, // supportsIndependentForwardProgress false, // supportsIndependentForwardProgress
true, // isIntegratedDevice true, // isIntegratedDevice
true, // supportsMediaBlock true, // supportsMediaBlock
false, // p2pAccessSupported false, // p2pAccessSupported
false, // p2pAtomicAccessSupported false, // p2pAtomicAccessSupported
true, // fusedEuEnabled true, // fusedEuEnabled
false, // l0DebuggerSupported; false, // l0DebuggerSupported;
true, // supportsFloatAtomics true, // supportsFloatAtomics
0 // cxlType 0 // cxlType
}; };
WorkaroundTable TGLLP::workaroundTable = {}; WorkaroundTable TGLLP::workaroundTable = {};

80
shared/source/xe2_hpg_core/hw_info_bmg.cpp
View File

@ -36,46 +36,46 @@ const RuntimeCapabilityTable BMG::capabilityTable{
EngineDirectSubmissionInitVec{ EngineDirectSubmissionInitVec{
{aub_stream::ENGINE_CCS, {true, false, false, true}}, {aub_stream::ENGINE_CCS, {true, false, false, true}},
{aub_stream::ENGINE_CCS1, {true, false, true, true}}, {aub_stream::ENGINE_CCS1, {true, false, true, true}},
{aub_stream::ENGINE_BCS, {true, false, true, true}}}, // directSubmissionEngines {aub_stream::ENGINE_BCS, {true, false, true, true}}}, // directSubmissionEngines
{0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties {0, 0, 0, 0, false, false, false, false}, // kmdNotifyProperties
MemoryConstants::max48BitAddress, // gpuAddressSpace MemoryConstants::max48BitAddress, // gpuAddressSpace
0, // sharedSystemMemCapabilities 0, // sharedSystemMemCapabilities
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"", // deviceName "", // deviceName
nullptr, // preferredPlatformName nullptr, // preferredPlatformName
PreemptionMode::MidThread, // defaultPreemptionMode PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_CCS, // defaultEngineType aub_stream::ENGINE_CCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Bmg, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Bmg, // aubDeviceId
0, // extraQuantityThreadsPerEU 0, // extraQuantityThreadsPerEU
128, // maxProgrammableSlmSize 128, // maxProgrammableSlmSize
sizeof(BMG::GRF), // grfSize sizeof(BMG::GRF), // grfSize
64, // timestampValidBits 64, // timestampValidBits
64, // kernelTimestampValidBits 64, // kernelTimestampValidBits
false, // blitterOperationsSupported false, // blitterOperationsSupported
true, // ftrSupportsInteger64BitAtomics true, // ftrSupportsInteger64BitAtomics
true, // ftrSupportsFP64 true, // ftrSupportsFP64
false, // ftrSupportsFP64Emulation false, // ftrSupportsFP64Emulation
true, // ftrSupports64BitMath true, // ftrSupports64BitMath
false, // ftrSupportsCoherency false, // ftrSupportsCoherency
false, // ftrRenderCompressedBuffers false, // ftrRenderCompressedBuffers
false, // ftrRenderCompressedImages false, // ftrRenderCompressedImages
true, // ftr64KBpages true, // ftr64KBpages
true, // instrumentationEnabled true, // instrumentationEnabled
false, // supportCacheFlushAfterWalker false, // supportCacheFlushAfterWalker
true, // supportsImages true, // supportsImages
true, // supportsOcl21Features true, // supportsOcl21Features
true, // supportsOnDemandPageFaults true, // supportsOnDemandPageFaults
true, // supportsIndependentForwardProgress true, // supportsIndependentForwardProgress
false, // isIntegratedDevice false, // isIntegratedDevice
false, // supportsMediaBlock false, // supportsMediaBlock
false, // p2pAccessSupported false, // p2pAccessSupported
false, // p2pAtomicAccessSupported false, // p2pAtomicAccessSupported
false, // fusedEuEnabled false, // fusedEuEnabled
true, // l0DebuggerSupported; true, // l0DebuggerSupported;
true, // supportsFloatAtomics true, // supportsFloatAtomics
0 // cxlType 0 // cxlType
}; };
void BMG::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) { void BMG::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {

2
shared/source/xe2_hpg_core/hw_info_lnl.cpp
View File

@ -45,7 +45,7 @@ const RuntimeCapabilityTable LNL::capabilityTable{
aub_stream::ENGINE_CCS, // defaultEngineType aub_stream::ENGINE_CCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Lnl, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Lnl, // aubDeviceId
0, // extraQuantityThreadsPerEU 0, // extraQuantityThreadsPerEU
128, // maxProgrammableSlmSize 128, // maxProgrammableSlmSize
sizeof(LNL::GRF), // grfSize sizeof(LNL::GRF), // grfSize

2
shared/source/xe3_core/hw_info_ptl.cpp
View File

@ -45,7 +45,7 @@ const RuntimeCapabilityTable PTL::capabilityTable{
aub_stream::ENGINE_CCS, // defaultEngineType aub_stream::ENGINE_CCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Ptl, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Ptl, // aubDeviceId
0, // extraQuantityThreadsPerEU 0, // extraQuantityThreadsPerEU
128, // maxProgrammableSlmSize 128, // maxProgrammableSlmSize
sizeof(PTL::GRF), // grfSize sizeof(PTL::GRF), // grfSize

2
shared/source/xe_hpc_core/hw_info_pvc.cpp
View File

@ -57,7 +57,7 @@ const RuntimeCapabilityTable PVC::capabilityTable{
aub_stream::ENGINE_CCS, // defaultEngineType aub_stream::ENGINE_CCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Pvc, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Pvc, // aubDeviceId
0, // extraQuantityThreadsPerEU 0, // extraQuantityThreadsPerEU
128, // maxProgrammableSlmSize 128, // maxProgrammableSlmSize
sizeof(PVC::GRF), // grfSize sizeof(PVC::GRF), // grfSize

2
shared/source/xe_hpg_core/hw_info_arl.cpp
View File

@ -42,7 +42,7 @@ const RuntimeCapabilityTable ARL::capabilityTable{
aub_stream::ENGINE_CCS, // defaultEngineType aub_stream::ENGINE_CCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Arl, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Arl, // aubDeviceId
0, // extraQuantityThreadsPerEU 0, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(ARL::GRF), // grfSize sizeof(ARL::GRF), // grfSize

2
shared/source/xe_hpg_core/hw_info_dg2.cpp
View File

@ -47,7 +47,7 @@ const RuntimeCapabilityTable DG2::capabilityTable{
aub_stream::ENGINE_CCS, // defaultEngineType aub_stream::ENGINE_CCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Dg2, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Dg2, // aubDeviceId
0, // extraQuantityThreadsPerEU 0, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(DG2::GRF), // grfSize sizeof(DG2::GRF), // grfSize

2
shared/source/xe_hpg_core/hw_info_mtl.cpp
View File

@ -43,7 +43,7 @@ const RuntimeCapabilityTable MTL::capabilityTable{
aub_stream::ENGINE_CCS, // defaultEngineType aub_stream::ENGINE_CCS, // defaultEngineType
0, // maxRenderFrequency 0, // maxRenderFrequency
30, // clVersionSupport 30, // clVersionSupport
CmdServicesMemTraceVersion::DeviceValues::Mtl, // aubDeviceId AubMemDump::CmdServicesMemTraceVersion::DeviceValues::Mtl, // aubDeviceId
0, // extraQuantityThreadsPerEU 0, // extraQuantityThreadsPerEU
64, // maxProgrammableSlmSize 64, // maxProgrammableSlmSize
sizeof(MTL::GRF), // grfSize sizeof(MTL::GRF), // grfSize

12
shared/test/common/mocks/mock_aub_center.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2021 Intel Corporation * Copyright (C) 2018-2025 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@ -12,15 +12,6 @@
#include "shared/test/common/mocks/mock_aub_file_stream.h" #include "shared/test/common/mocks/mock_aub_file_stream.h"
namespace NEO { namespace NEO {
class MockAubStreamProvider : public AubStreamProvider {
public:
AubMemDump::AubFileStream *getStream() override {
return &stream;
}
protected:
MockAubFileStream stream;
};
class MockAubCenter : public AubCenter { class MockAubCenter : public AubCenter {
public: public:
@ -30,7 +21,6 @@ class MockAubCenter : public AubCenter {
using AubCenter::stepping; using AubCenter::stepping;
MockAubCenter() { MockAubCenter() {
streamProvider.reset(new MockAubStreamProvider());
} }
~MockAubCenter() override = default; ~MockAubCenter() override = default;

7
shared/test/common/mocks/mock_aub_csr.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2024 Intel Corporation * Copyright (C) 2018-2025 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@ -172,7 +172,12 @@ struct MockAubCsr : public AUBCommandStreamReceiverHw<GfxFamily> {
bool addAubCommentCalled = false; bool addAubCommentCalled = false;
bool dumpAllocationCalled = false; bool dumpAllocationCalled = false;
bool skipTaskCountCheckForCompletionPoll = false; bool skipTaskCountCheckForCompletionPoll = false;
bool lockStreamCalled = false;
std::unique_lock<std::mutex> lockStream() override {
lockStreamCalled = true;
return AUBCommandStreamReceiverHw<GfxFamily>::lockStream();
}
void initFile(const std::string &fileName) override { void initFile(const std::string &fileName) override {
fileIsOpen = true; fileIsOpen = true;
openFileName = fileName; openFileName = fileName;

7
shared/test/common/mocks/mock_aub_file_stream.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2023 Intel Corporation * Copyright (C) 2018-2025 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@ -12,7 +12,6 @@
#include <vector> #include <vector>
namespace NEO { namespace NEO {
struct MockAubFileStream : public AUBCommandStreamReceiver::AubFileStream { struct MockAubFileStream : public AUBCommandStreamReceiver::AubFileStream {
bool init(uint32_t stepping, uint32_t device) override { bool init(uint32_t stepping, uint32_t device) override {
initCalledCnt++; initCalledCnt++;
@ -37,10 +36,6 @@ struct MockAubFileStream : public AUBCommandStreamReceiver::AubFileStream {
void flush() override { void flush() override {
flushCalled = true; flushCalled = true;
} }
std::unique_lock<std::mutex> lockStream() override {
lockStreamCalled = true;
return AUBCommandStreamReceiver::AubFileStream::lockStream();
}
void expectMMIO(uint32_t mmioRegister, uint32_t expectedValue) override { void expectMMIO(uint32_t mmioRegister, uint32_t expectedValue) override {
mmioRegisterFromExpectMMIO = mmioRegister; mmioRegisterFromExpectMMIO = mmioRegister;
expectedValueFromExpectMMIO = expectedValue; expectedValueFromExpectMMIO = expectedValue;

69
shared/test/unit_test/command_stream/aub_file_stream_tests.cpp
View File

@ -163,126 +163,95 @@ HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWithAubManagerWhenFile
} }
HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenOpenFileIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenOpenFileIsCalledThenFileStreamShouldBeLocked) {
auto mockAubFileStream = std::make_unique<MockAubFileStream>(); auto aubCsr = std::make_unique<MockAubCsr<FamilyType>>("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
auto aubCsr = std::make_unique<AUBCommandStreamReceiverHw<FamilyType>>("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
std::string fileName = "file_name.aub"; std::string fileName = "file_name.aub";
aubCsr->stream = mockAubFileStream.get();
aubCsr->openFile(fileName); aubCsr->openFile(fileName);
EXPECT_TRUE(mockAubFileStream->lockStreamCalled);
EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenReopenFileIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenReopenFileIsCalledThenFileStreamShouldBeLocked) {
auto mockAubFileStream = std::make_unique<MockAubFileStream>(); auto aubCsr = std::make_unique<MockAubCsr<FamilyType>>("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
auto aubCsr = std::make_unique<AUBCommandStreamReceiverHw<FamilyType>>("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield());
std::string fileName = "file_name.aub"; std::string fileName = "file_name.aub";
aubCsr->stream = mockAubFileStream.get();
aubCsr->reopenFile(fileName); aubCsr->reopenFile(fileName);
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenInitializeEngineIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenInitializeEngineIsCalledThenFileStreamShouldBeLocked) {
auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true);
auto mockAubFileStream = std::make_unique<MockAubFileStream>(); auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>();
auto aubExecutionEnvironment = getEnvironment<AUBCommandStreamReceiverHw<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<AUBCommandStreamReceiverHw<FamilyType>>();
aubCsr->stream = static_cast<MockAubFileStream *>(mockAubFileStream.get());
aubCsr->initializeEngine(); aubCsr->initializeEngine();
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenSubmitBatchBufferIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenSubmitBatchBufferIsCalledThenFileStreamShouldBeLocked) {
auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true);
auto mockAubFileStream = std::make_unique<MockAubFileStream>(); auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>();
auto aubExecutionEnvironment = getEnvironment<AUBCommandStreamReceiverHw<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<AUBCommandStreamReceiverHw<FamilyType>>();
LinearStream cs(aubExecutionEnvironment->commandBuffer); LinearStream cs(aubExecutionEnvironment->commandBuffer);
BatchBuffer batchBuffer = BatchBufferHelper::createDefaultBatchBuffer(cs.getGraphicsAllocation(), &cs, cs.getUsed()); BatchBuffer batchBuffer = BatchBufferHelper::createDefaultBatchBuffer(cs.getGraphicsAllocation(), &cs, cs.getUsed());
aubCsr->stream = static_cast<MockAubFileStream *>(mockAubFileStream.get());
auto pBatchBuffer = ptrOffset(batchBuffer.commandBufferAllocation->getUnderlyingBuffer(), batchBuffer.startOffset); auto pBatchBuffer = ptrOffset(batchBuffer.commandBufferAllocation->getUnderlyingBuffer(), batchBuffer.startOffset);
auto batchBufferGpuAddress = ptrOffset(batchBuffer.commandBufferAllocation->getGpuAddress(), batchBuffer.startOffset); auto batchBufferGpuAddress = ptrOffset(batchBuffer.commandBufferAllocation->getGpuAddress(), batchBuffer.startOffset);
auto currentOffset = batchBuffer.usedSize; auto currentOffset = batchBuffer.usedSize;
auto sizeBatchBuffer = currentOffset - batchBuffer.startOffset; auto sizeBatchBuffer = currentOffset - batchBuffer.startOffset;
aubCsr->initializeEngine(); aubCsr->initializeEngine();
mockAubFileStream->lockStreamCalled = false; aubCsr->lockStreamCalled = false;
aubCsr->submitBatchBufferAub(batchBufferGpuAddress, pBatchBuffer, sizeBatchBuffer, aubCsr->getMemoryBank(batchBuffer.commandBufferAllocation), aubCsr->submitBatchBufferAub(batchBufferGpuAddress, pBatchBuffer, sizeBatchBuffer, aubCsr->getMemoryBank(batchBuffer.commandBufferAllocation),
aubCsr->getPPGTTAdditionalBits(batchBuffer.commandBufferAllocation)); aubCsr->getPPGTTAdditionalBits(batchBuffer.commandBufferAllocation));
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenWriteMemoryIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenWriteMemoryIsCalledThenFileStreamShouldBeLocked) {
auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>();
auto mockAubFileStream = std::make_unique<MockAubFileStream>();
auto aubExecutionEnvironment = getEnvironment<AUBCommandStreamReceiverHw<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<AUBCommandStreamReceiverHw<FamilyType>>();
aubCsr->initializeEngine(); aubCsr->initializeEngine();
aubCsr->stream = static_cast<MockAubFileStream *>(mockAubFileStream.get());
MockGraphicsAllocation allocation(reinterpret_cast<void *>(0x1000), 0x1000); MockGraphicsAllocation allocation(reinterpret_cast<void *>(0x1000), 0x1000);
aubCsr->writeMemory(allocation); aubCsr->writeMemory(allocation);
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenPollForCompletionIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenPollForCompletionIsCalledThenFileStreamShouldBeLocked) {
auto mockAubFileStream = std::make_unique<MockAubFileStream>();
auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true); auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>(); auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>();
aubCsr->stream = static_cast<MockAubFileStream *>(mockAubFileStream.get());
aubCsr->latestSentTaskCount = 1; aubCsr->latestSentTaskCount = 1;
aubCsr->pollForCompletionTaskCount = 0; aubCsr->pollForCompletionTaskCount = 0;
aubCsr->pollForCompletion(); aubCsr->pollForCompletion();
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenExpectMemoryEqualIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenExpectMemoryEqualIsCalledThenFileStreamShouldBeLocked) {
auto mockAubFileStream = std::make_unique<MockAubFileStream>();
auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true); auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>(); auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>();
aubCsr->stream = static_cast<MockAubFileStream *>(mockAubFileStream.get());
aubCsr->expectMemoryEqual(reinterpret_cast<void *>(0x1000), reinterpret_cast<void *>(0x1000), 0x1000); aubCsr->expectMemoryEqual(reinterpret_cast<void *>(0x1000), reinterpret_cast<void *>(0x1000), 0x1000);
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenAddAubCommentIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenAddAubCommentIsCalledThenFileStreamShouldBeLocked) {
auto mockAubFileStream = std::make_unique<MockAubFileStream>();
auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true); auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>(); auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>();
aubCsr->stream = static_cast<MockAubFileStream *>(mockAubFileStream.get());
aubCsr->addAubComment("comment"); aubCsr->addAubComment("comment");
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenDumpAllocationIsCalledThenFileStreamShouldBeLocked) { HWTEST_F(AubFileStreamWithoutAubStreamTests, givenAubCommandStreamReceiverWhenDumpAllocationIsCalledThenFileStreamShouldBeLocked) {
auto mockAubFileStream = std::make_unique<MockAubFileStream>();
auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true); auto aubExecutionEnvironment = getEnvironment<MockAubCsr<FamilyType>>(true, true, true);
auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>(); auto aubCsr = aubExecutionEnvironment->template getCsr<MockAubCsr<FamilyType>>();
GraphicsAllocation allocation{0, 1u /*num gmms*/, AllocationType::unknown, nullptr, 0, 0, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount}; GraphicsAllocation allocation{0, 1u /*num gmms*/, AllocationType::unknown, nullptr, 0, 0, 0, MemoryPool::memoryNull, MemoryManager::maxOsContextCount};
aubCsr->stream = static_cast<MockAubFileStream *>(mockAubFileStream.get());
aubCsr->dumpAllocation(allocation); aubCsr->dumpAllocation(allocation);
EXPECT_TRUE(mockAubFileStream->lockStreamCalled); EXPECT_TRUE(aubCsr->lockStreamCalled);
} }
HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenFlushIsCalledThenItShouldCallTheExpectedFunctions) { HWTEST_F(AubFileStreamTests, givenAubCommandStreamReceiverWhenFlushIsCalledThenItShouldCallTheExpectedFunctions) {

13
shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
View File

@ -531,19 +531,6 @@ HWTEST_F(SimulatedCsrTest, givenTbxWithAubDumpCsrTypeWhenCreateCommandStreamRece
EXPECT_NE(nullptr, rootDeviceEnvironment->aubCenter.get()); EXPECT_NE(nullptr, rootDeviceEnvironment->aubCenter.get());
} }
HWTEST_F(CommandStreamReceiverWithAubDumpSimpleTest, givenNullAubManagerAvailableWhenTbxCsrWithAubDumpIsCreatedThenAubCsrIsCreated) {
DebugManagerStateRestore stateRestore;
debugManager.flags.UseAubStream.set(false);
MockAubCenter *mockAubCenter = new MockAubCenter();
ExecutionEnvironment *executionEnvironment = pDevice->getExecutionEnvironment();
executionEnvironment->initializeMemoryManager();
executionEnvironment->rootDeviceEnvironments[0]->aubCenter = std::unique_ptr<MockAubCenter>(mockAubCenter);
DeviceBitfield deviceBitfield(1);
CommandStreamReceiverWithAUBDump<TbxCommandStreamReceiverHw<FamilyType>> csrWithAubDump("aubfile", *executionEnvironment, 0, deviceBitfield);
EXPECT_NE(nullptr, csrWithAubDump.aubCSR);
}
HWTEST_F(CommandStreamReceiverWithAubDumpSimpleTest, givenAubManagerNotAvailableWhenHwCsrWithAubDumpIsCreatedThenAubCsrIsCreated) { HWTEST_F(CommandStreamReceiverWithAubDumpSimpleTest, givenAubManagerNotAvailableWhenHwCsrWithAubDumpIsCreatedThenAubCsrIsCreated) {
std::string fileName = "file_name.aub"; std::string fileName = "file_name.aub";