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

Revert "fix: use stateless kernel when append memory fill on XeHpc and later"

Browse Source 
This reverts commit e233cf5127.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2024-07-26 04:32:35 +02:00
committed by Compute-Runtime-Automation
parent e78ad8ed8e
commit d3f4b5b280
3 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
level_zero/core/source/cmdlist/cmdlist_hw.inl
View File

@@ -1929,7 +1929,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryFill(void *ptr,
ze_event_handle_t hSignalEvent,
uint32_t numWaitEvents,
ze_event_handle_t *phWaitEvents, bool relaxedOrderingDispatch) {
bool isStateless = (this->cmdListHeapAddressModel == NEO::HeapAddressModel::globalStateless) || this->isStatelessBuiltinsEnabled();
bool isStateless = this->cmdListHeapAddressModel == NEO::HeapAddressModel::globalStateless;
const bool isHeapless = this->isHeaplessModeEnabled();
NEO::Device *neoDevice = device->getNEODevice();

2
level_zero/core/test/unit_tests/mocks/mock_cmdlist.h
View File

@@ -129,7 +129,6 @@ struct WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>
::L0::Event *event,
CmdListKernelLaunchParams &launchParams) override {
kernelUsed = kernel;
usedKernelLaunchParams = launchParams;
if (launchParams.isKernelSplitOperation && (launchParams.numKernelsExecutedInSplitLaunch == 0)) {
firstKernelInSplitOperation = kernel;
@@ -169,7 +168,6 @@ struct WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>
::L0::Kernel *firstKernelInSplitOperation = nullptr;
ze_event_handle_t appendEventMultipleKernelIndirectEventHandleValue = nullptr;
ze_event_handle_t appendEventKernelIndirectEventHandleValue = nullptr;
Kernel *kernelUsed;
};
template <GFXCORE_FAMILY gfxCoreFamily>

31
level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp
View File

@@ -8,7 +8,6 @@
#include "shared/source/command_container/command_encoder.h"
#include "shared/source/command_stream/scratch_space_controller.h"
#include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/helpers/compiler_product_helper.h"
#include "shared/source/helpers/gfx_core_helper.h"
#include "shared/source/indirect_heap/indirect_heap.h"
#include "shared/source/kernel/kernel_descriptor.h"
@@ -1008,36 +1007,6 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyWithOneReservedD
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
}
HWTEST2_F(CommandListTest, givenStatelessWhenAppendMemoryFillIsCalledThenCorrectBuiltinIsUsed, IsAtLeastXeHpcCore) {
auto &compilerProductHelper = device->getCompilerProductHelper();
ASSERT_TRUE(compilerProductHelper.isForceToStatelessRequired());
auto commandList = std::make_unique<WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>>();
commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u);
constexpr size_t allocSize = 4096;
constexpr size_t patternSize = 8;
uint8_t pattern[patternSize] = {1, 2, 3, 4};
void *dstBuffer = nullptr;
ze_host_mem_alloc_desc_t hostDesc = {};
auto result = context->allocHostMem(&hostDesc, allocSize, allocSize, &dstBuffer);
ASSERT_EQ(ZE_RESULT_SUCCESS, result);
commandList->appendMemoryFill(dstBuffer, pattern, patternSize, allocSize, nullptr, 0, nullptr, false);
bool isStateless = true;
bool isHeapless = commandList->isHeaplessModeEnabled();
auto builtin = BuiltinTypeHelper::adjustBuiltinType<Builtin::fillBufferMiddle>(isStateless, isHeapless);
Kernel *expectedBuiltinKernel = device->getBuiltinFunctionsLib()->getFunction(builtin);
EXPECT_EQ(expectedBuiltinKernel, commandList->kernelUsed);
context->freeMem(dstBuffer);
}
HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryFillInUsmHostThenBuiltinFlagAndDestinationAllocSystemIsSet, IsAtLeastSkl) {
auto commandList = std::make_unique<WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>>();
commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u);