intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 22:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor CFE state programming

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-11-29 19:14:51 +00:00
committed by Compute-Runtime-Automation
parent 8128a5593f
commit 263becc3f8
6 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp
View File

@@ -159,14 +159,20 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenScratchEnabledWh
EXPECT_EQ(expectedAddress, address);
}
HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenNotSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveNotSetValue) {
HWTEST2_F(PreambleCfeStateXeHPAndLater, givenNotSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveNotSetValue, IsAtLeastXeHpCore) {
using CFE_STATE = typename FamilyType::CFE_STATE;
auto cfeState = reinterpret_cast<CFE_STATE *>(linearStream.getSpace(sizeof(CFE_STATE)));
*cfeState = FamilyType::cmdInitCfeState;
uint32_t numberOfWalkers = cfeState->getNumberOfWalkers();
uint32_t fusedEuDispach = cfeState->getFusedEuDispatch();
[[maybe_unused]] uint32_t numberOfWalkers = 0u;
[[maybe_unused]] uint32_t fusedEuDispach = 0u;
if constexpr (TestTraits<gfxCoreFamily>::numberOfWalkersInCfeStateSupported) {
numberOfWalkers = cfeState->getNumberOfWalkers();
}
if constexpr (TestTraits<gfxCoreFamily>::fusedEuDispatchSupported) {
fusedEuDispach = cfeState->getFusedEuDispatch();
}
uint32_t overDispatchControl = static_cast<uint32_t>(cfeState->getOverDispatchControl());
uint64_t expectedAddress = 1 << CFE_STATE::SCRATCHSPACEBUFFER_BIT_SHIFT;
@@ -176,13 +182,17 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenNotSetDebugFlagW
PreambleHelper<FamilyType>::programVfeState(pVfeCmd, *defaultHwInfo, 0u, expectedAddress, expectedMaxThreads, emptyProperties);
uint32_t maximumNumberOfThreads = cfeState->getMaximumNumberOfThreads();
EXPECT_EQ(numberOfWalkers, cfeState->getNumberOfWalkers());
EXPECT_EQ(fusedEuDispach, cfeState->getFusedEuDispatch());
if constexpr (TestTraits<gfxCoreFamily>::numberOfWalkersInCfeStateSupported) {
EXPECT_EQ(numberOfWalkers, cfeState->getNumberOfWalkers());
}
if constexpr (TestTraits<gfxCoreFamily>::fusedEuDispatchSupported) {
EXPECT_EQ(fusedEuDispach, cfeState->getFusedEuDispatch());
}
EXPECT_NE(expectedMaxThreads, maximumNumberOfThreads);
EXPECT_EQ(overDispatchControl, static_cast<uint32_t>(cfeState->getOverDispatchControl()));
}
HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveSetValue) {
HWTEST2_F(PreambleCfeStateXeHPAndLater, givenSetDebugFlagWhenPreambleCfeStateIsProgrammedThenCFEStateParamsHaveSetValue, IsAtLeastXeHpCore) {
using CFE_STATE = typename FamilyType::CFE_STATE;
uint32_t expectedValue1 = 1u;
@@ -210,7 +220,9 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, PreambleCfeStateXeHPAndLater, givenSetDebugFlagWhen
EXPECT_EQ(expectedValue1, static_cast<uint32_t>(cfeState->getOverDispatchControl()));
EXPECT_EQ(expectedValue1, cfeState->getLargeGRFThreadAdjustDisable());
EXPECT_EQ(expectedValue2, cfeState->getNumberOfWalkers());
if constexpr (TestTraits<gfxCoreFamily>::numberOfWalkersInCfeStateSupported) {
EXPECT_EQ(expectedValue2, cfeState->getNumberOfWalkers());
}
EXPECT_EQ(expectedValue2, cfeState->getMaximumNumberOfThreads());
}

5
shared/source/helpers/preamble_xehp_and_later.inl
View File

@@ -120,16 +120,11 @@ void PreambleHelper<GfxFamily>::programVfeState(void *pVfeState,
auto cfeState = reinterpret_cast<CFE_STATE *>(pVfeState);
CFE_STATE cmd = Family::cmdInitCfeState;
cmd.setNumberOfWalkers(1);
uint32_t lowAddress = uint32_t(0xFFFFFFFF & scratchAddress);
cmd.setScratchSpaceBuffer(lowAddress);
cmd.setMaximumNumberOfThreads(maxFrontEndThreads);
appendProgramVFEState(hwInfo, streamProperties, &cmd);
if (DebugManager.flags.CFENumberOfWalkers.get() != -1) {
cmd.setNumberOfWalkers(DebugManager.flags.CFENumberOfWalkers.get());
}
if (DebugManager.flags.CFEMaximumNumberOfThreads.get() != -1) {
cmd.setMaximumNumberOfThreads(DebugManager.flags.CFEMaximumNumberOfThreads.get());
}

5
shared/source/xe_hp_core/preamble_xe_hp_core.cpp
View File

@@ -39,6 +39,11 @@ void PreambleHelper<Family>::appendProgramVFEState(const HardwareInfo &hwInfo, c
if (!hwHelper.isFusedEuDispatchEnabled(hwInfo)) {
command->setFusedEuDispatch(true);
}
command->setNumberOfWalkers(1);
if (DebugManager.flags.CFENumberOfWalkers.get() != -1) {
command->setNumberOfWalkers(DebugManager.flags.CFENumberOfWalkers.get());
}
}
template <>

5
shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp
View File

@@ -32,6 +32,11 @@ void PreambleHelper<Family>::appendProgramVFEState(const HardwareInfo &hwInfo, c
if (!hwHelper.isFusedEuDispatchEnabled(hwInfo)) {
command->setFusedEuDispatch(true);
}
command->setNumberOfWalkers(1);
if (DebugManager.flags.CFENumberOfWalkers.get() != -1) {
command->setNumberOfWalkers(DebugManager.flags.CFENumberOfWalkers.get());
}
}
template <>

2
shared/test/common/xe_hp_core/test_traits_xe_hp_core.h
View File

@@ -23,4 +23,6 @@ struct TestTraits<IGFX_XE_HP_CORE> {
static constexpr bool auxTranslationSupported = true;
static constexpr bool isUsingNonDefaultIoctls = true;
static constexpr bool deviceEnqueueSupport = false;
static constexpr bool fusedEuDispatchSupported = true;
static constexpr bool numberOfWalkersInCfeStateSupported = true;
};

2
shared/test/common/xe_hpg_core/test_traits_xe_hpg_core.h
View File

@@ -23,4 +23,6 @@ struct TestTraits<IGFX_XE_HPG_CORE> {
static constexpr bool auxTranslationSupported = true;
static constexpr bool deviceEnqueueSupport = false;
static constexpr bool isUsingNonDefaultIoctls = true;
static constexpr bool fusedEuDispatchSupported = true;
static constexpr bool numberOfWalkersInCfeStateSupported = true;
};