From 35f6dc12b83317025a0596f478c8457d1cd35b27 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 13 Oct 2025 13:40:44 +0000 Subject: [PATCH] refactor: remove not needed code Signed-off-by: Mateusz Jablonski --- .../test/aub_tests/aub_hello_world_test.cpp | 12 ++-- .../append_kernel_indirect_aub_tests.cpp | 10 +-- .../aub_tests/cmdlist/multitile_aub_tests.cpp | 4 +- .../api/cl_enqueue_verify_memory.inl | 7 +- ...va_multi_physical_tests_xehp_and_later.cpp | 4 +- shared/source/aub_mem_dump/CMakeLists.txt | 1 - shared/source/aub_mem_dump/aub_header.h | 64 ------------------- shared/source/aub_mem_dump/aub_mem_dump.h | 5 +- .../aub_command_stream_receiver.cpp | 4 -- .../command_stream_receiver.cpp | 5 +- ...ream_receiver_simulated_common_hw_base.inl | 6 +- .../command_stream_receiver_simulated_hw.h | 6 +- .../tbx_command_stream_receiver_hw.inl | 2 +- .../aub_memory_operations_handler.cpp | 4 +- shared/source/os_interface/product_helper.inl | 12 ++-- ...eiver_simulated_common_hw_xe2_hpg_core.cpp | 6 +- ..._receiver_simulated_common_hw_xe3_core.cpp | 6 +- ...ceiver_simulated_common_hw_xe_hpc_core.cpp | 2 +- .../test/common/mocks/mock_product_helper.cpp | 13 ++-- .../test/unit_test/aub/aub_center_tests.cpp | 15 +++-- .../aub_command_stream_receiver_3_tests.cpp | 6 +- ...ommand_stream_receiver_simulated_tests.cpp | 2 +- .../command_stream_receiver_tests.cpp | 4 +- ...nd_stream_receiver_with_aub_dump_tests.cpp | 4 +- .../aub_memory_operations_handler_tests.cpp | 2 +- .../os_interface/product_helper_tests.cpp | 17 ++--- 26 files changed, 78 insertions(+), 145 deletions(-) delete mode 100644 shared/source/aub_mem_dump/aub_header.h diff --git a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp index a1e647e43b..1055b0bebe 100644 --- a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp +++ b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp @@ -43,7 +43,7 @@ TEST_F(AUBHelloWorldL0, whenAppendMemoryCopyIsCalledThenMemoryIsProperlyCopied) pCmdq->executeCommandLists(1, pHCmdList.get(), nullptr, false, nullptr, nullptr); pCmdq->synchronize(std::numeric_limits::max()); - EXPECT_TRUE(csr->expectMemory(dstMemory, srcMemory, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(dstMemory, srcMemory, size, aub_stream::CompareOperationValues::CompareEqual)); driverHandle->svmAllocsManager->freeSVMAlloc(srcMemory); driverHandle->svmAllocsManager->freeSVMAlloc(dstMemory); @@ -134,7 +134,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, returnValue = zeCommandQueueSynchronize(queueHandle, std::numeric_limits::max()); EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); - EXPECT_TRUE(csr->expectMemory(dstMemory1, srcMemory1, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(dstMemory1, srcMemory1, size, aub_stream::CompareOperationValues::CompareEqual)); // reset command lists and event returnValue = zeCommandListReset(commandListHandle); @@ -162,7 +162,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, returnValue = zeCommandQueueSynchronize(queueHandle, std::numeric_limits::max()); EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); - EXPECT_TRUE(csr->expectMemory(dstMemory2, srcMemory2, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(dstMemory2, srcMemory2, size, aub_stream::CompareOperationValues::CompareEqual)); // destroy resources returnValue = zeEventDestroy(eventHandle); @@ -367,9 +367,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, returnValue = pCmdq->synchronize(std::numeric_limits::max()); EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); - EXPECT_TRUE(csr->expectMemory(dstMemory, srcMemory, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); - EXPECT_TRUE(csr->expectMemory(testMemory, refMemory, sizeof(uint32_t), AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); - EXPECT_TRUE(csr->expectMemory(ptrOffset(testMemory, 8), ptrOffset(refMemory, 8), sizeof(uint32_t), AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(dstMemory, srcMemory, size, aub_stream::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(testMemory, refMemory, sizeof(uint32_t), aub_stream::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(ptrOffset(testMemory, 8), ptrOffset(refMemory, 8), sizeof(uint32_t), aub_stream::CompareOperationValues::CompareEqual)); returnValue = zeMemFree(contextHandle, srcMemory); EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); diff --git a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp index 114d068a92..c3e92d0c31 100644 --- a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp @@ -61,7 +61,7 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendKernelIndirectThenGlobalWorkSizeIsPr pCmdq->executeCommandLists(1, &cmdListHandle, nullptr, false, nullptr, nullptr); pCmdq->synchronize(std::numeric_limits::max()); - EXPECT_TRUE(csr->expectMemory(outBuffer, expectedGlobalWorkSize, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(outBuffer, expectedGlobalWorkSize, size, aub_stream::CompareOperationValues::CompareEqual)); EXPECT_EQ(ZE_RESULT_SUCCESS, zeKernelDestroy(kernel)); EXPECT_EQ(ZE_RESULT_SUCCESS, zeModuleDestroy(moduleHandle)); @@ -106,7 +106,7 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendKernelIndirectThenGroupCountIsProper pCmdq->executeCommandLists(1, &cmdListHandle, nullptr, false, nullptr, nullptr); pCmdq->synchronize(std::numeric_limits::max()); - EXPECT_TRUE(csr->expectMemory(outBuffer, groupCount, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(outBuffer, groupCount, size, aub_stream::CompareOperationValues::CompareEqual)); EXPECT_EQ(ZE_RESULT_SUCCESS, zeKernelDestroy(kernel)); EXPECT_EQ(ZE_RESULT_SUCCESS, zeModuleDestroy(moduleHandle)); @@ -166,8 +166,8 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendMultipleKernelsIndirectThenGroupCoun pCmdq->executeCommandLists(1, &cmdListHandle, nullptr, false, nullptr, nullptr); pCmdq->synchronize(std::numeric_limits::max()); - EXPECT_TRUE(csr->expectMemory(outBuffer, groupCount, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); - EXPECT_TRUE(csr->expectMemory(outBuffer2, groupCount2, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(outBuffer, groupCount, size, aub_stream::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(outBuffer2, groupCount2, size, aub_stream::CompareOperationValues::CompareEqual)); EXPECT_EQ(ZE_RESULT_SUCCESS, zeKernelDestroy(kernels[0])); EXPECT_EQ(ZE_RESULT_SUCCESS, zeKernelDestroy(kernels[1])); @@ -239,7 +239,7 @@ TEST_F(AUBAppendKernelIndirectL0, whenAppendKernelIndirectThenWorkDimIsProperlyP pCmdq->executeCommandLists(1, &cmdListHandle, nullptr, false, nullptr, nullptr); pCmdq->synchronize(std::numeric_limits::max()); - EXPECT_TRUE(csr->expectMemory(outBuffer, &expectedWorkDim, size, AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual)); + EXPECT_TRUE(csr->expectMemory(outBuffer, &expectedWorkDim, size, aub_stream::CompareOperationValues::CompareEqual)); driverHandle->svmAllocsManager->freeSVMAlloc(outBuffer); driverHandle->svmAllocsManager->freeSVMAlloc(pDispatchTraits); diff --git a/level_zero/core/test/aub_tests/cmdlist/multitile_aub_tests.cpp b/level_zero/core/test/aub_tests/cmdlist/multitile_aub_tests.cpp index 0d9d455990..8ea8fe8114 100644 --- a/level_zero/core/test/aub_tests/cmdlist/multitile_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/cmdlist/multitile_aub_tests.cpp @@ -111,7 +111,7 @@ HWTEST_F(SynchronizedDispatchMultiTileL0AubTests, givenFullSyncDispatchWhenExecu const uint32_t expectedGlobalWorkSize[3] = {128, 1, 1}; uint64_t expectedTokenValue = 0; - auto compareEqual = AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual; + auto compareEqual = aub_stream::CompareOperationValues::CompareEqual; EXPECT_TRUE(csr->expectMemory(outBuffer, expectedGlobalWorkSize, size, compareEqual)); EXPECT_TRUE(csr->expectMemory(reinterpret_cast(rootDevice->getSyncDispatchTokenAllocation()->getGpuAddress()), &expectedTokenValue, sizeof(uint64_t), compareEqual)); @@ -175,7 +175,7 @@ HWTEST2_F(CopyOffloadMultiTileL0AubTests, givenCopyOffloadCmdListWhenDispatching const uint32_t expectedGlobalWorkSize[3] = {groupCount.groupCountX, groupCount.groupCountY, groupCount.groupCountZ}; - auto compareEqual = AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual; + auto compareEqual = aub_stream::CompareOperationValues::CompareEqual; auto csr = getSimulatedCsr(0, 0); diff --git a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl index 0537dd0bad..89c0fe03bf 100644 --- a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl +++ b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl @@ -5,7 +5,6 @@ * */ -#include "shared/source/aub_mem_dump/aub_header.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" @@ -13,11 +12,13 @@ #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/test/unit_test/api/cl_api_tests.h" +#include "aubstream/hardware_context.h" + using namespace NEO; TEST(CheckVerifyMemoryRelatedApiConstants, givenVerifyMemoryRelatedApiConstantsWhenVerifyingTheirValueThenCorrectValuesAreReturned) { - EXPECT_EQ(AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual, CL_MEM_COMPARE_EQUAL); - EXPECT_EQ(AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual, CL_MEM_COMPARE_NOT_EQUAL); + EXPECT_EQ(aub_stream::CompareOperationValues::CompareEqual, CL_MEM_COMPARE_EQUAL); + EXPECT_EQ(aub_stream::CompareOperationValues::CompareNotEqual, CL_MEM_COMPARE_NOT_EQUAL); } struct ClEnqueueVerifyMemoryINTELSettings { diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp index 8faf73abda..ae2f103c58 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -52,7 +52,7 @@ HWTEST2_F(OneVAFourPhysicalStoragesTest, givenBufferWithFourPhysicalStoragesWhen std::fill(memoryToWrite[tile], ptrOffset(memoryToWrite[tile], bufferSize), tile + 1); auto hardwareContext = getSimulatedCsr(tile, 0)->hardwareContextController->hardwareContexts[0].get(); - hardwareContext->writeMemory2({gpuAddress, memoryToWrite[tile], bufferSize, (1u << tile), AubMemDump::DataTypeHintValues::TraceNotype, MemoryConstants::pageSize64k}); + hardwareContext->writeMemory2({gpuAddress, memoryToWrite[tile], bufferSize, (1u << tile), aub_stream::DataTypeHintValues::TraceNotype, MemoryConstants::pageSize64k}); } for (uint32_t tile = 0; tile < numTiles; tile++) { diff --git a/shared/source/aub_mem_dump/CMakeLists.txt b/shared/source/aub_mem_dump/CMakeLists.txt index c37152e9d0..dc30eb21c7 100644 --- a/shared/source/aub_mem_dump/CMakeLists.txt +++ b/shared/source/aub_mem_dump/CMakeLists.txt @@ -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 diff --git a/shared/source/aub_mem_dump/aub_header.h b/shared/source/aub_mem_dump/aub_header.h deleted file mode 100644 index 37907baa6c..0000000000 --- a/shared/source/aub_mem_dump/aub_header.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2018-2025 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include -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 diff --git a/shared/source/aub_mem_dump/aub_mem_dump.h b/shared/source/aub_mem_dump/aub_mem_dump.h index 5c4ff9b27f..9b4a75103e 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump.h +++ b/shared/source/aub_mem_dump/aub_mem_dump.h @@ -6,13 +6,10 @@ */ #pragma once -#include "shared/source/aub_mem_dump/aub_header.h" +#include namespace AubMemDump { -typedef CmdServicesMemTraceVersion::SteppingValues SteppingValues; -typedef CmdServicesMemTraceMemoryWrite::DataTypeHintValues DataTypeHintValues; - struct LrcaHelper { static void setContextSaveRestoreFlags(uint32_t &value); }; diff --git a/shared/source/command_stream/aub_command_stream_receiver.cpp b/shared/source/command_stream/aub_command_stream_receiver.cpp index dc71b520b1..176213d1ec 100644 --- a/shared/source/command_stream/aub_command_stream_receiver.cpp +++ b/shared/source/command_stream/aub_command_stream_receiver.cpp @@ -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 diff --git a/shared/source/command_stream/command_stream_receiver.cpp b/shared/source/command_stream/command_stream_receiver.cpp index 54093faf67..fcea2ad29a 100644 --- a/shared/source/command_stream/command_stream_receiver.cpp +++ b/shared/source/command_stream/command_stream_receiver.cpp @@ -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 #include @@ -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); } diff --git a/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl index bb41b77f00..b4568b6222 100644 --- a/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl +++ b/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl @@ -76,17 +76,17 @@ bool CommandStreamReceiverSimulatedCommonHw::getParametersForMemory(G template bool CommandStreamReceiverSimulatedCommonHw::expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) { return this->expectMemory(gfxAddress, srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual); + aub_stream::CompareOperationValues::CompareEqual); } template bool CommandStreamReceiverSimulatedCommonHw::expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) { return this->expectMemory(gfxAddress, srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual); + aub_stream::CompareOperationValues::CompareNotEqual); } template bool CommandStreamReceiverSimulatedCommonHw::expectMemoryCompressed(void *gfxAddress, const void *srcAddress, size_t length) { return this->expectMemory(gfxAddress, srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual); + aub_stream::CompareOperationValues::CompareNotEqual); } template diff --git a/shared/source/command_stream/command_stream_receiver_simulated_hw.h b/shared/source/command_stream/command_stream_receiver_simulated_hw.h index 9415693169..76049e6aea 100644 --- a/shared/source/command_stream/command_stream_receiver_simulated_hw.h +++ b/shared/source/command_stream/command_stream_receiver_simulated_hw.h @@ -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; diff --git a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl index 8d4bd9e221..205ac9982c 100644 --- a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl +++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl @@ -307,7 +307,7 @@ bool TbxCommandStreamReceiverHw::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); } diff --git a/shared/source/os_interface/aub_memory_operations_handler.cpp b/shared/source/os_interface/aub_memory_operations_handler.cpp index 558901c7bf..909c3fee27 100644 --- a/shared/source/os_interface/aub_memory_operations_handler.cpp +++ b/shared/source/os_interface/aub_memory_operations_handler.cpp @@ -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 @@ -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; diff --git a/shared/source/os_interface/product_helper.inl b/shared/source/os_interface/product_helper.inl index c8f2eced45..b6f363b103 100644 --- a/shared/source/os_interface/product_helper.inl +++ b/shared/source/os_interface/product_helper.inl @@ -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 @@ -289,15 +289,15 @@ uint32_t ProductHelperHw::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; } } diff --git a/shared/source/xe2_hpg_core/command_stream_receiver_simulated_common_hw_xe2_hpg_core.cpp b/shared/source/xe2_hpg_core/command_stream_receiver_simulated_common_hw_xe2_hpg_core.cpp index 8942ccc319..4d4d269527 100644 --- a/shared/source/xe2_hpg_core/command_stream_receiver_simulated_common_hw_xe2_hpg_core.cpp +++ b/shared/source/xe2_hpg_core/command_stream_receiver_simulated_common_hw_xe2_hpg_core.cpp @@ -17,19 +17,19 @@ template <> bool CommandStreamReceiverSimulatedCommonHw::expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) { auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress)); return this->expectMemory(reinterpret_cast(gpuAddress), srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual); + aub_stream::CompareOperationValues::CompareEqual); } template <> bool CommandStreamReceiverSimulatedCommonHw::expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) { auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress)); return this->expectMemory(reinterpret_cast(gpuAddress), srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual); + aub_stream::CompareOperationValues::CompareNotEqual); } template <> bool CommandStreamReceiverSimulatedCommonHw::expectMemoryCompressed(void *gfxAddress, const void *srcAddress, size_t length) { auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress)); return this->expectMemory(reinterpret_cast(gpuAddress), srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual); + aub_stream::CompareOperationValues::CompareNotEqual); } template class CommandStreamReceiverSimulatedCommonHw; diff --git a/shared/source/xe3_core/command_stream_receiver_simulated_common_hw_xe3_core.cpp b/shared/source/xe3_core/command_stream_receiver_simulated_common_hw_xe3_core.cpp index 716d13c25f..bdcf92101b 100644 --- a/shared/source/xe3_core/command_stream_receiver_simulated_common_hw_xe3_core.cpp +++ b/shared/source/xe3_core/command_stream_receiver_simulated_common_hw_xe3_core.cpp @@ -17,19 +17,19 @@ template <> bool CommandStreamReceiverSimulatedCommonHw::expectMemoryEqual(void *gfxAddress, const void *srcAddress, size_t length) { auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress)); return this->expectMemory(reinterpret_cast(gpuAddress), srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual); + aub_stream::CompareOperationValues::CompareEqual); } template <> bool CommandStreamReceiverSimulatedCommonHw::expectMemoryNotEqual(void *gfxAddress, const void *srcAddress, size_t length) { auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress)); return this->expectMemory(reinterpret_cast(gpuAddress), srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual); + aub_stream::CompareOperationValues::CompareNotEqual); } template <> bool CommandStreamReceiverSimulatedCommonHw::expectMemoryCompressed(void *gfxAddress, const void *srcAddress, size_t length) { auto gpuAddress = peekGmmHelper()->decanonize(castToUint64(gfxAddress)); return this->expectMemory(reinterpret_cast(gpuAddress), srcAddress, length, - AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual); + aub_stream::CompareOperationValues::CompareNotEqual); } template class CommandStreamReceiverSimulatedCommonHw; diff --git a/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp b/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp index d9a5181f0d..62d32a799a 100644 --- a/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/command_stream_receiver_simulated_common_hw_xe_hpc_core.cpp @@ -23,7 +23,7 @@ bool CommandStreamReceiverSimulatedCommonHw::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); diff --git a/shared/test/common/mocks/mock_product_helper.cpp b/shared/test/common/mocks/mock_product_helper.cpp index c60943cec5..827b868f87 100644 --- a/shared/test/common/mocks/mock_product_helper.cpp +++ b/shared/test/common/mocks/mock_product_helper.cpp @@ -5,7 +5,6 @@ * */ -#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/constants.h" @@ -16,6 +15,8 @@ #include "shared/source/os_interface/product_helper_hw.h" #include "shared/source/release_helper/release_helper.h" +#include "aubstream/stepping_values.h" + namespace NEO { template <> @@ -132,15 +133,15 @@ uint32_t ProductHelperHw::getAubStreamSteppingFromHwRevId(const Ha 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; } } diff --git a/shared/test/unit_test/aub/aub_center_tests.cpp b/shared/test/unit_test/aub/aub_center_tests.cpp index 9fbbf4fde5..9aa384babf 100644 --- a/shared/test/unit_test/aub/aub_center_tests.cpp +++ b/shared/test/unit_test/aub/aub_center_tests.cpp @@ -20,6 +20,7 @@ #include "shared/test/common/test_macros/hw_test.h" #include "aubstream/aubstream.h" +#include "aubstream/stepping_values.h" #include "gtest/gtest.h" using namespace NEO; @@ -69,13 +70,13 @@ TEST_F(AubCenterTests, WhenAubManagerIsCreatedThenCorrectSteppingIsSet) { __REVID stepping; uint32_t expectedAubStreamStepping; } steppingPairsToTest[] = { - {REVISION_A0, AubMemDump::SteppingValues::A}, - {REVISION_A1, AubMemDump::SteppingValues::A}, - {REVISION_A3, AubMemDump::SteppingValues::A}, - {REVISION_B, AubMemDump::SteppingValues::B}, - {REVISION_C, AubMemDump::SteppingValues::C}, - {REVISION_D, AubMemDump::SteppingValues::D}, - {REVISION_K, AubMemDump::SteppingValues::K}}; + {REVISION_A0, aub_stream::SteppingValues::A}, + {REVISION_A1, aub_stream::SteppingValues::A}, + {REVISION_A3, aub_stream::SteppingValues::A}, + {REVISION_B, aub_stream::SteppingValues::B}, + {REVISION_C, aub_stream::SteppingValues::C}, + {REVISION_D, aub_stream::SteppingValues::D}, + {REVISION_K, aub_stream::SteppingValues::K}}; debugManager.flags.UseAubStream.set(true); diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp index eb1e0e0e0d..7a244b7847 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp @@ -49,7 +49,7 @@ HWTEST_F(AubCsrTest, WhenWriteWithAubManagerIsCalledThenAubManagerIsInvokedWithC aubCsr->writeMemoryWithAubManager(*allocation, false, 0, 0); EXPECT_TRUE(aubManager.writeMemory2Called); - EXPECT_EQ(AubMemDump::DataTypeHintValues::TraceBatchBuffer, aubManager.hintToWriteMemory); + EXPECT_EQ(aub_stream::DataTypeHintValues::TraceBatchBuffer, aubManager.hintToWriteMemory); aubManager.writeMemory2Called = false; @@ -58,7 +58,7 @@ HWTEST_F(AubCsrTest, WhenWriteWithAubManagerIsCalledThenAubManagerIsInvokedWithC aubManager.storeAllocationParams = true; aubCsr->writeMemoryWithAubManager(*allocation2, true, 1, 1); EXPECT_TRUE(aubManager.writeMemory2Called); - EXPECT_EQ(AubMemDump::DataTypeHintValues::TraceNotype, aubManager.hintToWriteMemory); + EXPECT_EQ(aub_stream::DataTypeHintValues::TraceNotype, aubManager.hintToWriteMemory); ASSERT_EQ(1u, aubManager.storedAllocationParams.size()); EXPECT_EQ(ptrOffset(allocation2->getUnderlyingBuffer(), 1), aubManager.storedAllocationParams[0].memory); @@ -102,7 +102,7 @@ HWTEST_F(AubCsrTest, GivenCopyLockedMemoryBeforeWriteWhenWriteWithAubManagerIsCa aubManager.storeAllocationParams = true; aubCsr->writeMemoryWithAubManager(*allocation, true, 1, 1); EXPECT_TRUE(aubManager.writeMemory2Called); - EXPECT_EQ(AubMemDump::DataTypeHintValues::TraceNotype, aubManager.hintToWriteMemory); + EXPECT_EQ(aub_stream::DataTypeHintValues::TraceNotype, aubManager.hintToWriteMemory); ASSERT_EQ(1u, aubManager.storedAllocationParams.size()); EXPECT_NE(ptrOffset(allocation->getUnderlyingBuffer(), 1), aubManager.storedAllocationParams[0].memory); diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp index aa0a4e5266..aef762cd69 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp @@ -450,7 +450,7 @@ HWTEST_F(CommandStreamSimulatedTests, givenCommandBufferAllocationWhenWriteMemor graphicsAllocation.storageInfo.cloningOfPageTables = true; csr->writeMemoryWithAubManager(graphicsAllocation, false, 0, 0); - EXPECT_EQ(AubMemDump::DataTypeHintValues::TraceBatchBuffer, mockManager->hintToWriteMemory); + EXPECT_EQ(aub_stream::DataTypeHintValues::TraceBatchBuffer, mockManager->hintToWriteMemory); EXPECT_TRUE(mockManager->writeMemory2Called); } diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp index f8d585a78f..a07177468f 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -1598,8 +1598,8 @@ TEST(CommandStreamReceiverSimpleTest, givenVariousDataSetsWhenVerifyingMemoryThe uint8_t setB1[setSize] = {40, 15, 3, 11, 17, 4}; uint8_t setB2[setSize] = {40, 15, 3, 11, 17, 4}; - constexpr auto compareEqual = AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual; - constexpr auto compareNotEqual = AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual; + constexpr auto compareEqual = aub_stream::CompareOperationValues::CompareEqual; + constexpr auto compareNotEqual = aub_stream::CompareOperationValues::CompareNotEqual; EXPECT_TRUE(csr.expectMemory(setA1, setA2, setSize, compareEqual)); EXPECT_TRUE(csr.expectMemory(setB1, setB2, setSize, compareEqual)); diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index 2f28806401..9545a909c1 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -117,7 +117,7 @@ struct MyMockCsr : UltCommandStreamReceiver { const void *gfxAddress = nullptr; const void *srcAddress = nullptr; size_t length = 0; - uint32_t compareOperation = AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual; + uint32_t compareOperation = aub_stream::CompareOperationValues::CompareEqual; } expectMemoryParameterization; }; @@ -306,7 +306,7 @@ HWTEST_F(CommandStreamReceiverWithAubDumpSimpleTest, givenCsrWithAubDumpWhenPoll } HWTEST_TEMPLATED_P(CommandStreamReceiverWithAubDumpTest, givenCommandStreamReceiverWithAubDumpWhenExpectMemoryIsCalledThenBothCommandStreamReceiversAreCalled) { - uint32_t compareOperation = AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual; + uint32_t compareOperation = aub_stream::CompareOperationValues::CompareEqual; uint8_t buffer[0x10000]{}; size_t length = sizeof(buffer); diff --git a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp index dd28b98339..0b9dbbf33d 100644 --- a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp +++ b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp @@ -242,7 +242,7 @@ TEST_F(AubMemoryOperationsHandlerTests, givenAllocationWhenMakeResidentCalledThe getMemoryOperationsHandler()->setAubManager(&aubManager); auto memoryOperationsInterface = getMemoryOperationsHandler(); memoryOperationsInterface->makeResident(device.get(), ArrayRef(&allocPtr, 1), false, false); - EXPECT_EQ(aubManager.hintToWriteMemory, AubMemDump::DataTypeHintValues::TraceNotype); + EXPECT_EQ(aubManager.hintToWriteMemory, aub_stream::DataTypeHintValues::TraceNotype); } TEST_F(AubMemoryOperationsHandlerTests, givenNonResidentAllocationWhenIsResidentCalledThenFalseReturned) { MockAubManager aubManager; diff --git a/shared/test/unit_test/os_interface/product_helper_tests.cpp b/shared/test/unit_test/os_interface/product_helper_tests.cpp index 1c0ac2359c..5179cbef93 100644 --- a/shared/test/unit_test/os_interface/product_helper_tests.cpp +++ b/shared/test/unit_test/os_interface/product_helper_tests.cpp @@ -33,6 +33,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" +#include "aubstream/stepping_values.h" #include "clos_matchers.h" #include "gtest/gtest.h" #include "ocl_igc_shared/indirect_access_detection/version.h" @@ -345,21 +346,21 @@ HWTEST2_F(ProductHelperTest, whenPlatformsSupportsReleaseHelperThenRevIdFromStep HWTEST_F(ProductHelperTest, givenVariousValuesWhenGettingAubStreamSteppingFromHwRevIdThenReturnValuesAreCorrect) { MockProductHelperHw mockProductHelper; mockProductHelper.returnedStepping = REVISION_A0; - EXPECT_EQ(AubMemDump::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); mockProductHelper.returnedStepping = REVISION_A1; - EXPECT_EQ(AubMemDump::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); mockProductHelper.returnedStepping = REVISION_A3; - EXPECT_EQ(AubMemDump::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); mockProductHelper.returnedStepping = REVISION_B; - EXPECT_EQ(AubMemDump::SteppingValues::B, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::B, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); mockProductHelper.returnedStepping = REVISION_C; - EXPECT_EQ(AubMemDump::SteppingValues::C, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::C, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); mockProductHelper.returnedStepping = REVISION_D; - EXPECT_EQ(AubMemDump::SteppingValues::D, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::D, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); mockProductHelper.returnedStepping = REVISION_K; - EXPECT_EQ(AubMemDump::SteppingValues::K, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::K, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); mockProductHelper.returnedStepping = CommonConstants::invalidStepping; - EXPECT_EQ(AubMemDump::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); + EXPECT_EQ(aub_stream::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo)); } HWTEST_F(ProductHelperTest, givenProductHelperWhenAskedForDefaultEngineTypeAdjustmentThenFalseIsReturned) {