Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Program null surface for stateful buffers. 

Change-Id: I4c73dcf3902ac6ad422ffab16f41aa342cf736fd
This commit is contained in:
Zdunowski, Piotr 2018-04-23 11:53:37 +02:00
parent efda64eb4a
commit e01d268aca
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/kernel/kernel.cpp
View File

@ -1133,6 +1133,11 @@ cl_int Kernel::setArgBuffer(uint32_t argIndex,
storeKernelArg(argIndex, BUFFER_OBJ, nullptr, argVal, argSize);
if (requiresSshForBuffers()) {
auto surfaceState = ptrOffset(getSurfaceStateHeap(), kernelArgInfo.offsetHeap);
Buffer::setSurfaceState(&getContext(), surfaceState, 0, nullptr);
}
return CL_SUCCESS;
}
}

47
unit_tests/mem_obj/buffer_set_arg_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -31,6 +31,7 @@
#include "unit_tests/mocks/mock_program.h"
#include "unit_tests/helpers/debug_manager_state_restore.h"
#include "gtest/gtest.h"
#include "test.h"
using namespace OCLRT;
@ -73,6 +74,11 @@ class BufferSetArgTest : public ContextFixture,
pKernelInfo->kernelArgInfo[1].kernelArgPatchInfoVector[0].size = sizeOfPointer;
pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].size = sizeOfPointer;
kernelHeader.SurfaceStateHeapSize = sizeof(surfaceStateHeap);
pKernelInfo->heapInfo.pSsh = surfaceStateHeap;
pKernelInfo->heapInfo.pKernelHeader = &kernelHeader;
pKernelInfo->usesSsh = true;
pProgram = new MockProgram(pContext, false);
pKernel = new MockKernel(pProgram, *pKernelInfo, *pDevice);
@ -102,6 +108,8 @@ class BufferSetArgTest : public ContextFixture,
MockProgram *pProgram;
MockKernel *pKernel = nullptr;
KernelInfo *pKernelInfo = nullptr;
SKernelBinaryHeaderCommon kernelHeader;
char surfaceStateHeap[0x80];
char pCrossThreadData[64];
Buffer *buffer = nullptr;
};
@ -123,6 +131,43 @@ TEST_F(BufferSetArgTest, setKernelArgBufferWithWrongSizeReturnsInvalidArgValueEr
EXPECT_EQ(CL_INVALID_ARG_VALUE, err);
}
HWTEST_F(BufferSetArgTest, givenSetArgBufferWhenNullArgStatefulThenProgramNullSurfaceState) {
using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
using SURFACE_FORMAT = typename RENDER_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<const RENDER_SURFACE_STATE *>(
ptrOffset(pKernel->getSurfaceStateHeap(),
pKernelInfo->kernelArgInfo[0].offsetHeap));
pKernelInfo->requiresSshForBuffers = true;
cl_int ret = pKernel->setArgBuffer(0, sizeof(cl_mem), nullptr);
EXPECT_EQ(CL_SUCCESS, ret);
auto surfaceFormat = surfaceState->getSurfaceType();
auto surfacetype = surfaceState->getSurfaceFormat();
EXPECT_EQ(surfaceFormat, RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_NULL);
EXPECT_EQ(surfacetype, SURFACE_FORMAT::SURFACE_FORMAT_RAW);
}
HWTEST_F(BufferSetArgTest, givenSetArgBufferWithNullArgStatelessThenDontProgramNullSurfaceState) {
using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
using SURFACE_FORMAT = typename RENDER_SURFACE_STATE::SURFACE_FORMAT;
char sshOriginal[sizeof(surfaceStateHeap)];
memcpy(sshOriginal, surfaceStateHeap, sizeof(surfaceStateHeap));
pKernelInfo->requiresSshForBuffers = false;
cl_int ret = pKernel->setArgBuffer(0, sizeof(cl_mem), nullptr);
EXPECT_EQ(CL_SUCCESS, ret);
EXPECT_EQ(memcmp(sshOriginal, surfaceStateHeap, sizeof(surfaceStateHeap)), 0);
}
TEST_F(BufferSetArgTest, setKernelArgBufferFor32BitAddressing) {
auto pKernelArg = (void **)(pKernel->getCrossThreadData() +
pKernelInfo->kernelArgInfo[0].kernelArgPatchInfoVector[0].crossthreadOffset);