intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-21 09:14:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Flush tag update on device init"

Browse Source 
This reverts commit 5f7541084d.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2023-01-19 18:56:16 +01:00
committed by Compute-Runtime-Automation
parent b9b9155ee0
commit 9bf2edcfbf
7 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp
View File

@@ -228,17 +228,6 @@ HWTEST_TEMPLATED_F(BlitAuxTranslationTests, whenFlushTagUpdateThenMiFlushDwIsFlu
EXPECT_NE(cmdFound, cmdListBcs.end()); EXPECT_NE(cmdFound, cmdListBcs.end());
} }
HWTEST_TEMPLATED_F(BlitAuxTranslationTests, whenInitializeDeviceWithFirstSubmissionThenMiFlushDwIsFlushed) {
using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW;
EXPECT_EQ(SubmissionStatus::SUCCESS, bcsCsr->initializeDeviceWithFirstSubmission());
auto cmdListBcs = getCmdList<FamilyType>(bcsCsr->getCS(0), 0);
auto cmdFound = expectCommand<MI_FLUSH_DW>(cmdListBcs.begin(), cmdListBcs.end());
EXPECT_NE(cmdFound, cmdListBcs.end());
}
HWTEST_TEMPLATED_F(BlitAuxTranslationTests, whenFlushTagUpdateThenSetStallingCmdsFlag) { HWTEST_TEMPLATED_F(BlitAuxTranslationTests, whenFlushTagUpdateThenSetStallingCmdsFlag) {
auto ultCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(bcsCsr); auto ultCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(bcsCsr);

8
opencl/test/unit_test/linux/main_linux_dll.cpp
View File

@@ -884,12 +884,8 @@ TEST(DeviceTest, whenCheckBlitSplitEnabledThenReturnsTrue) {
EXPECT_TRUE(Device::isBlitSplitEnabled()); EXPECT_TRUE(Device::isBlitSplitEnabled());
} }
TEST(DeviceTest, givenCsrHwWhenCheckIsInitDeviceWithFirstSubmissionEnabledThenReturnsTrue) { TEST(DeviceTest, whenCheckIsInitDeviceWithFirstSubmissionEnabledThenReturnsTrue) {
EXPECT_TRUE(Device::isInitDeviceWithFirstSubmissionEnabled(CommandStreamReceiverType::CSR_HW)); EXPECT_TRUE(Device::isInitDeviceWithFirstSubmissionEnabled());
}
TEST(DeviceTest, givenCsrNonHwWhenCheckIsInitDeviceWithFirstSubmissionEnabledThenReturnsTrue) {
EXPECT_FALSE(Device::isInitDeviceWithFirstSubmissionEnabled(CommandStreamReceiverType::CSR_TBX));
} }
TEST(PlatformsDestructor, whenGlobalPlatformsDestructorIsCalledThenGlobalPlatformsAreDestroyed) { TEST(PlatformsDestructor, whenGlobalPlatformsDestructorIsCalledThenGlobalPlatformsAreDestroyed) {

6
shared/source/command_stream/command_stream_receiver_hw_base.inl
View File

@@ -1583,7 +1583,11 @@ void CommandStreamReceiverHw<GfxFamily>::createKernelArgsBufferAllocation() {
template <typename GfxFamily> template <typename GfxFamily>
SubmissionStatus CommandStreamReceiverHw<GfxFamily>::initializeDeviceWithFirstSubmission() { SubmissionStatus CommandStreamReceiverHw<GfxFamily>::initializeDeviceWithFirstSubmission() {
return flushTagUpdate(); auto lock = obtainUniqueOwnership();
auto &commandStream = getCS(EncodeBatchBufferStartOrEnd<GfxFamily>::getBatchBufferEndSize());
auto commandStreamStart = commandStream.getUsed();
return this->flushSmallTask(commandStream, commandStreamStart);
} }
template <typename GfxFamily> template <typename GfxFamily>

2
shared/source/device/device.cpp
View File

@@ -388,7 +388,7 @@ bool Device::createEngine(uint32_t deviceCsrIndex, EngineTypeUsage engineTypeUsa
if (!defaultEngineAlreadySet) { if (!defaultEngineAlreadySet) {
defaultEngineIndex = deviceCsrIndex; defaultEngineIndex = deviceCsrIndex;
if (osContext->isDebuggableContext() || Device::isInitDeviceWithFirstSubmissionEnabled(commandStreamReceiver->getType())) { if (Device::isInitDeviceWithFirstSubmissionEnabled()) {
if (SubmissionStatus::SUCCESS != commandStreamReceiver->initializeDeviceWithFirstSubmission()) { if (SubmissionStatus::SUCCESS != commandStreamReceiver->initializeDeviceWithFirstSubmission()) {
return false; return false;
} }

3
shared/source/device/device.h
View File

@@ -10,7 +10,6 @@
#include "shared/source/helpers/engine_control.h" #include "shared/source/helpers/engine_control.h"
#include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/engine_node_helper.h"
#include "shared/source/helpers/non_copyable_or_moveable.h" #include "shared/source/helpers/non_copyable_or_moveable.h"
#include "shared/source/helpers/options.h"
#include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h"
#include "shared/source/os_interface/performance_counters.h" #include "shared/source/os_interface/performance_counters.h"
#include "shared/source/utilities/reference_tracked_object.h" #include "shared/source/utilities/reference_tracked_object.h"
@@ -108,7 +107,7 @@ class Device : public ReferenceTrackedObject<Device> {
RootDeviceEnvironment &getRootDeviceEnvironmentRef() const; RootDeviceEnvironment &getRootDeviceEnvironmentRef() const;
bool isFullRangeSvm() const; bool isFullRangeSvm() const;
static bool isBlitSplitEnabled(); static bool isBlitSplitEnabled();
static bool isInitDeviceWithFirstSubmissionEnabled(CommandStreamReceiverType csrType); static bool isInitDeviceWithFirstSubmissionEnabled();
bool isBcsSplitSupported(); bool isBcsSplitSupported();
bool areSharedSystemAllocationsAllowed() const; bool areSharedSystemAllocationsAllowed() const;
template <typename SpecializedDeviceT> template <typename SpecializedDeviceT>

4
shared/source/dll/device_dll.cpp
View File

@@ -13,8 +13,8 @@ bool Device::isBlitSplitEnabled() {
return true; return true;
} }
bool Device::isInitDeviceWithFirstSubmissionEnabled(CommandStreamReceiverType csrType) { bool Device::isInitDeviceWithFirstSubmissionEnabled() {
return csrType == CommandStreamReceiverType::CSR_HW; return true;
} }
} // namespace NEO } // namespace NEO

3
shared/test/common/mocks/device_ult.cpp
View File

@@ -7,13 +7,14 @@
#include "shared/source/device/device.h" #include "shared/source/device/device.h"
#include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/ult_hw_config.h"
namespace NEO { namespace NEO {
bool Device::isBlitSplitEnabled() { bool Device::isBlitSplitEnabled() {
return ultHwConfig.useBlitSplit; return ultHwConfig.useBlitSplit;
} }
bool Device::isInitDeviceWithFirstSubmissionEnabled(CommandStreamReceiverType csrType) { bool Device::isInitDeviceWithFirstSubmissionEnabled() {
return ultHwConfig.useFirstSubmissionInitDevice; return ultHwConfig.useFirstSubmissionInitDevice;
} }