intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-25 05:24:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: correct expectations in ults if heapless enabled

Browse Source 
Related-To: NEO-10681
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2024-09-11 22:50:14 +00:00
committed by Compute-Runtime-Automation
parent e6b147c47d
commit d18d58d4f7
8 changed files with 99 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
View File

@@ -8,6 +8,7 @@
#include "shared/source/command_container/command_encoder.h"
#include "shared/source/command_stream/tag_allocation_layout.h"
#include "shared/source/execution_environment/root_device_environment.h"
#include "shared/source/helpers/compiler_product_helper.h"
#include "shared/source/os_interface/linux/drm_command_stream.h"
#include "shared/source/os_interface/linux/drm_memory_manager.h"
#include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
@@ -129,21 +130,26 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTest, GivenDrmSuppo
mock->isVmBindAvailableCall.callParent = false;
mock->isVmBindAvailableCall.returnValue = true;
auto &compilerProductHelper = device->getCompilerProductHelper();
auto heapless = compilerProductHelper.isHeaplessModeEnabled();
auto heaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(heapless);
auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{0, 1024, AllocationType::commandBuffer});
allocation->updateTaskCount(2, defaultEngine.osContext->getContextId());
allocation->updateTaskCount(heaplessStateInit ? 3 : 2, defaultEngine.osContext->getContextId());
volatile TagAddressType *completionAddress = defaultEngine.commandStreamReceiver->getTagAddress();
completionAddress += (TagAllocationLayout::completionFenceOffset / sizeof(TagAddressType));
*completionAddress = 1;
*completionAddress = heaplessStateInit ? 2 : 1;
completionAddress += (postSyncOffset / sizeof(TagAddressType));
*completionAddress = 1;
*completionAddress = heaplessStateInit ? 2 : 1;
memoryManager->handleFenceCompletion(allocation);
uint64_t expectedAddress = castToUint64(const_cast<TagAddressType *>(defaultEngine.commandStreamReceiver->getTagAddress())) +
TagAllocationLayout::completionFenceOffset +
postSyncOffset;
constexpr uint64_t expectedValue = 2;
uint64_t expectedValue = heaplessStateInit ? 3 : 2;
EXPECT_EQ(2u, mock->waitUserFenceCall.called);
EXPECT_EQ(expectedAddress, mock->waitUserFenceCall.address);

6
shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
View File

@@ -9,6 +9,7 @@
#include "shared/source/command_stream/preemption.h"
#include "shared/source/direct_submission/direct_submission_controller.h"
#include "shared/source/direct_submission/relaxed_ordering_helper.h"
#include "shared/source/helpers/compiler_product_helper.h"
#include "shared/source/helpers/gfx_core_helper.h"
#include "shared/source/helpers/windows/gmm_callbacks.h"
#include "shared/source/indirect_heap/indirect_heap.h"
@@ -1329,7 +1330,10 @@ HWTEST_TEMPLATED_F(WddmCommandStreamMockGdiTest, givenDirectSubmissionEnabledOnB
Dispatcher::getSizePreemption() +
directSubmission->getSizeDispatch(false, false, directSubmission->dispatchMonitorFenceRequired(false));
if (directSubmission->miMemFenceRequired) {
auto &compilerProductHelper = device->getCompilerProductHelper();
auto heaplessStateInit = compilerProductHelper.isHeaplessStateInitEnabled(compilerProductHelper.isHeaplessModeEnabled());
if (directSubmission->miMemFenceRequired && !heaplessStateInit) {
expectedSize += directSubmission->getSizeSystemMemoryFenceAddress();
}
if (directSubmission->isRelaxedOrderingEnabled()) {