Revert "Enable BCS split WA in OCL"

This reverts commit d672920121.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>

opencl/source/command_queue/command_queue.h

@@ -251,7 +251,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
 
     static bool isAssignEngineRoundRobinEnabled();
     static bool isTimestampWaitEnabled();
-    static bool isBlitSplitEnabled();
 
     MOCKABLE_VIRTUAL void releaseIndirectHeap(IndirectHeap::Type heapType);
 

opencl/source/command_queue/enqueue_common.h

@@ -1105,8 +1105,7 @@ size_t CommandQueueHw<GfxFamily>::calculateHostPtrSizeForImage(const size_t *reg
 
 template <typename GfxFamily>
 bool CommandQueueHw<GfxFamily>::isSplitEnqueueBlitSupported() {
-    auto bcsSplit = HwInfoConfig::get(getDevice().getHardwareInfo().platform.eProductFamily)->isBlitSplitEnqueueWARequired(getDevice().getHardwareInfo()) &&
+    auto bcsSplit = HwInfoConfig::get(getDevice().getHardwareInfo().platform.eProductFamily)->isBlitSplitEnqueueWARequired(getDevice().getHardwareInfo());
-                    CommandQueue::isBlitSplitEnabled();
 
     if (DebugManager.flags.SplitBcsCopy.get() != -1) {
         bcsSplit = DebugManager.flags.SplitBcsCopy.get();

opencl/source/dll/command_queue_dll.cpp

@@ -17,8 +17,4 @@ bool CommandQueue::isTimestampWaitEnabled() {
     return true;
 }
 
-bool CommandQueue::isBlitSplitEnabled() {
-    return true;
-}
-
 } // namespace NEO

opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp

@@ -307,8 +307,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenCheckIsSplitEnqueueBlit
     DebugManagerStateRestore restorer;
     DebugManager.flags.SplitBcsCopy.set(1);
     auto *cmdQHw = static_cast<CommandQueueHw<FamilyType> *>(this->pCmdQ);
-    VariableBackup<UltHwConfig> backup{&ultHwConfig};
-    ultHwConfig.useBlitSplit = true;
     {
         EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::HostToHost, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
         EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::LocalToLocal, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
@@ -334,14 +332,6 @@ HWTEST_F(IoqCommandQueueHwBlitTest, givenSplitBcsCopyWhenCheckIsSplitEnqueueBlit
         EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::LocalToHost, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
         EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::HostToLocal, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
     }
-    {
-        DebugManager.flags.SplitBcsCopy.set(-1);
-        ultHwConfig.useBlitSplit = false;
-        EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::HostToHost, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
-        EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::LocalToLocal, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
-        EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::LocalToHost, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
-        EXPECT_FALSE(cmdQHw->isSplitEnqueueBlitNeeded(TransferDirection::HostToLocal, 64 * MemoryConstants::megaByte, *cmdQHw->getBcsCommandStreamReceiver(aub_stream::EngineType::ENGINE_BCS)));
-    }
 }
 
 char hostPtr[16 * MemoryConstants::megaByte];

opencl/test/unit_test/libult/command_queue_ult.cpp

@@ -19,8 +19,4 @@ bool CommandQueue::isTimestampWaitEnabled() {
     return ultHwConfig.useWaitForTimestamps;
 }
 
-bool CommandQueue::isBlitSplitEnabled() {
-    return ultHwConfig.useBlitSplit;
-}
-
 } // namespace NEO

opencl/test/unit_test/linux/main_linux_dll.cpp

@@ -895,10 +895,6 @@ TEST(CommandQueueTest, whenCheckEngineTimestampWaitEnabledThenReturnsTrue) {
     EXPECT_TRUE(CommandQueue::isTimestampWaitEnabled());
 }
 
-TEST(CommandQueueTest, whenCheckBlitSplitEnabledThenReturnsTrue) {
-    EXPECT_TRUE(CommandQueue::isBlitSplitEnabled());
-}
-
 TEST(PlatformsDestructor, whenGlobalPlatformsDestructorIsCalledThenGlobalPlatformsAreDestroyed) {
     EXPECT_NE(nullptr, platformsImpl);
     platformsDestructor();

shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl

@@ -165,11 +165,6 @@ bool HwInfoConfigHw<gfxProduct>::isBlitCopyRequiredForLocalMemory(const Hardware
     return false;
 }
 
-template <>
-bool HwInfoConfigHw<gfxProduct>::isBlitSplitEnqueueWARequired(const HardwareInfo &hwInfo) const {
-    return true;
-}
-
 template <>
 bool HwInfoConfigHw<gfxProduct>::isImplicitScalingSupported(const HardwareInfo &hwInfo) const {
     return getSteppingFromHwRevId(hwInfo) >= REVISION_B;

shared/test/common/base_ult_config_listener.cpp

@@ -36,7 +36,7 @@ void NEO::BaseUltConfigListener::OnTestEnd(const ::testing::TestInfo &) {
 
     // Ensure that global state is restored
     UltHwConfig expectedState{};
-    static_assert(sizeof(UltHwConfig) == 13 * sizeof(bool), ""); // Ensure that there is no internal padding
+    static_assert(sizeof(UltHwConfig) == 12 * sizeof(bool), ""); // Ensure that there is no internal padding
     EXPECT_EQ(0, memcmp(&expectedState, &ultHwConfig, sizeof(UltHwConfig)));
 
     EXPECT_EQ(0, memcmp(&referencedHwInfo.platform, &defaultHwInfo->platform, sizeof(PLATFORM)));

shared/test/common/helpers/ult_hw_config.h

@@ -13,7 +13,6 @@ struct UltHwConfig {
     bool useMockedPrepareDeviceEnvironmentsFunc = true;
     bool forceOsAgnosticMemoryManager = true;
     bool useWaitForTimestamps = false;
-    bool useBlitSplit = false;
 
     bool csrFailInitDirectSubmission = false;
     bool csrBaseCallDirectSubmissionAvailable = false;

shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt

@@ -10,7 +10,6 @@ if(TESTS_PVC)
                  ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/device_tests_pvc.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core_pvc.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_pvc.cpp

shared/test/unit_test/xe_hpc_core/pvc/excludes_xe_hpc_core_pvc.cpp

@@ -1,10 +0,0 @@
-/*
- * Copyright (C) 2022 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/test/common/test_macros/hw_test_base.h"
-
-HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfIsBlitSplitEnqueueWARequiredThenReturnFalse, IGFX_PVC);

shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp

@@ -83,11 +83,6 @@ PVCTEST_F(HwInfoConfigTestLinuxPvc, givenOsInterfaceIsNullWhenGetDeviceMemoryPhy
     EXPECT_EQ(0u, hwInfoConfig->getDeviceMemoryPhysicalSizeInBytes(nullptr, 0));
 }
 
-PVCTEST_F(HwInfoConfigTestLinuxPvc, givenHwInfoConfigWhenAskedIsBlitSplitEnqueueWARequiredThenReturnTrue) {
-    auto hwInfoConfig = HwInfoConfig::get(productFamily);
-    EXPECT_TRUE(hwInfoConfig->isBlitSplitEnqueueWARequired(pInHwInfo));
-}
-
 PVCTEST_F(HwInfoConfigTestLinuxPvc, givenOsInterfaceIsNullWhenGetDeviceMemoryMaxBandWidthInBytesPerSecondIsCalledThenReturnZero) {
     auto hwInfoConfig = HwInfoConfig::get(productFamily);
     auto testHwInfo = *defaultHwInfo;