Rename core family names to meet naming convention

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-07-25 15:30:11 +00:00
committed by Compute-Runtime-Automation
parent c200c6e2dd
commit 8424b27754
292 changed files with 673 additions and 673 deletions

View File

@ -27,7 +27,7 @@ using namespace NEO;
#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl"
using CommandStreamReceiverHwTestGen11 = CommandStreamReceiverHwTest<ICLFamily>;
using CommandStreamReceiverHwTestGen11 = CommandStreamReceiverHwTest<Gen11Family>;
GEN11TEST_F(CommandStreamReceiverHwTestGen11, GivenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3Config) {
givenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3ConfigImpl();

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -18,7 +18,7 @@ auto expectedMask = pipelineSelectEnablePipelineSelectMaskBits |
pipelineSelectMediaSamplerPowerClockGateMaskBits;
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
cl_uint workDim = 1;
size_t globalWorkOffset[3] = {0, 0, 0};
@ -40,7 +40,7 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedVmeKernelFirstTimeTh
userEvent.setStatus(CL_COMPLETE);
parseCommands<ICLFamily>(*pCmdQ);
parseCommands<Gen11Family>(*pCmdQ);
ASSERT_NE(cmdPipelineSelect, nullptr);
auto *pCmd = genCmdCast<PIPELINE_SELECT *>(cmdPipelineSelect);
auto expectedPipelineSelection = PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU;
@ -50,7 +50,7 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedVmeKernelFirstTimeTh
}
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
cl_uint workDim = 1;
size_t globalWorkOffset[3] = {0, 0, 0};
@ -72,7 +72,7 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedNonVmeKernelFirstTim
userEvent.setStatus(CL_COMPLETE);
parseCommands<ICLFamily>(*pCmdQ);
parseCommands<Gen11Family>(*pCmdQ);
ASSERT_NE(cmdPipelineSelect, nullptr);
auto *pCmd = genCmdCast<PIPELINE_SELECT *>(cmdPipelineSelect);
auto expectedPipelineSelection = PIPELINE_SELECT::PIPELINE_SELECTION_GPGPU;
@ -82,8 +82,8 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueBlockedNonVmeKernelFirstTim
}
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<ICLFamily>();
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen11Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
@ -97,8 +97,8 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelFirstTimeThenProgr
}
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<ICLFamily>();
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<Gen11Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
@ -112,23 +112,23 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelFirstTimeThenPr
}
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<ICLFamily>();
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen11Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
}
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<ICLFamily>();
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen11Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
}
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<ICLFamily>();
enqueueVmeKernel<ICLFamily>();
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<Gen11Family>();
enqueueVmeKernel<Gen11Family>();
auto commands = getCommandsList<PIPELINE_SELECT>();
EXPECT_EQ(2u, commands.size());
@ -141,9 +141,9 @@ GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueVmeKernelAfterNonVmeKernelT
}
GEN11TEST_F(MediaKernelTest, givenGen11CsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) {
typedef typename ICLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<ICLFamily>();
enqueueRegularKernel<ICLFamily>();
typedef typename Gen11Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen11Family>();
enqueueRegularKernel<Gen11Family>();
auto commands = getCommandsList<PIPELINE_SELECT>();
EXPECT_EQ(2u, commands.size());

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -14,11 +14,11 @@
using namespace NEO;
typedef ICLFamily::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
typedef Gen11Family::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
struct AppendSurfaceStateParamsTest : public ::testing::Test {
void SetUp() override {
surfaceState = ICLFamily::cmdInitRenderSurfaceState;
surfaceState = Gen11Family::cmdInitRenderSurfaceState;
EXPECT_EQ(RENDER_SURFACE_STATE::SAMPLE_TAP_DISCARD_DISABLE_DISABLE, surfaceState.getSampleTapDiscardDisable());
imageDesc.image_width = 32;
@ -58,7 +58,7 @@ GEN11TEST_F(AppendSurfaceStateParamsTest, givenImageFormatWithoutAlphaChannelWhe
imageFormat.image_channel_order = CL_R;
createImage();
auto imageHw = static_cast<ImageHw<ICLFamily> *>(image.get());
auto imageHw = static_cast<ImageHw<Gen11Family> *>(image.get());
imageHw->appendSurfaceStateParams(&surfaceState, context.getDevice(0)->getRootDeviceIndex(), false);
bool tapDiscardConfigChanged = RENDER_SURFACE_STATE::SAMPLE_TAP_DISCARD_DISABLE_DISABLE != surfaceState.getSampleTapDiscardDisable();
@ -70,7 +70,7 @@ GEN11TEST_F(AppendSurfaceStateParamsTest, givenImageFormatWithAlphaChannelWhenAp
imageFormat.image_channel_order = CL_RGBA;
createImage();
auto imageHw = static_cast<ImageHw<ICLFamily> *>(image.get());
auto imageHw = static_cast<ImageHw<Gen11Family> *>(image.get());
imageHw->appendSurfaceStateParams(&surfaceState, context.getDevice(0)->getRootDeviceIndex(), false);
bool tapDiscardConfigChanged = RENDER_SURFACE_STATE::SAMPLE_TAP_DISCARD_DISABLE_DISABLE != surfaceState.getSampleTapDiscardDisable();