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

Rename core family names to meet naming convention

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp
View File

@ -33,7 +33,7 @@ constexpr uint32_t allSupportedCopyEngines[] = {
aub_stream::EngineType::ENGINE_BCS8,
};
using OneTileXeHpcTests = CopyEnginesXeHpcFixture<1, XE_HPC_COREFamily>;
using OneTileXeHpcTests = CopyEnginesXeHpcFixture<1, XeHpcCoreFamily>;
INSTANTIATE_TEST_CASE_P(
MemCopyBcsCmd,
@ -84,7 +84,7 @@ XE_HPC_CORETEST_P(OneTileXeHpcTests, givenCopyBufferRectWithBigSizesWhenHostPtrB
givenCopyBufferRectWithBigSizesWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl<FamilyType>();
}
using OneTileSystemMemoryXeHpcTests = CopyEnginesXeHpcFixture<1, XE_HPC_COREFamily, false>;
using OneTileSystemMemoryXeHpcTests = CopyEnginesXeHpcFixture<1, XeHpcCoreFamily, false>;
INSTANTIATE_TEST_CASE_P(
MemCopyBcsCmd,

2
opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp
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();

38
opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp
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());

10
opencl/test/unit_test/gen11/image_tests_gen11.cpp
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();

10
opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
View File

@ -17,14 +17,14 @@
using namespace NEO;
struct Gen12LpCoherencyRequirements : public ::testing::Test {
using STATE_COMPUTE_MODE = typename TGLLPFamily::STATE_COMPUTE_MODE;
using PIPE_CONTROL = typename TGLLPFamily::PIPE_CONTROL;
using PIPELINE_SELECT = typename TGLLPFamily::PIPELINE_SELECT;
using STATE_COMPUTE_MODE = typename Gen12LpFamily::STATE_COMPUTE_MODE;
using PIPE_CONTROL = typename Gen12LpFamily::PIPE_CONTROL;
using PIPELINE_SELECT = typename Gen12LpFamily::PIPELINE_SELECT;
struct myCsr : public CommandStreamReceiverHw<TGLLPFamily> {
struct myCsr : public CommandStreamReceiverHw<Gen12LpFamily> {
using CommandStreamReceiver::commandStream;
using CommandStreamReceiver::streamProperties;
myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw<TGLLPFamily>(executionEnvironment, 0, 1){};
myCsr(ExecutionEnvironment &executionEnvironment) : CommandStreamReceiverHw<Gen12LpFamily>(executionEnvironment, 0, 1){};
CsrSizeRequestFlags *getCsrRequestFlags() { return &csrSizeRequestFlags; }
};

2
opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl
View File

@ -27,7 +27,7 @@ using namespace NEO;
#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl"
using CommandStreamReceiverHwTestGen12lp = CommandStreamReceiverHwTest<TGLLPFamily>;
using CommandStreamReceiverHwTestGen12lp = CommandStreamReceiverHwTest<Gen12LpFamily>;
GEN12LPTEST_F(CommandStreamReceiverHwTestGen12lp, givenPreambleSentWhenL3ConfigRequestChangedThenDontProgramL3Register) {
size_t gws = 1;

38
opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -13,7 +13,7 @@ using namespace NEO;
typedef MediaKernelFixture<HelloWorldFixtureFactory> MediaKernelTest;
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
cl_uint workDim = 1;
size_t globalWorkOffset[3] = {0, 0, 0};
@ -35,7 +35,7 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedVmeKernelFirstTi
userEvent.setStatus(CL_COMPLETE);
parseCommands<TGLLPFamily>(*pCmdQ);
parseCommands<Gen12LpFamily>(*pCmdQ);
ASSERT_NE(cmdPipelineSelect, nullptr);
auto *pCmd = genCmdCast<PIPELINE_SELECT *>(cmdPipelineSelect);
@ -47,7 +47,7 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedVmeKernelFirstTi
}
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
cl_uint workDim = 1;
size_t globalWorkOffset[3] = {0, 0, 0};
@ -69,7 +69,7 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedNonVmeKernelFirs
userEvent.setStatus(CL_COMPLETE);
parseCommands<TGLLPFamily>(*pCmdQ);
parseCommands<Gen12LpFamily>(*pCmdQ);
ASSERT_NE(cmdPipelineSelect, nullptr);
auto *pCmd = genCmdCast<PIPELINE_SELECT *>(cmdPipelineSelect);
@ -81,8 +81,8 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueBlockedNonVmeKernelFirs
}
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<TGLLPFamily>();
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen12LpFamily>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
@ -96,8 +96,8 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelFirstTimeThenP
}
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<TGLLPFamily>();
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<Gen12LpFamily>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
@ -111,23 +111,23 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelFirstTimeTh
}
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<TGLLPFamily>();
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen12LpFamily>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
}
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<TGLLPFamily>();
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen12LpFamily>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
}
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<TGLLPFamily>();
enqueueVmeKernel<TGLLPFamily>();
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<Gen12LpFamily>();
enqueueVmeKernel<Gen12LpFamily>();
auto commands = getCommandsList<PIPELINE_SELECT>();
EXPECT_EQ(2u, commands.size());
@ -140,9 +140,9 @@ GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueVmeKernelAfterNonVmeKer
}
GEN12LPTEST_F(MediaKernelTest, givenGen12LpCsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) {
typedef typename TGLLPFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<TGLLPFamily>();
enqueueRegularKernel<TGLLPFamily>();
typedef typename Gen12LpFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen12LpFamily>();
enqueueRegularKernel<Gen12LpFamily>();
auto commands = getCommandsList<PIPELINE_SELECT>();
EXPECT_EQ(2u, commands.size());

2
opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp
View File

@ -28,7 +28,7 @@ using namespace NEO;
#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl"
using CommandStreamReceiverHwTestGen8 = CommandStreamReceiverHwTest<BDWFamily>;
using CommandStreamReceiverHwTestGen8 = CommandStreamReceiverHwTest<Gen8Family>;
GEN8TEST_F(CommandStreamReceiverHwTestGen8, GivenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3Config) {
givenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3ConfigImpl();

4
opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -15,7 +15,7 @@ using namespace NEO;
typedef MediaKernelFixture<HelloWorldFixtureFactory> MediaKernelTest;
GEN8TEST_F(MediaKernelTest, givenGen8CSRWhenEnqueueVmeKernelThenProgramOnlyPipelineSelection) {
typedef typename BDWFamily::PIPELINE_SELECT PIPELINE_SELECT;
typedef typename Gen8Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<FamilyType>();
auto pCmd = getCommand<PIPELINE_SELECT>();
auto expectedMask = pipelineSelectEnablePipelineSelectMaskBits;

2
opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp
View File

@ -31,7 +31,7 @@ using namespace NEO;
#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl"
using CommandStreamReceiverHwTestGen9 = CommandStreamReceiverHwTest<SKLFamily>;
using CommandStreamReceiverHwTestGen9 = CommandStreamReceiverHwTest<Gen9Family>;
GEN9TEST_F(UltCommandStreamReceiverTest, whenPreambleIsProgrammedThenStateSipCmdIsNotPresentInPreambleCmdStream) {
using STATE_SIP = typename FamilyType::STATE_SIP;

4
opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp
View File

@ -22,7 +22,7 @@ namespace NEO {
using Gen9EnqueueTest = Test<ClDeviceFixture>;
GEN9TEST_F(Gen9EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenRoundRobinPolicyIsProgrammed) {
MockContext mc;
CommandQueueHw<SKLFamily> cmdQ{&mc, pClDevice, 0, false};
CommandQueueHw<Gen9Family> cmdQ{&mc, pClDevice, 0, false};
SPatchExecutionEnvironment sPatchExecEnv = {};
sPatchExecEnv.SubgroupIndependentForwardProgressRequired = true;
@ -41,7 +41,7 @@ GEN9TEST_F(Gen9EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKe
GEN9TEST_F(Gen9EnqueueTest, givenKernelNotRequiringIndependentForwardProgressWhenKernelIsSubmittedThenAgeBasedPolicyIsProgrammed) {
MockContext mc;
CommandQueueHw<SKLFamily> cmdQ{&mc, pClDevice, 0, false};
CommandQueueHw<Gen9Family> cmdQ{&mc, pClDevice, 0, false};
SPatchExecutionEnvironment sPatchExecEnv = {};
sPatchExecEnv.SubgroupIndependentForwardProgressRequired = false;

38
opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -15,7 +15,7 @@ using namespace NEO;
typedef MediaKernelFixture<HelloWorldFixtureFactory> MediaKernelTest;
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
cl_uint workDim = 1;
size_t globalWorkOffset[3] = {0, 0, 0};
@ -37,7 +37,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedVmeKernelFirstTimeThen
userEvent.setStatus(CL_COMPLETE);
parseCommands<SKLFamily>(*pCmdQ);
parseCommands<Gen9Family>(*pCmdQ);
ASSERT_NE(cmdPipelineSelect, nullptr);
auto *pCmd = genCmdCast<PIPELINE_SELECT *>(cmdPipelineSelect);
@ -49,7 +49,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedVmeKernelFirstTimeThen
}
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
cl_uint workDim = 1;
size_t globalWorkOffset[3] = {0, 0, 0};
@ -71,7 +71,7 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedNonVmeKernelFirstTimeT
userEvent.setStatus(CL_COMPLETE);
parseCommands<SKLFamily>(*pCmdQ);
parseCommands<Gen9Family>(*pCmdQ);
ASSERT_NE(cmdPipelineSelect, nullptr);
auto *pCmd = genCmdCast<PIPELINE_SELECT *>(cmdPipelineSelect);
@ -83,8 +83,8 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedNonVmeKernelFirstTimeT
}
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<SKLFamily>();
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen9Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
@ -98,8 +98,8 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelFirstTimeThenProgram
}
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<SKLFamily>();
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<Gen9Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
@ -113,23 +113,23 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelFirstTimeThenProg
}
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelTwiceThenProgramPipelineSelectOnce) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<SKLFamily>();
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen9Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
}
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelTwiceThenProgramPipelineSelectOnce) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<SKLFamily>();
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen9Family>();
auto numCommands = getCommandsList<PIPELINE_SELECT>().size();
EXPECT_EQ(1u, numCommands);
}
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelAfterNonVmeKernelThenProgramPipelineSelectionAndMediaSamplerTwice) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<SKLFamily>();
enqueueVmeKernel<SKLFamily>();
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueRegularKernel<Gen9Family>();
enqueueVmeKernel<Gen9Family>();
auto commands = getCommandsList<PIPELINE_SELECT>();
EXPECT_EQ(2u, commands.size());
@ -142,9 +142,9 @@ GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueVmeKernelAfterNonVmeKernelThe
}
GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueNonVmeKernelAfterVmeKernelThenProgramProgramPipelineSelectionAndMediaSamplerTwice) {
typedef typename SKLFamily::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<SKLFamily>();
enqueueRegularKernel<SKLFamily>();
typedef typename Gen9Family::PIPELINE_SELECT PIPELINE_SELECT;
enqueueVmeKernel<Gen9Family>();
enqueueRegularKernel<Gen9Family>();
auto commands = getCommandsList<PIPELINE_SELECT>();
EXPECT_EQ(2u, commands.size());

6
opencl/test/unit_test/gen9/test_preemption_gen9.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2021 Intel Corporation
* Copyright (C) 2020-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -17,8 +17,8 @@
namespace NEO {
template <>
void HardwareParse::findCsrBaseAddress<SKLFamily>() {
typedef typename GEN9::GPGPU_CSR_BASE_ADDRESS GPGPU_CSR_BASE_ADDRESS;
void HardwareParse::findCsrBaseAddress<Gen9Family>() {
typedef typename Gen9::GPGPU_CSR_BASE_ADDRESS GPGPU_CSR_BASE_ADDRESS;
itorGpgpuCsrBaseAddress = find<GPGPU_CSR_BASE_ADDRESS *>(cmdList.begin(), itorWalker);
if (itorGpgpuCsrBaseAddress != itorWalker) {
cmdGpgpuCsrBaseAddress = *itorGpgpuCsrBaseAddress;

8
opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp
View File

@ -76,17 +76,17 @@ PVCTEST_F(HwHelperTestsPvc, givenRevisionEnumAndPlatformFamilyTypeThenProperValu
}
PVCTEST_F(HwHelperTestsPvc, givenDefaultMemorySynchronizationCommandsWhenGettingSizeForAdditionalSynchronizationThenCorrectValueIsReturned) {
using MI_SEMAPHORE_WAIT = typename XE_HPC_COREFamily::MI_SEMAPHORE_WAIT;
using MI_SEMAPHORE_WAIT = typename XeHpcCoreFamily::MI_SEMAPHORE_WAIT;
EXPECT_EQ(sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands<XE_HPC_COREFamily>::getSizeForAdditonalSynchronization(*defaultHwInfo));
EXPECT_EQ(sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands<XeHpcCoreFamily>::getSizeForAdditonalSynchronization(*defaultHwInfo));
}
PVCTEST_F(HwHelperTestsPvc, givenDebugMemorySynchronizationCommandsWhenGettingSizeForAdditionalSynchronizationThenCorrectValueIsReturned) {
DebugManagerStateRestore restorer;
DebugManager.flags.DisablePipeControlPrecedingPostSyncCommand.set(1);
using MI_SEMAPHORE_WAIT = typename XE_HPC_COREFamily::MI_SEMAPHORE_WAIT;
using MI_SEMAPHORE_WAIT = typename XeHpcCoreFamily::MI_SEMAPHORE_WAIT;
EXPECT_EQ(2 * sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands<XE_HPC_COREFamily>::getSizeForAdditonalSynchronization(*defaultHwInfo));
EXPECT_EQ(2 * sizeof(MI_SEMAPHORE_WAIT), MemorySynchronizationCommands<XeHpcCoreFamily>::getSizeForAdditonalSynchronization(*defaultHwInfo));
}
PVCTEST_F(HwHelperTestsPvc, givenRevisionIdWhenGetComputeUnitsUsedForScratchThenReturnValidValue) {