intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove not needed code

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2025-10-13 13:40:44 +00:00
committed by Compute-Runtime-Automation
parent c514fcbf96
commit 35f6dc12b8
26 changed files with 78 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/source/aub_mem_dump/CMakeLists.txt
View File

@@ -8,7 +8,6 @@ set(NEO_CORE_AUB_MEM_DUMP
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/aub_alloc_dump.h
${CMAKE_CURRENT_SOURCE_DIR}/aub_alloc_dump.inl
${CMAKE_CURRENT_SOURCE_DIR}/aub_header.h
${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump.h
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}context_flags.cpp
${CMAKE_CURRENT_SOURCE_DIR}/page_table_entry_bits.h

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

@@ -1,64 +0,0 @@
/*
* Copyright (C) 2018-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include <cstdint>
namespace AubMemDump {
struct CmdServicesMemTraceVersion {
struct SteppingValues {
enum {
N = 13,
O = 14,
L = 11,
M = 12,
B = 1,
C = 2,
A = 0,
F = 5,
G = 6,
D = 3,
E = 4,
Z = 25,
X = 23,
Y = 24,
R = 17,
S = 18,
P = 15,
Q = 16,
V = 21,
W = 22,
T = 19,
U = 20,
J = 9,
K = 10,
H = 7,
I = 8
};
};
};
struct CmdServicesMemTraceMemoryCompare {
struct CompareOperationValues {
enum {
CompareEqual = 0,
CompareNotEqual = 1,
};
};
};
struct CmdServicesMemTraceMemoryWrite {
struct DataTypeHintValues {
enum {
TraceNotype = 0,
TraceBatchBuffer = 1,
};
};
};
} // namespace AubMemDump

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

@@ -6,13 +6,10 @@
*/
#pragma once
#include "shared/source/aub_mem_dump/aub_header.h"
#include <cstdint>
namespace AubMemDump {
typedef CmdServicesMemTraceVersion::SteppingValues SteppingValues;
typedef CmdServicesMemTraceMemoryWrite::DataTypeHintValues DataTypeHintValues;
struct LrcaHelper {
static void setContextSaveRestoreFlags(uint32_t &value);
};

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

@@ -84,7 +84,3 @@ CommandStreamReceiver *AUBCommandStreamReceiver::create(const std::string &baseN
return pCreate ? pCreate(filePath, standalone, executionEnvironment, rootDeviceIndex, deviceBitfield) : nullptr;
}
} // namespace NEO
namespace AubMemDump {
using CmdServicesMemTraceMemoryCompare = AubMemDump::CmdServicesMemTraceMemoryCompare;
} // namespace AubMemDump

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

@@ -7,7 +7,6 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/aub_mem_dump/aub_header.h"
#include "shared/source/command_container/implicit_scaling.h"
#include "shared/source/command_stream/aub_subcapture_status.h"
#include "shared/source/command_stream/scratch_space_controller.h"
@@ -43,6 +42,8 @@
#include "shared/source/utilities/tag_allocator.h"
#include "shared/source/utilities/wait_util.h"
#include "aubstream/hardware_context.h"
#include <array>
#include <iostream>
@@ -1039,7 +1040,7 @@ size_t CommandStreamReceiver::getPreferredTagPoolSize() const {
bool CommandStreamReceiver::expectMemory(const void *gfxAddress, const void *srcAddress,
size_t length, uint32_t compareOperation) {
auto isMemoryEqual = (memcmp(gfxAddress, srcAddress, length) == 0);
auto isEqualMemoryExpected = (compareOperation == AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual);
auto isEqualMemoryExpected = (compareOperation == aub_stream::CompareOperationValues::CompareEqual);
return (isMemoryEqual == isEqualMemoryExpected);
}

6
shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl
View File

@@ -76,17 +76,17 @@ bool CommandStreamReceiverSimulatedCommonHw<GfxFamily>::getParametersForMemory(G
template <typename GfxFamily>
bool CommandStreamReceiverSimulatedCommonHw<GfxFamily>::expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) {
return this->expectMemory(gfxAddress, srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual);
aub_stream::CompareOperationValues::CompareEqual);
}
template <typename GfxFamily>
bool CommandStreamReceiverSimulatedCommonHw<GfxFamily>::expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) {
return this->expectMemory(gfxAddress, srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
aub_stream::CompareOperationValues::CompareNotEqual);
}
template <typename GfxFamily>
bool CommandStreamReceiverSimulatedCommonHw<GfxFamily>::expectMemoryCompressed(void *gfxAddress, const void *srcAddress, size_t length) {
return this->expectMemory(gfxAddress, srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
aub_stream::CompareOperationValues::CompareNotEqual);
}
template <typename GfxFamily>

