Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move common code to shared directory

Browse Source 
Change-Id: I5f604de01e06d35cc1e045fffdd4a26d88ffca8c
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2020-10-06 11:54:04 +02:00
committed by sys_ocldev
parent caa212dcf3
commit 47f5867e8f
20 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/command_queue/hardware_interface_base.inl
View File

@ -107,7 +107,7 @@ void HardwareInterface<GfxFamily>::dispatchWalker(
auto numSupportedDevices = commandQueue.getGpgpuCommandStreamReceiver().getOsContext().getNumSupportedDevices(); auto numSupportedDevices = commandQueue.getGpgpuCommandStreamReceiver().getOsContext().getNumSupportedDevices();
TimestampPacketHelper::programCsrDependencies<GfxFamily>(*commandStream, csrDependencies, numSupportedDevices); TimestampPacketHelper::programCsrDependencies<GfxFamily>(*commandStream, csrDependencies, numSupportedDevices);
dsh->align(HardwareCommandsHelper<GfxFamily>::alignInterfaceDescriptorData); dsh->align(EncodeStates<GfxFamily>::alignInterfaceDescriptorData);
uint32_t interfaceDescriptorIndex = 0; uint32_t interfaceDescriptorIndex = 0;
const size_t offsetInterfaceDescriptorTable = dsh->getUsed(); const size_t offsetInterfaceDescriptorTable = dsh->getUsed();

2
opencl/source/device_queue/device_queue_hw_bdw_plus.inl
View File

@ -130,7 +130,7 @@ void DeviceQueueHw<GfxFamily>::addMediaStateClearCmds() {
addDcFlushToPipeControlWa(pipeControl); addDcFlushToPipeControlWa(pipeControl);
PreambleHelper<GfxFamily>::programVFEState(&slbCS, device->getHardwareInfo(), 0, 0, device->getSharedDeviceInfo().maxFrontEndThreads, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<GfxFamily>::programVFEState(&slbCS, device->getHardwareInfo(), 0u, 0, device->getSharedDeviceInfo().maxFrontEndThreads, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
} }
template <typename GfxFamily> template <typename GfxFamily>

3
opencl/source/helpers/hardware_commands_helper.h
View File

@ -143,9 +143,6 @@ struct HardwareCommandsHelper : public PerThreadDataHelper {
static void programCacheFlushAfterWalkerCommand(LinearStream *commandStream, const CommandQueue &commandQueue, const Kernel *kernel, uint64_t postSyncAddress); static void programCacheFlushAfterWalkerCommand(LinearStream *commandStream, const CommandQueue &commandQueue, const Kernel *kernel, uint64_t postSyncAddress);
static const size_t alignInterfaceDescriptorData = 64 * sizeof(uint8_t);
static const uint32_t alignIndirectStatePointer = 64 * sizeof(uint8_t);
static bool doBindingTablePrefetch(); static bool doBindingTablePrefetch();
static bool inlineDataProgrammingRequired(const Kernel &kernel); static bool inlineDataProgrammingRequired(const Kernel &kernel);

5
opencl/source/helpers/hardware_commands_helper_base.inl
View File

@ -46,13 +46,14 @@ size_t HardwareCommandsHelper<GfxFamily>::getSizeRequiredDSH(
? patchInfo.samplerStateArray->Offset - patchInfo.samplerStateArray->BorderColorOffset ? patchInfo.samplerStateArray->Offset - patchInfo.samplerStateArray->BorderColorOffset
: 0; : 0;
borderColorSize = alignUp(borderColorSize + alignIndirectStatePointer - 1, alignIndirectStatePointer); borderColorSize = alignUp(borderColorSize + EncodeStates<GfxFamily>::alignIndirectStatePointer - 1,
EncodeStates<GfxFamily>::alignIndirectStatePointer);
totalSize += borderColorSize + additionalSizeRequiredDsh(); totalSize += borderColorSize + additionalSizeRequiredDsh();
DEBUG_BREAK_IF(!(totalSize >= kernel.getDynamicStateHeapSize() || kernel.getKernelInfo().isVmeWorkload)); DEBUG_BREAK_IF(!(totalSize >= kernel.getDynamicStateHeapSize() || kernel.getKernelInfo().isVmeWorkload));
return alignUp(totalSize, alignInterfaceDescriptorData); return alignUp(totalSize, EncodeStates<GfxFamily>::alignInterfaceDescriptorData);
} }
template <typename GfxFamily> template <typename GfxFamily>

9
opencl/source/kernel/kernel.cpp
View File

@ -828,15 +828,6 @@ void Kernel::resizeSurfaceStateHeap(void *pNewSsh, size_t newSshSize, size_t new
localBindingTableOffset = newBindingTableOffset; localBindingTableOffset = newBindingTableOffset;
} }
uint32_t Kernel::getScratchSizeValueToProgramMediaVfeState(int scratchSize) {
scratchSize >>= MemoryConstants::kiloByteShiftSize;
uint32_t valueToProgram = 0;
while (scratchSize >>= 1) {
valueToProgram++;
}
return valueToProgram;
}
cl_int Kernel::setArg(uint32_t argIndex, size_t argSize, const void *argVal) { cl_int Kernel::setArg(uint32_t argIndex, size_t argSize, const void *argVal) {
cl_int retVal = CL_SUCCESS; cl_int retVal = CL_SUCCESS;
bool updateExposedKernel = true; bool updateExposedKernel = true;

1
opencl/source/kernel/kernel.h
View File

@ -204,7 +204,6 @@ class Kernel : public BaseObject<_cl_kernel> {
Program *getProgram() const { return program; } Program *getProgram() const { return program; }
static uint32_t getScratchSizeValueToProgramMediaVfeState(int scratchSize);
uint32_t getScratchSize() { uint32_t getScratchSize() {
return kernelInfo.patchInfo.mediavfestate ? kernelInfo.patchInfo.mediavfestate->PerThreadScratchSpace : 0; return kernelInfo.patchInfo.mediavfestate ? kernelInfo.patchInfo.mediavfestate->PerThreadScratchSpace : 0;
} }

2
opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
View File

@ -885,7 +885,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, GivenMultipleKernelsWhenDispatch
// create Indirect DSH heap // create Indirect DSH heap
auto &indirectHeap = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 8192); auto &indirectHeap = pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 8192);
indirectHeap.align(HardwareCommandsHelper<FamilyType>::alignInterfaceDescriptorData); indirectHeap.align(EncodeStates<FamilyType>::alignInterfaceDescriptorData);
auto dshBeforeMultiDisptach = indirectHeap.getUsed(); auto dshBeforeMultiDisptach = indirectHeap.getUsed();
HardwareInterface<FamilyType>::dispatchWalker( HardwareInterface<FamilyType>::dispatchWalker(

3
opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp
View File

@ -6,6 +6,7 @@
*/ */
#include "shared/source/helpers/pause_on_gpu_properties.h" #include "shared/source/helpers/pause_on_gpu_properties.h"
#include "shared/source/helpers/preamble.h"
#include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h"
#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
@ -461,7 +462,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueKernelTest, givenSecondEnqueueWithTheSameScra
MockKernelWithInternals mockKernel(*pClDevice); MockKernelWithInternals mockKernel(*pClDevice);
mockKernel.kernelInfo.patchInfo.mediavfestate = &mediaVFEstate; mockKernel.kernelInfo.patchInfo.mediavfestate = &mediaVFEstate;
auto sizeToProgram = Kernel::getScratchSizeValueToProgramMediaVfeState(scratchSize); auto sizeToProgram = PreambleHelper<FamilyType>::getScratchSizeValueToProgramMediaVfeState(scratchSize);
pCmdQ->enqueueKernel(mockKernel.mockKernel, 1, off, gws, nullptr, 0, nullptr, nullptr); pCmdQ->enqueueKernel(mockKernel.mockKernel, 1, off, gws, nullptr, 0, nullptr, nullptr);
hwParser.parseCommands<FamilyType>(*pCmdQ); hwParser.parseCommands<FamilyType>(*pCmdQ);

20
opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp
View File

@ -27,8 +27,8 @@
using namespace NEO; using namespace NEO;
struct TestParam2 { struct TestParam2 {
cl_uint ScratchSize; uint32_t scratchSize;
} TestParamTable2[] = {{1024}, {2048}, {4096}, {8192}, {16384}}; } TestParamTable2[] = {{1024u}, {2048u}, {4096u}, {8192u}, {16384u}};
struct TestParam { struct TestParam {
cl_uint globalWorkSizeX; cl_uint globalWorkSizeX;
@ -308,20 +308,20 @@ HWCMDTEST_P(IGFX_GEN8_CORE, EnqueueScratchSpaceTests, GivenKernelRequiringScratc
EXPECT_TRUE(csr.getAllocationsForReuse().peekIsEmpty()); EXPECT_TRUE(csr.getAllocationsForReuse().peekIsEmpty());
SPatchMediaVFEState mediaVFEstate; SPatchMediaVFEState mediaVFEstate;
auto scratchSize = GetParam().ScratchSize; auto scratchSize = GetParam().scratchSize;
mediaVFEstate.PerThreadScratchSpace = scratchSize; mediaVFEstate.PerThreadScratchSpace = scratchSize;
MockKernelWithInternals mockKernel(*pClDevice); MockKernelWithInternals mockKernel(*pClDevice);
mockKernel.kernelInfo.patchInfo.mediavfestate = &mediaVFEstate; mockKernel.kernelInfo.patchInfo.mediavfestate = &mediaVFEstate;
auto sizeToProgram = (scratchSize / MemoryConstants::kiloByte); uint32_t sizeToProgram = (scratchSize / static_cast<uint32_t>(MemoryConstants::kiloByte));
auto bitValue = 0u; uint32_t bitValue = 0u;
while (sizeToProgram >>= 1) { while (sizeToProgram >>= 1) {
bitValue++; bitValue++;
} }
auto valueToProgram = Kernel::getScratchSizeValueToProgramMediaVfeState(scratchSize); auto valueToProgram = PreambleHelper<FamilyType>::getScratchSizeValueToProgramMediaVfeState(scratchSize);
EXPECT_EQ(bitValue, valueToProgram); EXPECT_EQ(bitValue, valueToProgram);
enqueueKernel<FamilyType>(mockKernel); enqueueKernel<FamilyType>(mockKernel);
@ -443,20 +443,20 @@ HWTEST_P(EnqueueKernelWithScratch, GivenKernelRequiringScratchWhenItIsEnqueuedWi
pDevice->resetCommandStreamReceiver(mockCsr); pDevice->resetCommandStreamReceiver(mockCsr);
SPatchMediaVFEState mediaVFEstate; SPatchMediaVFEState mediaVFEstate;
auto scratchSize = 1024; uint32_t scratchSize = 1024u;
mediaVFEstate.PerThreadScratchSpace = scratchSize; mediaVFEstate.PerThreadScratchSpace = scratchSize;
MockKernelWithInternals mockKernel(*pClDevice); MockKernelWithInternals mockKernel(*pClDevice);
mockKernel.kernelInfo.patchInfo.mediavfestate = &mediaVFEstate; mockKernel.kernelInfo.patchInfo.mediavfestate = &mediaVFEstate;
auto sizeToProgram = (scratchSize / MemoryConstants::kiloByte); uint32_t sizeToProgram = (scratchSize / static_cast<uint32_t>(MemoryConstants::kiloByte));
auto bitValue = 0u; uint32_t bitValue = 0u;
while (sizeToProgram >>= 1) { while (sizeToProgram >>= 1) {
bitValue++; bitValue++;
} }
auto valueToProgram = Kernel::getScratchSizeValueToProgramMediaVfeState(scratchSize); auto valueToProgram = PreambleHelper<FamilyType>::getScratchSizeValueToProgramMediaVfeState(scratchSize);
EXPECT_EQ(bitValue, valueToProgram); EXPECT_EQ(bitValue, valueToProgram);
enqueueKernel<FamilyType, false>(mockKernel); enqueueKernel<FamilyType, false>(mockKernel);

5
opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp
View File

@ -7,6 +7,7 @@
#include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h" #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h"
#include "shared/source/command_container/command_encoder.h"
#include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/basic_math.h"
#include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/engine_node_helper.h"
#include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/memory_manager/unified_memory_manager.h"
@ -321,7 +322,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, HardwareCommandsTest, WhenAllocatingIndirectStateRes
auto usedBeforeIOH = ioh.getUsed(); auto usedBeforeIOH = ioh.getUsed();
auto usedBeforeSSH = ssh.getUsed(); auto usedBeforeSSH = ssh.getUsed();
dsh.align(HardwareCommandsHelper<FamilyType>::alignInterfaceDescriptorData); dsh.align(EncodeStates<FamilyType>::alignInterfaceDescriptorData);
size_t IDToffset = dsh.getUsed(); size_t IDToffset = dsh.getUsed();
dsh.getSpace(sizeof(INTERFACE_DESCRIPTOR_DATA)); dsh.getSpace(sizeof(INTERFACE_DESCRIPTOR_DATA));
@ -535,7 +536,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, HardwareCommandsTest, whenSendingIndirectStateThenKe
auto &ioh = cmdQ.getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 8192); auto &ioh = cmdQ.getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 8192);
auto &ssh = cmdQ.getIndirectHeap(IndirectHeap::SURFACE_STATE, 8192); auto &ssh = cmdQ.getIndirectHeap(IndirectHeap::SURFACE_STATE, 8192);
dsh.align(HardwareCommandsHelper<FamilyType>::alignInterfaceDescriptorData); dsh.align(EncodeStates<FamilyType>::alignInterfaceDescriptorData);
size_t IDToffset = dsh.getUsed(); size_t IDToffset = dsh.getUsed();
dsh.getSpace(sizeof(INTERFACE_DESCRIPTOR_DATA)); dsh.getSpace(sizeof(INTERFACE_DESCRIPTOR_DATA));

1
shared/source/command_container/command_encoder.h
View File

@ -72,6 +72,7 @@ struct EncodeStates {
using SAMPLER_STATE = typename GfxFamily::SAMPLER_STATE; using SAMPLER_STATE = typename GfxFamily::SAMPLER_STATE;
static const uint32_t alignIndirectStatePointer = MemoryConstants::cacheLineSize; static const uint32_t alignIndirectStatePointer = MemoryConstants::cacheLineSize;
static const size_t alignInterfaceDescriptorData = MemoryConstants::cacheLineSize;
static uint32_t copySamplerState(IndirectHeap *dsh, static uint32_t copySamplerState(IndirectHeap *dsh,
uint32_t samplerStateOffset, uint32_t samplerStateOffset,

4
shared/source/command_container/command_encoder.inl
View File

@ -33,7 +33,7 @@ uint32_t EncodeStates<Family>::copySamplerState(IndirectHeap *dsh,
auto sizeSamplerState = sizeof(SAMPLER_STATE) * samplerCount; auto sizeSamplerState = sizeof(SAMPLER_STATE) * samplerCount;
auto borderColorSize = samplerStateOffset - borderColorOffset; auto borderColorSize = samplerStateOffset - borderColorOffset;
dsh->align(alignIndirectStatePointer); dsh->align(EncodeStates<Family>::alignIndirectStatePointer);
auto borderColorOffsetInDsh = static_cast<uint32_t>(dsh->getUsed()); auto borderColorOffsetInDsh = static_cast<uint32_t>(dsh->getUsed());
auto borderColor = dsh->getSpace(borderColorSize); auto borderColor = dsh->getSpace(borderColorSize);
@ -312,7 +312,7 @@ template <typename Family>
void *EncodeDispatchKernel<Family>::getInterfaceDescriptor(CommandContainer &container, uint32_t &iddOffset) { void *EncodeDispatchKernel<Family>::getInterfaceDescriptor(CommandContainer &container, uint32_t &iddOffset) {
if (container.nextIddInBlock == container.getNumIddPerBlock()) { if (container.nextIddInBlock == container.getNumIddPerBlock()) {
container.getIndirectHeap(HeapType::DYNAMIC_STATE)->align(HardwareCommandsHelper<Family>::alignInterfaceDescriptorData); container.getIndirectHeap(HeapType::DYNAMIC_STATE)->align(EncodeStates<Family>::alignInterfaceDescriptorData);
container.setIddBlock(container.getHeapSpaceAllowGrow(HeapType::DYNAMIC_STATE, container.setIddBlock(container.getHeapSpaceAllowGrow(HeapType::DYNAMIC_STATE,
sizeof(INTERFACE_DESCRIPTOR_DATA) * container.getNumIddPerBlock())); sizeof(INTERFACE_DESCRIPTOR_DATA) * container.getNumIddPerBlock()));
container.nextIddInBlock = 0; container.nextIddInBlock = 0;

3
shared/source/helpers/preamble.h
View File

@ -38,7 +38,7 @@ struct PreambleHelper {
static void addPipeControlBeforeVfeCmd(LinearStream *pCommandStream, const HardwareInfo *hwInfo, aub_stream::EngineType engineType); static void addPipeControlBeforeVfeCmd(LinearStream *pCommandStream, const HardwareInfo *hwInfo, aub_stream::EngineType engineType);
static uint64_t programVFEState(LinearStream *pCommandStream, static uint64_t programVFEState(LinearStream *pCommandStream,
const HardwareInfo &hwInfo, const HardwareInfo &hwInfo,
int scratchSize, uint32_t scratchSize,
uint64_t scratchAddress, uint64_t scratchAddress,
uint32_t maxFrontEndThreads, uint32_t maxFrontEndThreads,
aub_stream::EngineType engineType, aub_stream::EngineType engineType,
@ -60,6 +60,7 @@ struct PreambleHelper {
static size_t getPerDssBackedBufferCommandsSize(const HardwareInfo &hwInfo); static size_t getPerDssBackedBufferCommandsSize(const HardwareInfo &hwInfo);
static size_t getCmdSizeForPipelineSelect(const HardwareInfo &hwInfo); static size_t getCmdSizeForPipelineSelect(const HardwareInfo &hwInfo);
static size_t getSemaphoreDelayCommandSize(); static size_t getSemaphoreDelayCommandSize();
static uint32_t getScratchSizeValueToProgramMediaVfeState(uint32_t scratchSize);
}; };
template <PRODUCT_FAMILY ProductFamily> template <PRODUCT_FAMILY ProductFamily>

12
shared/source/helpers/preamble_base.inl
View File

@ -13,8 +13,6 @@
#include "shared/source/helpers/preamble.h" #include "shared/source/helpers/preamble.h"
#include "shared/source/helpers/register_offsets.h" #include "shared/source/helpers/register_offsets.h"
#include "opencl/source/kernel/kernel.h"
#include "hw_cmds.h" #include "hw_cmds.h"
#include "reg_configs_common.h" #include "reg_configs_common.h"
@ -129,4 +127,14 @@ template <typename GfxFamily>
void PreambleHelper<GfxFamily>::programAdditionalFieldsInVfeState(VFE_STATE_TYPE *mediaVfeState, const HardwareInfo &hwInfo) { void PreambleHelper<GfxFamily>::programAdditionalFieldsInVfeState(VFE_STATE_TYPE *mediaVfeState, const HardwareInfo &hwInfo) {
} }
template <typename GfxFamily>
uint32_t PreambleHelper<GfxFamily>::getScratchSizeValueToProgramMediaVfeState(uint32_t scratchSize) {
scratchSize >>= static_cast<uint32_t>(MemoryConstants::kiloByteShiftSize);
uint32_t valueToProgram = 0;
while (scratchSize >>= 1) {
valueToProgram++;
}
return valueToProgram;
}
} // namespace NEO } // namespace NEO

6
shared/source/helpers/preamble_bdw_plus.inl
View File

@ -27,7 +27,7 @@ uint32_t PreambleHelper<GfxFamily>::getUrbEntryAllocationSize() {
template <typename GfxFamily> template <typename GfxFamily>
uint64_t PreambleHelper<GfxFamily>::programVFEState(LinearStream *pCommandStream, uint64_t PreambleHelper<GfxFamily>::programVFEState(LinearStream *pCommandStream,
const HardwareInfo &hwInfo, const HardwareInfo &hwInfo,
int scratchSize, uint32_t scratchSize,
uint64_t scratchAddress, uint64_t scratchAddress,
uint32_t maxFrontEndThreads, uint32_t maxFrontEndThreads,
aub_stream::EngineType engineType, aub_stream::EngineType engineType,
@ -42,8 +42,8 @@ uint64_t PreambleHelper<GfxFamily>::programVFEState(LinearStream *pCommandStream
cmd.setMaximumNumberOfThreads(maxFrontEndThreads); cmd.setMaximumNumberOfThreads(maxFrontEndThreads);
cmd.setNumberOfUrbEntries(1); cmd.setNumberOfUrbEntries(1);
cmd.setUrbEntryAllocationSize(PreambleHelper<GfxFamily>::getUrbEntryAllocationSize()); cmd.setUrbEntryAllocationSize(PreambleHelper<GfxFamily>::getUrbEntryAllocationSize());
cmd.setPerThreadScratchSpace(Kernel::getScratchSizeValueToProgramMediaVfeState(scratchSize)); cmd.setPerThreadScratchSpace(PreambleHelper<GfxFamily>::getScratchSizeValueToProgramMediaVfeState(scratchSize));
cmd.setStackSize(Kernel::getScratchSizeValueToProgramMediaVfeState(scratchSize)); cmd.setStackSize(PreambleHelper<GfxFamily>::getScratchSizeValueToProgramMediaVfeState(scratchSize));
uint32_t lowAddress = static_cast<uint32_t>(0xFFFFFFFF & scratchAddress); uint32_t lowAddress = static_cast<uint32_t>(0xFFFFFFFF & scratchAddress);
uint32_t highAddress = static_cast<uint32_t>(0xFFFFFFFF & (scratchAddress >> 32)); uint32_t highAddress = static_cast<uint32_t>(0xFFFFFFFF & (scratchAddress >> 32));
cmd.setScratchSpaceBasePointer(lowAddress); cmd.setScratchSpaceBasePointer(lowAddress);

2
shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
View File

@ -363,7 +363,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncodeStatesTest, giveNextIddInBlockZeorWhenD
uint32_t dims[] = {2, 1, 1}; uint32_t dims[] = {2, 1, 1};
std::unique_ptr<MockDispatchKernelEncoder> dispatchInterface(new MockDispatchKernelEncoder()); std::unique_ptr<MockDispatchKernelEncoder> dispatchInterface(new MockDispatchKernelEncoder());
cmdContainer->getIndirectHeap(HeapType::DYNAMIC_STATE)->align(HardwareCommandsHelper<FamilyType>::alignInterfaceDescriptorData); cmdContainer->getIndirectHeap(HeapType::DYNAMIC_STATE)->align(EncodeStates<FamilyType>::alignInterfaceDescriptorData);
cmdContainer->setIddBlock(cmdContainer->getHeapSpaceAllowGrow(HeapType::DYNAMIC_STATE, sizeof(INTERFACE_DESCRIPTOR_DATA) * cmdContainer->getNumIddPerBlock())); cmdContainer->setIddBlock(cmdContainer->getHeapSpaceAllowGrow(HeapType::DYNAMIC_STATE, sizeof(INTERFACE_DESCRIPTOR_DATA) * cmdContainer->getNumIddPerBlock()));
cmdContainer->nextIddInBlock = 0; cmdContainer->nextIddInBlock = 0;

4
shared/test/unit_test/gen11/test_preamble_gen11.cpp
View File

@ -58,7 +58,7 @@ GEN11TEST_F(Gen11PreambleVfeState, WaOff) {
typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL; typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL;
testWaTable->waSendMIFLUSHBeforeVFE = 0; testWaTable->waSendMIFLUSHBeforeVFE = 0;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<ICLFamily>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<ICLFamily>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0u, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<ICLFamily>(cs); parseCommands<ICLFamily>(cs);
@ -76,7 +76,7 @@ GEN11TEST_F(Gen11PreambleVfeState, WaOn) {
typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL; typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL;
testWaTable->waSendMIFLUSHBeforeVFE = 1; testWaTable->waSendMIFLUSHBeforeVFE = 1;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<ICLFamily>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<ICLFamily>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0u, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<ICLFamily>(cs); parseCommands<ICLFamily>(cs);

6
shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp
View File

@ -62,7 +62,7 @@ HWTEST2_F(Gen12LpPreambleVfeState, WaOff, IsTGLLP) {
typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL;
testWaTable->waSendMIFLUSHBeforeVFE = 0; testWaTable->waSendMIFLUSHBeforeVFE = 0;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0, 0, 672u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0u, 0, 672u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<FamilyType>(cs); parseCommands<FamilyType>(cs);
@ -82,7 +82,7 @@ HWTEST2_F(Gen12LpPreambleVfeState, givenCcsEngineWhenWaIsSetThenAppropriatePipeC
testWaTable->waSendMIFLUSHBeforeVFE = 1; testWaTable->waSendMIFLUSHBeforeVFE = 1;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0, 0, 672u, aub_stream::EngineType::ENGINE_CCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0u, 0, 672u, aub_stream::EngineType::ENGINE_CCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<FamilyType>(cs); parseCommands<FamilyType>(cs);
@ -101,7 +101,7 @@ HWTEST2_F(Gen12LpPreambleVfeState, givenRcsEngineWhenWaIsSetThenAppropriatePipeC
testWaTable->waSendMIFLUSHBeforeVFE = 1; testWaTable->waSendMIFLUSHBeforeVFE = 1;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0, 0, 672u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0u, 0, 672u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<FamilyType>(cs); parseCommands<FamilyType>(cs);

2
shared/test/unit_test/gen8/test_preamble_gen8.cpp
View File

@ -95,7 +95,7 @@ BDWTEST_F(PreambleVfeState, basic) {
typedef BDWFamily::PIPE_CONTROL PIPE_CONTROL; typedef BDWFamily::PIPE_CONTROL PIPE_CONTROL;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<BDWFamily>::programVFEState(&linearStream, *defaultHwInfo, 0, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<BDWFamily>::programVFEState(&linearStream, *defaultHwInfo, 0u, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<BDWFamily>(cs); parseCommands<BDWFamily>(cs);

4
shared/test/unit_test/gen9/skl/test_preamble_skl.cpp
View File

@ -107,7 +107,7 @@ GEN9TEST_F(PreambleVfeState, WaOff) {
typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL;
testWaTable->waSendMIFLUSHBeforeVFE = 0; testWaTable->waSendMIFLUSHBeforeVFE = 0;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0u, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<FamilyType>(cs); parseCommands<FamilyType>(cs);
@ -125,7 +125,7 @@ GEN9TEST_F(PreambleVfeState, WaOn) {
typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL;
testWaTable->waSendMIFLUSHBeforeVFE = 1; testWaTable->waSendMIFLUSHBeforeVFE = 1;
LinearStream &cs = linearStream; LinearStream &cs = linearStream;
PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable); PreambleHelper<FamilyType>::programVFEState(&linearStream, pPlatform->getClDevice(0)->getHardwareInfo(), 0u, 0, 168u, aub_stream::EngineType::ENGINE_RCS, AdditionalKernelExecInfo::NotApplicable);
parseCommands<FamilyType>(cs); parseCommands<FamilyType>(cs);