mirror of
https://github.com/intel/compute-runtime.git
synced 2026-01-03 06:49:52 +08:00
refactor: introduce ImageSurfaceState helper class
Moved global functions to the ImageSurfaceStateHelper class, with declarations in the header file and definitions in the base .inl file. This change reduces compilation time by: - removing unnecessary includes from the header file - adding explicit template instantiations, which are faster than implicit template instantiations. Additionally, the image_skl_and_later.inl file has been removed as it is no longer needed, and its implementation has been moved to the base .inl Related-To: NEO-12149 Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
committed by
Compute-Runtime-Automation
Compute-Runtime-Automation
parent
de60dfa3b2
commit
ef896cc799
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2020-2023 Intel Corporation
|
||||
# Copyright (C) 2020-2025 Intel Corporation
|
||||
#
|
||||
# SPDX-License-Identifier: MIT
|
||||
#
|
||||
@@ -7,7 +7,7 @@
|
||||
set(NEO_CORE_IMAGE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/image_skl_and_later.inl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state.inl
|
||||
)
|
||||
|
||||
set_property(GLOBAL PROPERTY NEO_CORE_IMAGE ${NEO_CORE_IMAGE})
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2020-2024 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
*/
|
||||
|
||||
template <>
|
||||
void setMipTailStartLOD<Family>(Family::RENDER_SURFACE_STATE *surfaceState, Gmm *gmm) {
|
||||
surfaceState->setMipTailStartLOD(0);
|
||||
|
||||
if (gmm != nullptr) {
|
||||
surfaceState->setMipTailStartLOD(gmm->gmmResourceInfo->getMipTailStartLODSurfaceState());
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2020-2024 Intel Corporation
|
||||
* Copyright (C) 2020-2025 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@@ -7,135 +7,25 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "shared/source/command_container/encode_surface_state.h"
|
||||
#include "shared/source/debug_settings/debug_settings_manager.h"
|
||||
#include "shared/source/gmm_helper/gmm.h"
|
||||
#include "shared/source/gmm_helper/gmm_helper.h"
|
||||
#include "shared/source/gmm_helper/resource_info.h"
|
||||
#include "shared/source/helpers/basic_math.h"
|
||||
#include "shared/source/helpers/surface_format_info.h"
|
||||
#include <cstdint>
|
||||
|
||||
namespace NEO {
|
||||
|
||||
class Gmm;
|
||||
struct SurfaceOffsets;
|
||||
class GmmHelper;
|
||||
struct ImageInfo;
|
||||
|
||||
template <typename GfxFamily>
|
||||
inline void setImageSurfaceState(typename GfxFamily::RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo, Gmm *gmm, GmmHelper &gmmHelper, uint32_t cubeFaceIndex, uint64_t gpuAddress, const SurfaceOffsets &surfaceOffsets, bool isNV12Format, uint32_t &minimumArrayElement, uint32_t &renderTargetViewExtent) {
|
||||
class ImageSurfaceStateHelper {
|
||||
public:
|
||||
using RENDER_SURFACE_STATE = typename GfxFamily::RENDER_SURFACE_STATE;
|
||||
using SURFACE_FORMAT = typename RENDER_SURFACE_STATE::SURFACE_FORMAT;
|
||||
using AUXILIARY_SURFACE_MODE = typename RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE;
|
||||
|
||||
auto imageCount = std::max(imageInfo.imgDesc.imageDepth, imageInfo.imgDesc.imageArraySize);
|
||||
if (imageCount == 0) {
|
||||
imageCount = 1;
|
||||
}
|
||||
|
||||
bool isImageArray = imageInfo.imgDesc.imageArraySize > 1 &&
|
||||
(imageInfo.imgDesc.imageType == ImageType::image2DArray ||
|
||||
imageInfo.imgDesc.imageType == ImageType::image1DArray);
|
||||
|
||||
isImageArray |= (imageInfo.imgDesc.imageType == ImageType::image2D || imageInfo.imgDesc.imageType == ImageType::image2DArray) && debugManager.flags.Force2dImageAsArray.get() == 1;
|
||||
|
||||
renderTargetViewExtent = static_cast<uint32_t>(imageCount);
|
||||
minimumArrayElement = 0;
|
||||
auto hAlign = RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT;
|
||||
auto vAlign = RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4;
|
||||
|
||||
if (gmm) {
|
||||
hAlign = static_cast<typename RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT>(gmm->gmmResourceInfo->getHAlignSurfaceState());
|
||||
vAlign = static_cast<typename RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT>(gmm->gmmResourceInfo->getVAlignSurfaceState());
|
||||
}
|
||||
|
||||
if (cubeFaceIndex != __GMM_NO_CUBE_MAP) {
|
||||
isImageArray = true;
|
||||
renderTargetViewExtent = 1;
|
||||
minimumArrayElement = cubeFaceIndex;
|
||||
}
|
||||
|
||||
surfaceState->setAuxiliarySurfaceMode(AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE);
|
||||
surfaceState->setAuxiliarySurfacePitch(1u);
|
||||
surfaceState->setAuxiliarySurfaceQPitch(0u);
|
||||
surfaceState->setAuxiliarySurfaceBaseAddress(0u);
|
||||
surfaceState->setRenderTargetViewExtent(renderTargetViewExtent);
|
||||
surfaceState->setMinimumArrayElement(minimumArrayElement);
|
||||
|
||||
// SurfaceQpitch is in rows but must be a multiple of VALIGN
|
||||
surfaceState->setSurfaceQPitch(imageInfo.qPitch);
|
||||
|
||||
surfaceState->setSurfaceArray(isImageArray);
|
||||
|
||||
surfaceState->setSurfaceHorizontalAlignment(hAlign);
|
||||
surfaceState->setSurfaceVerticalAlignment(vAlign);
|
||||
|
||||
uint32_t tileMode = gmm ? gmm->gmmResourceInfo->getTileModeSurfaceState()
|
||||
: static_cast<uint32_t>(RENDER_SURFACE_STATE::TILE_MODE_LINEAR);
|
||||
|
||||
surfaceState->setTileMode(static_cast<typename RENDER_SURFACE_STATE::TILE_MODE>(tileMode));
|
||||
|
||||
surfaceState->setMemoryObjectControlState(gmmHelper.getMOCS(GMM_RESOURCE_USAGE_OCL_IMAGE));
|
||||
|
||||
EncodeSurfaceState<GfxFamily>::setCoherencyType(surfaceState, RENDER_SURFACE_STATE::COHERENCY_TYPE_GPU_COHERENT);
|
||||
|
||||
surfaceState->setMultisampledSurfaceStorageFormat(RENDER_SURFACE_STATE::MULTISAMPLED_SURFACE_STORAGE_FORMAT::MULTISAMPLED_SURFACE_STORAGE_FORMAT_MSS);
|
||||
|
||||
surfaceState->setSurfaceBaseAddress(gpuAddress + surfaceOffsets.offset);
|
||||
surfaceState->setXOffset(surfaceOffsets.xOffset);
|
||||
surfaceState->setYOffset(surfaceOffsets.yOffset);
|
||||
|
||||
if (isNV12Format) {
|
||||
surfaceState->setShaderChannelSelectAlpha(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_ONE);
|
||||
surfaceState->setYOffsetForUOrUvPlane(surfaceOffsets.yOffsetForUVplane);
|
||||
surfaceState->setXOffsetForUOrUvPlane(surfaceOffsets.xOffset);
|
||||
} else {
|
||||
surfaceState->setShaderChannelSelectAlpha(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_ALPHA);
|
||||
surfaceState->setYOffsetForUOrUvPlane(0);
|
||||
surfaceState->setXOffsetForUOrUvPlane(0);
|
||||
}
|
||||
|
||||
surfaceState->setSurfaceFormat(static_cast<SURFACE_FORMAT>(imageInfo.surfaceFormat->genxSurfaceFormat));
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
inline void setImageSurfaceStateDimensions(typename GfxFamily::RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo, uint32_t cubeFaceIndex, typename GfxFamily::RENDER_SURFACE_STATE::SURFACE_TYPE surfaceType, uint32_t &depth) {
|
||||
auto imageCount = std::max(imageInfo.imgDesc.imageDepth, imageInfo.imgDesc.imageArraySize);
|
||||
if (imageCount == 0) {
|
||||
imageCount = 1;
|
||||
}
|
||||
|
||||
auto imageHeight = imageInfo.imgDesc.imageHeight;
|
||||
if (imageHeight == 0) {
|
||||
imageHeight = 1;
|
||||
}
|
||||
|
||||
auto imageWidth = imageInfo.imgDesc.imageWidth;
|
||||
if (imageWidth == 0) {
|
||||
imageWidth = 1;
|
||||
}
|
||||
|
||||
if (cubeFaceIndex != __GMM_NO_CUBE_MAP) {
|
||||
imageCount = __GMM_MAX_CUBE_FACE - cubeFaceIndex;
|
||||
}
|
||||
|
||||
depth = static_cast<uint32_t>(imageCount);
|
||||
surfaceState->setWidth(static_cast<uint32_t>(imageWidth));
|
||||
surfaceState->setHeight(static_cast<uint32_t>(imageHeight));
|
||||
surfaceState->setDepth(depth);
|
||||
surfaceState->setSurfacePitch(static_cast<uint32_t>(imageInfo.imgDesc.imageRowPitch));
|
||||
surfaceState->setSurfaceType(surfaceType);
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
inline void setWidthForMediaBlockSurfaceState(typename GfxFamily::RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo) {
|
||||
auto elSize = imageInfo.surfaceFormat->imageElementSizeInBytes;
|
||||
auto numDwords = static_cast<uint32_t>(Math::divideAndRoundUp(imageInfo.imgDesc.imageWidth * elSize, sizeof(uint32_t)));
|
||||
surfaceState->setWidth(numDwords);
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
inline void setUnifiedAuxBaseAddress(typename GfxFamily::RENDER_SURFACE_STATE *surfaceState, const Gmm *gmm) {
|
||||
uint64_t baseAddress = surfaceState->getSurfaceBaseAddress() +
|
||||
gmm->gmmResourceInfo->getUnifiedAuxSurfaceOffset(GMM_UNIFIED_AUX_TYPE::GMM_AUX_SURF);
|
||||
surfaceState->setAuxiliarySurfaceBaseAddress(baseAddress);
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
void setMipTailStartLOD(typename GfxFamily::RENDER_SURFACE_STATE *surfaceState, Gmm *gmm);
|
||||
using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE;
|
||||
|
||||
static void setImageSurfaceState(RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo, Gmm *gmm, GmmHelper &gmmHelper, uint32_t cubeFaceIndex, uint64_t gpuAddress, const SurfaceOffsets &surfaceOffsets, bool isNV12Format, uint32_t &minimumArrayElement, uint32_t &renderTargetViewExtent);
|
||||
static void setImageSurfaceStateDimensions(RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo, uint32_t cubeFaceIndex, SURFACE_TYPE surfaceType, uint32_t &depth);
|
||||
static void setWidthForMediaBlockSurfaceState(RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo);
|
||||
static void setUnifiedAuxBaseAddress(RENDER_SURFACE_STATE *surfaceState, const Gmm *gmm);
|
||||
static void setMipTailStartLOD(RENDER_SURFACE_STATE *surfaceState, Gmm *gmm);
|
||||
};
|
||||
} // namespace NEO
|
||||
|
||||
147
shared/source/image/image_surface_state.inl
Normal file
147
shared/source/image/image_surface_state.inl
Normal file
@@ -0,0 +1,147 @@
|
||||
/*
|
||||
* Copyright (C) 2025 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
*/
|
||||
|
||||
#include "shared/source/command_container/encode_surface_state.h"
|
||||
#include "shared/source/debug_settings/debug_settings_manager.h"
|
||||
#include "shared/source/gmm_helper/gmm.h"
|
||||
#include "shared/source/gmm_helper/gmm_helper.h"
|
||||
#include "shared/source/gmm_helper/resource_info.h"
|
||||
#include "shared/source/helpers/basic_math.h"
|
||||
#include "shared/source/helpers/surface_format_info.h"
|
||||
#include "shared/source/image/image_surface_state.h"
|
||||
|
||||
namespace NEO {
|
||||
|
||||
template <typename GfxFamily>
|
||||
void ImageSurfaceStateHelper<GfxFamily>::setImageSurfaceState(RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo, Gmm *gmm, GmmHelper &gmmHelper, uint32_t cubeFaceIndex, uint64_t gpuAddress, const SurfaceOffsets &surfaceOffsets, bool isNV12Format, uint32_t &minimumArrayElement, uint32_t &renderTargetViewExtent) {
|
||||
|
||||
using SURFACE_FORMAT = typename RENDER_SURFACE_STATE::SURFACE_FORMAT;
|
||||
using AUXILIARY_SURFACE_MODE = typename RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE;
|
||||
|
||||
auto imageCount = std::max(imageInfo.imgDesc.imageDepth, imageInfo.imgDesc.imageArraySize);
|
||||
if (imageCount == 0) {
|
||||
imageCount = 1;
|
||||
}
|
||||
|
||||
bool isImageArray = imageInfo.imgDesc.imageArraySize > 1 &&
|
||||
(imageInfo.imgDesc.imageType == ImageType::image2DArray ||
|
||||
imageInfo.imgDesc.imageType == ImageType::image1DArray);
|
||||
|
||||
isImageArray |= (imageInfo.imgDesc.imageType == ImageType::image2D || imageInfo.imgDesc.imageType == ImageType::image2DArray) && debugManager.flags.Force2dImageAsArray.get() == 1;
|
||||
|
||||
renderTargetViewExtent = static_cast<uint32_t>(imageCount);
|
||||
minimumArrayElement = 0;
|
||||
auto hAlign = RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT;
|
||||
auto vAlign = RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4;
|
||||
|
||||
if (gmm) {
|
||||
hAlign = static_cast<typename RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT>(gmm->gmmResourceInfo->getHAlignSurfaceState());
|
||||
vAlign = static_cast<typename RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT>(gmm->gmmResourceInfo->getVAlignSurfaceState());
|
||||
}
|
||||
|
||||
if (cubeFaceIndex != __GMM_NO_CUBE_MAP) {
|
||||
isImageArray = true;
|
||||
renderTargetViewExtent = 1;
|
||||
minimumArrayElement = cubeFaceIndex;
|
||||
}
|
||||
|
||||
surfaceState->setAuxiliarySurfaceMode(AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_NONE);
|
||||
surfaceState->setAuxiliarySurfacePitch(1u);
|
||||
surfaceState->setAuxiliarySurfaceQPitch(0u);
|
||||
surfaceState->setAuxiliarySurfaceBaseAddress(0u);
|
||||
surfaceState->setRenderTargetViewExtent(renderTargetViewExtent);
|
||||
surfaceState->setMinimumArrayElement(minimumArrayElement);
|
||||
|
||||
// SurfaceQpitch is in rows but must be a multiple of VALIGN
|
||||
surfaceState->setSurfaceQPitch(imageInfo.qPitch);
|
||||
|
||||
surfaceState->setSurfaceArray(isImageArray);
|
||||
|
||||
surfaceState->setSurfaceHorizontalAlignment(hAlign);
|
||||
surfaceState->setSurfaceVerticalAlignment(vAlign);
|
||||
|
||||
uint32_t tileMode = gmm ? gmm->gmmResourceInfo->getTileModeSurfaceState()
|
||||
: static_cast<uint32_t>(RENDER_SURFACE_STATE::TILE_MODE_LINEAR);
|
||||
|
||||
surfaceState->setTileMode(static_cast<typename RENDER_SURFACE_STATE::TILE_MODE>(tileMode));
|
||||
|
||||
surfaceState->setMemoryObjectControlState(gmmHelper.getMOCS(GMM_RESOURCE_USAGE_OCL_IMAGE));
|
||||
|
||||
EncodeSurfaceState<GfxFamily>::setCoherencyType(surfaceState, RENDER_SURFACE_STATE::COHERENCY_TYPE_GPU_COHERENT);
|
||||
|
||||
surfaceState->setMultisampledSurfaceStorageFormat(RENDER_SURFACE_STATE::MULTISAMPLED_SURFACE_STORAGE_FORMAT::MULTISAMPLED_SURFACE_STORAGE_FORMAT_MSS);
|
||||
|
||||
surfaceState->setSurfaceBaseAddress(gpuAddress + surfaceOffsets.offset);
|
||||
surfaceState->setXOffset(surfaceOffsets.xOffset);
|
||||
surfaceState->setYOffset(surfaceOffsets.yOffset);
|
||||
|
||||
if (isNV12Format) {
|
||||
surfaceState->setShaderChannelSelectAlpha(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_ONE);
|
||||
surfaceState->setYOffsetForUOrUvPlane(surfaceOffsets.yOffsetForUVplane);
|
||||
surfaceState->setXOffsetForUOrUvPlane(surfaceOffsets.xOffset);
|
||||
} else {
|
||||
surfaceState->setShaderChannelSelectAlpha(RENDER_SURFACE_STATE::SHADER_CHANNEL_SELECT_ALPHA);
|
||||
surfaceState->setYOffsetForUOrUvPlane(0);
|
||||
surfaceState->setXOffsetForUOrUvPlane(0);
|
||||
}
|
||||
|
||||
surfaceState->setSurfaceFormat(static_cast<SURFACE_FORMAT>(imageInfo.surfaceFormat->genxSurfaceFormat));
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
void ImageSurfaceStateHelper<GfxFamily>::setImageSurfaceStateDimensions(RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo, uint32_t cubeFaceIndex, RENDER_SURFACE_STATE::SURFACE_TYPE surfaceType, uint32_t &depth) {
|
||||
auto imageCount = std::max(imageInfo.imgDesc.imageDepth, imageInfo.imgDesc.imageArraySize);
|
||||
if (imageCount == 0) {
|
||||
imageCount = 1;
|
||||
}
|
||||
|
||||
auto imageHeight = imageInfo.imgDesc.imageHeight;
|
||||
if (imageHeight == 0) {
|
||||
imageHeight = 1;
|
||||
}
|
||||
|
||||
auto imageWidth = imageInfo.imgDesc.imageWidth;
|
||||
if (imageWidth == 0) {
|
||||
imageWidth = 1;
|
||||
}
|
||||
|
||||
if (cubeFaceIndex != __GMM_NO_CUBE_MAP) {
|
||||
imageCount = __GMM_MAX_CUBE_FACE - cubeFaceIndex;
|
||||
}
|
||||
|
||||
depth = static_cast<uint32_t>(imageCount);
|
||||
surfaceState->setWidth(static_cast<uint32_t>(imageWidth));
|
||||
surfaceState->setHeight(static_cast<uint32_t>(imageHeight));
|
||||
surfaceState->setDepth(depth);
|
||||
surfaceState->setSurfacePitch(static_cast<uint32_t>(imageInfo.imgDesc.imageRowPitch));
|
||||
surfaceState->setSurfaceType(surfaceType);
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
void ImageSurfaceStateHelper<GfxFamily>::setWidthForMediaBlockSurfaceState(RENDER_SURFACE_STATE *surfaceState, const ImageInfo &imageInfo) {
|
||||
auto elSize = imageInfo.surfaceFormat->imageElementSizeInBytes;
|
||||
auto numDwords = static_cast<uint32_t>(Math::divideAndRoundUp(imageInfo.imgDesc.imageWidth * elSize, sizeof(uint32_t)));
|
||||
surfaceState->setWidth(numDwords);
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
void ImageSurfaceStateHelper<GfxFamily>::setUnifiedAuxBaseAddress(RENDER_SURFACE_STATE *surfaceState, const Gmm *gmm) {
|
||||
uint64_t baseAddress = surfaceState->getSurfaceBaseAddress() +
|
||||
gmm->gmmResourceInfo->getUnifiedAuxSurfaceOffset(GMM_UNIFIED_AUX_TYPE::GMM_AUX_SURF);
|
||||
surfaceState->setAuxiliarySurfaceBaseAddress(baseAddress);
|
||||
}
|
||||
|
||||
template <typename GfxFamily>
|
||||
void ImageSurfaceStateHelper<GfxFamily>::setMipTailStartLOD(RENDER_SURFACE_STATE *surfaceState, Gmm *gmm) {
|
||||
surfaceState->setMipTailStartLOD(0);
|
||||
|
||||
if (gmm != nullptr) {
|
||||
surfaceState->setMipTailStartLOD(gmm->gmmResourceInfo->getMipTailStartLODSurfaceState());
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace NEO
|
||||
Reference in New Issue
Block a user