6
shared/source/command_stream/command_stream_receiver_simulated_hw.h
View File

@@ -7,7 +7,6 @@
#pragma once
#include "shared/source/aub/aub_helper.h"
#include "shared/source/aub_mem_dump/aub_mem_dump.h"
#include "shared/source/command_stream/command_stream_receiver_simulated_common_hw.h"
#include "shared/source/gmm_helper/cache_settings_helper.h"
#include "shared/source/gmm_helper/gmm.h"
@@ -17,6 +16,7 @@
#include "shared/source/os_interface/os_context.h"
#include "aubstream/allocation_params.h"
#include "aubstream/hint_values.h"
namespace NEO {
class GraphicsAllocation;
@@ -79,8 +79,8 @@ class CommandStreamReceiverSimulatedHw : public CommandStreamReceiverSimulatedCo
size_t allocSize;
this->getParametersForMemory(graphicsAllocation, gpuAddress, cpuAddress, allocSize);
int hint = graphicsAllocation.getAllocationType() == AllocationType::commandBuffer
? AubMemDump::DataTypeHintValues::TraceBatchBuffer
: AubMemDump::DataTypeHintValues::TraceNotype;
? aub_stream::DataTypeHintValues::TraceBatchBuffer
: aub_stream::DataTypeHintValues::TraceNotype;
if (isChunkCopy) {
gpuAddress += gpuVaChunkOffset;

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

@@ -307,7 +307,7 @@ bool TbxCommandStreamReceiverHw<GfxFamily>::expectMemory(const void *gfxAddress,
// note: memory bank should not matter assuming that we call expect on the memory that was previously allocated
hardwareContextController->readMemory((uint64_t)gfxAddress, readMemory.get(), length, this->getMemoryBankForGtt(), MemoryConstants::pageSize64k);
auto isMemoryEqual = (memcmp(readMemory.get(), srcAddress, length) == 0);
auto isEqualMemoryExpected = (compareOperation == AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual);
auto isEqualMemoryExpected = (compareOperation == aub_stream::CompareOperationValues::CompareEqual);
return (isMemoryEqual == isEqualMemoryExpected);
}

4
shared/source/os_interface/aub_memory_operations_handler.cpp
View File

@@ -8,7 +8,6 @@
#include "shared/source/os_interface/aub_memory_operations_handler.h"
#include "shared/source/aub/aub_helper.h"
#include "shared/source/aub_mem_dump/aub_mem_dump.h"
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/device/device.h"
#include "shared/source/gmm_helper/cache_settings_helper.h"
@@ -17,6 +16,7 @@
#include "shared/source/memory_manager/graphics_allocation.h"
#include "aubstream/allocation_params.h"
#include "aubstream/hint_values.h"
#include <algorithm>
@@ -36,7 +36,7 @@ MemoryOperationsStatus AubMemoryOperationsHandler::makeResident(Device *device,
}
auto lock = acquireLock(resourcesLock);
int hint = AubMemDump::DataTypeHintValues::TraceNotype;
int hint = aub_stream::DataTypeHintValues::TraceNotype;
for (const auto &allocation : gfxAllocations) {
if (!isAubWritable(*allocation, device)) {
continue;

12
shared/source/os_interface/product_helper.inl
View File

@@ -5,7 +5,6 @@
*
*/
#include "shared/source/aub_mem_dump/aub_mem_dump.h"
#include "shared/source/command_container/command_encoder.h"
#include "shared/source/command_stream/stream_properties.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
@@ -33,6 +32,7 @@
#include "shared/source/utilities/logger.h"
#include "aubstream/engine_node.h"
#include "aubstream/stepping_values.h"
#include "ocl_igc_shared/indirect_access_detection/version.h"
#include <bitset>
@@ -289,15 +289,15 @@ uint32_t ProductHelperHw<gfxProduct>::getAubStreamSteppingFromHwRevId(const Hard
case REVISION_A0:
case REVISION_A1:
case REVISION_A3:
return AubMemDump::SteppingValues::A;
return aub_stream::SteppingValues::A;
case REVISION_B:
return AubMemDump::SteppingValues::B;
return aub_stream::SteppingValues::B;
case REVISION_C:
return AubMemDump::SteppingValues::C;
return aub_stream::SteppingValues::C;
case REVISION_D:
return AubMemDump::SteppingValues::D;
return aub_stream::SteppingValues::D;
case REVISION_K:
return AubMemDump::SteppingValues::K;
return aub_stream::SteppingValues::K;
}
}

6
shared/source/xe2_hpg_core/command_stream_receiver_simulated_common_hw_xe2_hpg_core.cpp
View File

@@ -17,19 +17,19 @@ template <>
bool CommandStreamReceiverSimulatedCommonHw<Family>::expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) {
auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress));
return this->expectMemory(reinterpret_cast<void *>(gpuAddress), srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual);
aub_stream::CompareOperationValues::CompareEqual);
}
template <>
bool CommandStreamReceiverSimulatedCommonHw<Family>::expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) {
auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress));
return this->expectMemory(reinterpret_cast<void *>(gpuAddress), srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
aub_stream::CompareOperationValues::CompareNotEqual);
}
template <>
bool CommandStreamReceiverSimulatedCommonHw<Family>::expectMemoryCompressed(void *gfxAddress, const void *srcAddress, size_t length) {
auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress));
return this->expectMemory(reinterpret_cast<void *>(gpuAddress), srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
aub_stream::CompareOperationValues::CompareNotEqual);
}
template class CommandStreamReceiverSimulatedCommonHw<Family>;

