diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp index b2f912c321..09b7aaf03c 100644 --- a/level_zero/core/source/cmdlist/cmdlist_imp.cpp +++ b/level_zero/core/source/cmdlist/cmdlist_imp.cpp @@ -253,7 +253,6 @@ void CommandListImp::setStreamPropertiesDefaultSettings(NEO::StreamProperties &s streamProperties.frontEndState.setPropertiesDisableOverdispatchEngineInstanced(cmdListDefaultDisableOverdispatch, cmdListDefaultEngineInstancedDevice, true); streamProperties.pipelineSelect.setPropertiesModeSelectedMediaSamplerClockGate(cmdListDefaultPipelineSelectModeSelected, cmdListDefaultMediaSamplerClockGate, true); - streamProperties.stateBaseAddress.setPropertyGlobalAtomics(cmdListDefaultGlobalAtomics, true); } void CommandListImp::enableInOrderExecution() { diff --git a/shared/source/command_stream/command_stream_receiver_hw_base.inl b/shared/source/command_stream/command_stream_receiver_hw_base.inl index af23ad4f59..65ba585fba 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_base.inl @@ -1543,7 +1543,6 @@ inline void CommandStreamReceiverHw::handleStateBaseAddressStateTrans isStateBaseAddressDirty = true; this->lastSentUseGlobalAtomics = globalAtomics; } - this->streamProperties.stateBaseAddress.setPropertyGlobalAtomics(globalAtomics, false); } } diff --git a/shared/source/command_stream/definitions/stream_properties.inl b/shared/source/command_stream/definitions/stream_properties.inl index 7c6493e1cb..f6f58c4bfc 100644 --- a/shared/source/command_stream/definitions/stream_properties.inl +++ b/shared/source/command_stream/definitions/stream_properties.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -154,7 +154,6 @@ struct StateBaseAddressProperties { void setPropertiesDynamicState(int64_t dynamicStateBaseAddress, size_t dynamicStateSize); void setPropertiesIndirectState(int64_t indirectObjectBaseAddress, size_t indirectObjectSize); void setPropertyStatelessMocs(int32_t statelessMocs); - void setPropertyGlobalAtomics(bool globalAtomics, bool clearDirtyState); void copyPropertiesAll(const StateBaseAddressProperties &properties); void copyPropertiesStatelessMocs(const StateBaseAddressProperties &properties); diff --git a/shared/source/command_stream/stream_properties.cpp b/shared/source/command_stream/stream_properties.cpp index e08dc826d1..600ae17774 100644 --- a/shared/source/command_stream/stream_properties.cpp +++ b/shared/source/command_stream/stream_properties.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -432,20 +432,6 @@ void StateBaseAddressProperties::setPropertyStatelessMocs(int32_t statelessMocs) this->statelessMocs.set(statelessMocs); } -void StateBaseAddressProperties::setPropertyGlobalAtomics(bool globalAtomics, bool clearDirtyState) { - DEBUG_BREAK_IF(!this->propertiesSupportLoaded); - - if (!clearDirtyState) { - this->globalAtomics.isDirty = false; - } - if (this->stateBaseAddressPropertiesSupport.globalAtomics) { - this->globalAtomics.set(globalAtomics); - } - if (clearDirtyState) { - this->globalAtomics.isDirty = false; - } -} - void StateBaseAddressProperties::setPropertiesAll(bool globalAtomics, int32_t statelessMocs, int64_t bindingTablePoolBaseAddress, size_t bindingTablePoolSize, int64_t surfaceStateBaseAddress, size_t surfaceStateSize, diff --git a/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp b/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp index 6807dd37b3..67a97af6b2 100644 --- a/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp +++ b/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -1081,46 +1081,6 @@ TEST(StreamPropertiesTests, givenStateBaseAddressCommonBaseAddressAndSizeWhenSet EXPECT_FALSE(sbaProperties.indirectObjectSize.isDirty); } -TEST(StreamPropertiesTests, givenGlobalAtomicsStateBaseAddressPropertyWhenSettingPropertyAndCheckIfSupportedThenExpectCorrectState) { - bool clearDirtyState = false; - MockStateBaseAddressProperties sbaProperties{}; - sbaProperties.propertiesSupportLoaded = true; - sbaProperties.stateBaseAddressPropertiesSupport.globalAtomics = false; - - bool globalAtomics = false; - sbaProperties.setPropertyGlobalAtomics(globalAtomics, clearDirtyState); - EXPECT_FALSE(sbaProperties.isDirty()); - EXPECT_EQ(-1, sbaProperties.globalAtomics.value); - - sbaProperties.stateBaseAddressPropertiesSupport.globalAtomics = true; - sbaProperties.setPropertyGlobalAtomics(globalAtomics, clearDirtyState); - EXPECT_TRUE(sbaProperties.isDirty()); - EXPECT_EQ(0, sbaProperties.globalAtomics.value); - - sbaProperties.setPropertyGlobalAtomics(globalAtomics, clearDirtyState); - EXPECT_FALSE(sbaProperties.isDirty()); - EXPECT_EQ(0, sbaProperties.globalAtomics.value); - - globalAtomics = true; - sbaProperties.setPropertyGlobalAtomics(globalAtomics, clearDirtyState); - EXPECT_TRUE(sbaProperties.isDirty()); - EXPECT_EQ(1, sbaProperties.globalAtomics.value); - - sbaProperties.setPropertyGlobalAtomics(globalAtomics, clearDirtyState); - EXPECT_FALSE(sbaProperties.isDirty()); - EXPECT_EQ(1, sbaProperties.globalAtomics.value); - - sbaProperties.setPropertyGlobalAtomics(globalAtomics, clearDirtyState); - EXPECT_FALSE(sbaProperties.isDirty()); - EXPECT_EQ(1, sbaProperties.globalAtomics.value); - - clearDirtyState = true; - globalAtomics = false; - sbaProperties.setPropertyGlobalAtomics(globalAtomics, clearDirtyState); - EXPECT_FALSE(sbaProperties.isDirty()); - EXPECT_EQ(0, sbaProperties.globalAtomics.value); -} - TEST(StreamPropertiesTests, givenStatelessMocsStateBaseAddressPropertyWhenSettingPropertyAndCheckIfSupportedThenExpectCorrectState) { MockStateBaseAddressProperties sbaProperties{}; sbaProperties.propertiesSupportLoaded = true;