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

Revert "Add debug flag to enable specific PIPE_CONTROL fields"

Browse Source 
This reverts commit 2e7c90e58f.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-09-29 09:39:48 +02:00
committed by Compute-Runtime-Automation
parent dc68cf0fe2
commit 9a1102bb7a
14 changed files with 19 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/source/helpers/CMakeLists.txt
View File

@@ -60,7 +60,6 @@ set(NEO_CORE_HELPERS
${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper_hw.h
${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper_hw.inl
${CMAKE_CURRENT_SOURCE_DIR}/flush_specific_cache_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/flush_stamp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/flush_stamp.h
${CMAKE_CURRENT_SOURCE_DIR}/get_info.h

67
shared/source/helpers/flush_specific_cache_helper.h
View File

@@ -1,67 +0,0 @@
/*
* Copyright (C) 2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "shared/source/helpers/bit_helpers.h"
#include <cstdint>
namespace NEO {
namespace FlushSpecificCacheHelper {
static constexpr bool isDcFlushEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 0);
}
static constexpr bool isRenderTargetCacheFlushEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 1);
}
static constexpr bool isInstructionCacheInvalidateEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 2);
}
static constexpr bool isTextureCacheInvalidationEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 3);
}
static constexpr bool isPipeControlFlushEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 4);
}
static constexpr bool isVfCacheInvalidationEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 5);
}
static constexpr bool isConstantCacheInvalidationEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 6);
}
static constexpr bool isStateCacheInvalidationEnableSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 7);
}
static constexpr bool isTlbInvalidationSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 8);
}
static constexpr bool isHdcPipelineFlushSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 9);
}
static constexpr bool isUnTypedDataPortCacheFlushSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 10);
}
static constexpr bool isCompressionControlSurfaceCcsFlushSet(const int32_t flushSpecificCache) {
return isBitSet(flushSpecificCache, 11);
}
} // namespace FlushSpecificCacheHelper
} // namespace NEO

21
shared/source/helpers/hw_helper_base.inl
View File

@@ -13,7 +13,6 @@
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/helpers/basic_math.h"
#include "shared/source/helpers/constants.h"
#include "shared/source/helpers/flush_specific_cache_helper.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/hw_info.h"
#include "shared/source/helpers/pipe_control_args.h"
@@ -270,18 +269,16 @@ void MemorySynchronizationCommands<GfxFamily>::setSingleBarrier(void *commandsBu
return;
}
auto flushSpecificCaches = DebugManager.flags.FlushSpecificCache.get() > 0 ? DebugManager.flags.FlushSpecificCache.get() : 0;
pipeControl.setConstantCacheInvalidationEnable(args.constantCacheInvalidationEnable || FlushSpecificCacheHelper::isConstantCacheInvalidationEnableSet(flushSpecificCaches));
pipeControl.setInstructionCacheInvalidateEnable(args.instructionCacheInvalidateEnable || FlushSpecificCacheHelper::isInstructionCacheInvalidateEnableSet(flushSpecificCaches));
pipeControl.setPipeControlFlushEnable(args.pipeControlFlushEnable || FlushSpecificCacheHelper::isPipeControlFlushEnableSet(flushSpecificCaches));
pipeControl.setRenderTargetCacheFlushEnable(args.renderTargetCacheFlushEnable || FlushSpecificCacheHelper::isRenderTargetCacheFlushEnableSet(flushSpecificCaches));
pipeControl.setStateCacheInvalidationEnable(args.stateCacheInvalidationEnable || FlushSpecificCacheHelper::isStateCacheInvalidationEnableSet(flushSpecificCaches));
pipeControl.setTextureCacheInvalidationEnable(args.textureCacheInvalidationEnable || FlushSpecificCacheHelper::isTextureCacheInvalidationEnableSet(flushSpecificCaches));
pipeControl.setVfCacheInvalidationEnable(args.vfCacheInvalidationEnable || FlushSpecificCacheHelper::isVfCacheInvalidationEnableSet(flushSpecificCaches));
pipeControl.setTlbInvalidate(args.tlbInvalidation || FlushSpecificCacheHelper::isTlbInvalidationSet(flushSpecificCaches));
pipeControl.setConstantCacheInvalidationEnable(args.constantCacheInvalidationEnable);
pipeControl.setInstructionCacheInvalidateEnable(args.instructionCacheInvalidateEnable);
pipeControl.setPipeControlFlushEnable(args.pipeControlFlushEnable);
pipeControl.setRenderTargetCacheFlushEnable(args.renderTargetCacheFlushEnable);
pipeControl.setStateCacheInvalidationEnable(args.stateCacheInvalidationEnable);
pipeControl.setTextureCacheInvalidationEnable(args.textureCacheInvalidationEnable);
pipeControl.setVfCacheInvalidationEnable(args.vfCacheInvalidationEnable);
pipeControl.setTlbInvalidate(args.tlbInvalidation);
pipeControl.setNotifyEnable(args.notifyEnable);
pipeControl.setDcFlushEnable(args.dcFlushEnable || FlushSpecificCacheHelper::isDcFlushEnableSet(flushSpecificCaches));
pipeControl.setDcFlushEnable(args.dcFlushEnable);
pipeControl.setDepthCacheFlushEnable(args.depthCacheFlushEnable);
pipeControl.setDepthStallEnable(args.depthStallEnable);
pipeControl.setProtectedMemoryDisable(args.protectedMemoryDisable);

7
shared/source/helpers/hw_helper_dg2_and_later.inl
View File

@@ -14,11 +14,10 @@ namespace NEO {
template <typename GfxFamily>
inline void MemorySynchronizationCommands<GfxFamily>::setBarrierExtraProperties(void *barrierCmd, PipeControlArgs &args) {
auto &pipeControl = *reinterpret_cast<typename GfxFamily::PIPE_CONTROL *>(barrierCmd);
auto flushSpecificCaches = DebugManager.flags.FlushSpecificCache.get() > 0 ? DebugManager.flags.FlushSpecificCache.get() : 0;
pipeControl.setHdcPipelineFlush(args.hdcPipelineFlush || FlushSpecificCacheHelper::isHdcPipelineFlushSet(flushSpecificCaches));
pipeControl.setUnTypedDataPortCacheFlush(args.unTypedDataPortCacheFlush || FlushSpecificCacheHelper::isUnTypedDataPortCacheFlushSet(flushSpecificCaches));
pipeControl.setCompressionControlSurfaceCcsFlush(args.compressionControlSurfaceCcsFlush || FlushSpecificCacheHelper::isCompressionControlSurfaceCcsFlushSet(flushSpecificCaches));
pipeControl.setHdcPipelineFlush(args.hdcPipelineFlush);
pipeControl.setUnTypedDataPortCacheFlush(args.unTypedDataPortCacheFlush);
pipeControl.setCompressionControlSurfaceCcsFlush(args.compressionControlSurfaceCcsFlush);
pipeControl.setWorkloadPartitionIdOffsetEnable(args.workloadPartitionOffset);
pipeControl.setAmfsFlushEnable(args.amfsFlushEnable);