6
shared/source/xe3_core/command_stream_receiver_simulated_common_hw_xe3_core.cpp
View File

@@ -17,19 +17,19 @@ template <>
bool CommandStreamReceiverSimulatedCommonHw<Family>::expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) {
auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress));
return this->expectMemory(reinterpret_cast<void *>(gpuAddress), srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual);
aub_stream::CompareOperationValues::CompareEqual);
}
template <>
bool CommandStreamReceiverSimulatedCommonHw<Family>::expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) {
auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress));
return this->expectMemory(reinterpret_cast<void *>(gpuAddress), srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
aub_stream::CompareOperationValues::CompareNotEqual);
}
template <>
bool CommandStreamReceiverSimulatedCommonHw<Family>::expectMemoryCompressed(void *gfxAddress, const void *srcAddress, size_t length) {
auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress));
return this->expectMemory(reinterpret_cast<void *>(gpuAddress), srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
aub_stream::CompareOperationValues::CompareNotEqual);
}
template class CommandStreamReceiverSimulatedCommonHw<Family>;

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

@@ -23,7 +23,7 @@ bool CommandStreamReceiverSimulatedCommonHw<Family>::expectMemoryCompressed(void
this->writeMMIO(0xE4C0, value);
bool ret = this->expectMemory(gfxAddress, srcAddress, length,
AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual);
aub_stream::CompareOperationValues::CompareNotEqual);
value |= 1; // [0] enable
this->writeMMIO(0x519C, value);