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

Simplify OCL image implementation for SKL and later

Browse Source 
Related-To: NEO-6466

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-12-08 20:25:47 +00:00
committed by Compute-Runtime-Automation
parent cf4ce308d9
commit a27c7af2da
13 changed files with 84 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
opencl/source/gen11/image_gen11.cpp
View File

@@ -7,37 +7,15 @@
#include "shared/source/gen11/hw_cmds_base.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/source/mem_obj/image.inl"
#include <map>
namespace NEO {
typedef ICLFamily Family;
using Family = ICLFamily;
static auto gfxCore = IGFX_GEN11_CORE;
template <typename GfxFamily>
void ImageHw<GfxFamily>::setMediaSurfaceRotation(void *memory) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE);
surfaceState->setXOffset(0);
surfaceState->setYOffset(0);
}
template <typename GfxFamily>
void ImageHw<GfxFamily>::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value);
}
template <>
void ImageHw<Family>::appendSurfaceStateParams(RENDER_SURFACE_STATE *surfaceState, uint32_t rootDeviceIndex, bool useGlobalAtomics) {
if (hasAlphaChannel(&imageFormat)) {
@@ -45,5 +23,7 @@ void ImageHw<Family>::appendSurfaceStateParams(RENDER_SURFACE_STATE *surfaceStat
}
}
#include "opencl/source/mem_obj/image_factory_init.inl"
} // namespace NEO
// factory initializer
#include "opencl/source/mem_obj/image_factory_init.inl"

36
opencl/source/gen12lp/image_gen12lp.cpp
View File

@@ -5,40 +5,16 @@
*
*/
#include "shared/source/gen12lp/hw_cmds.h"
#include "shared/source/gen12lp/hw_cmds_base.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/source/mem_obj/image.inl"
namespace NEO {
typedef TGLLPFamily Family;
using Family = TGLLPFamily;
static auto gfxCore = IGFX_GEN12LP_CORE;
template <typename GfxFamily>
void ImageHw<GfxFamily>::setMediaSurfaceRotation(void *memory) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE);
surfaceState->setXOffset(0);
surfaceState->setYOffset(0);
}
template <typename GfxFamily>
void ImageHw<GfxFamily>::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value);
}
// clang-format off
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
#include "opencl/source/mem_obj/image_factory_init.inl"
// clang-format on
} // namespace NEO
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
// factory initializer
#include "opencl/source/mem_obj/image_factory_init.inl"

9
opencl/source/gen8/image_gen8.cpp
View File

@@ -5,16 +5,15 @@
*
*/
#include "shared/source/gen8/hw_cmds.h"
#include "shared/source/gen8/hw_cmds_base.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/source/mem_obj/image.inl"
#include <map>
namespace NEO {
typedef BDWFamily Family;
using Family = BDWFamily;
static auto gfxCore = IGFX_GEN8_CORE;
template <>
@@ -23,5 +22,7 @@ void ImageHw<Family>::setMediaSurfaceRotation(void *) {}
template <>
void ImageHw<Family>::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *, uint32_t) {}
#include "opencl/source/mem_obj/image_factory_init.inl"
} // namespace NEO
// factory initializer
#include "opencl/source/mem_obj/image_factory_init.inl"

34
opencl/source/gen9/image_gen9.cpp
View File

@@ -5,39 +5,15 @@
*
*/
#include "shared/source/gen9/hw_cmds.h"
#include "shared/source/gen9/hw_cmds_base.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/source/mem_obj/image.inl"
#include <map>
namespace NEO {
typedef SKLFamily Family;
using Family = SKLFamily;
static auto gfxCore = IGFX_GEN9_CORE;
template <typename GfxFamily>
void ImageHw<GfxFamily>::setMediaSurfaceRotation(void *memory) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE);
surfaceState->setXOffset(0);
surfaceState->setYOffset(0);
}
template <typename GfxFamily>
void ImageHw<GfxFamily>::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value);
}
#include "opencl/source/mem_obj/image_factory_init.inl"
} // namespace NEO
// factory initializer
#include "opencl/source/mem_obj/image_factory_init.inl"

22
opencl/source/mem_obj/image.inl
View File

@@ -201,4 +201,26 @@ void ImageHw<GfxFamily>::transformImage3dTo2dArray(void *memory) {
surfaceState->setSurfaceArray(true);
}
template <typename GfxFamily>
inline void ImageHw<GfxFamily>::setMediaSurfaceRotation(void *memory) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE);
surfaceState->setXOffset(0);
surfaceState->setYOffset(0);
}
template <typename GfxFamily>
inline void ImageHw<GfxFamily>::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) {
using MEDIA_SURFACE_STATE = typename GfxFamily::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value);
}
} // namespace NEO

3
opencl/source/mem_obj/image_factory_init.inl
View File

@@ -5,9 +5,12 @@
*
*/
namespace NEO {
template class ImageHw<Family>;
template <>
void populateFactoryTable<ImageHw<Family>>() {
extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE];
imageFactory[gfxCore].createImageFunction = ImageHw<Family>::create;
}
} // namespace NEO

7
opencl/source/mem_obj/image_tgllp_and_later.inl
View File

@@ -5,6 +5,12 @@
*
*/
#include "shared/source/gmm_helper/gmm.h"
#include "shared/source/gmm_helper/resource_info.h"
#include "opencl/source/mem_obj/image.h"
namespace NEO {
template <>
void ImageHw<Family>::appendSurfaceStateDepthParams(RENDER_SURFACE_STATE *surfaceState, Gmm *gmm) {
if (gmm) {
@@ -12,3 +18,4 @@ void ImageHw<Family>::appendSurfaceStateDepthParams(RENDER_SURFACE_STATE *surfac
surfaceState->setDepthStencilResource(isDepthResource);
}
}
} // namespace NEO

27
opencl/source/mem_obj/image_xehp_and_later.inl
View File

@@ -5,30 +5,10 @@
*
*/
#include "opencl/source/context/context.h"
#include "opencl/source/mem_obj/image.h"
namespace NEO {
template <>
void ImageHw<Family>::setMediaSurfaceRotation(void *memory) {
using MEDIA_SURFACE_STATE = typename Family::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setRotation(MEDIA_SURFACE_STATE::ROTATION_NO_ROTATION_OR_0_DEGREE);
surfaceState->setXOffset(0);
surfaceState->setYOffset(0);
}
template <>
void ImageHw<Family>::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *memory, uint32_t value) {
using MEDIA_SURFACE_STATE = typename Family::MEDIA_SURFACE_STATE;
using SURFACE_FORMAT = typename MEDIA_SURFACE_STATE::SURFACE_FORMAT;
auto surfaceState = reinterpret_cast<MEDIA_SURFACE_STATE *>(memory);
surfaceState->setSurfaceMemoryObjectControlStateIndexToMocsTables(value);
}
template <>
void ImageHw<Family>::appendSurfaceStateParams(Family::RENDER_SURFACE_STATE *surfaceState, uint32_t rootDeviceIndex, bool useGlobalAtomics) {
auto imageCtxType = this->context->peekContextType();
@@ -51,5 +31,4 @@ void ImageHw<Family>::appendSurfaceStateParams(Family::RENDER_SURFACE_STATE *sur
surfaceState->setDisableSupportForMultiGpuPartialWrites(!!DebugManager.flags.ForceMultiGpuPartialWrites.get());
}
}
} // namespace NEO

14
opencl/source/xe_hp_core/image_xe_hp_core.cpp
View File

@@ -5,25 +5,17 @@
*
*/
#include "shared/source/device/device.h"
#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
#include "shared/source/xe_hp_core/hw_cmds.h"
#include "shared/source/xe_hp_core/hw_cmds_base.h"
#include "opencl/source/context/context.h"
#include "opencl/source/mem_obj/image.inl"
namespace NEO {
using Family = XeHpFamily;
static auto gfxCore = IGFX_XE_HP_CORE;
} // namespace NEO
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
#include "opencl/source/mem_obj/image_xehp_and_later.inl"
namespace NEO {
// clang-format off
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
// factory initializer
#include "opencl/source/mem_obj/image_factory_init.inl"
// clang-format on
} // namespace NEO

13
opencl/source/xe_hpc_core/image_xe_hpc_core.cpp
View File

@@ -5,24 +5,17 @@
*
*/
#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
#include "shared/source/xe_hpc_core/hw_cmds.h"
#include "shared/source/xe_hpc_core/hw_cmds_base.h"
#include "opencl/source/context/context.h"
#include "opencl/source/mem_obj/image.inl"
namespace NEO {
using Family = XE_HPC_COREFamily;
static auto gfxCore = IGFX_XE_HPC_CORE;
} // namespace NEO
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
#include "opencl/source/mem_obj/image_xehp_and_later.inl"
namespace NEO {
// clang-format off
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
// factory initializer
#include "opencl/source/mem_obj/image_factory_init.inl"
// clang-format on
} // namespace NEO

14
opencl/source/xe_hpg_core/image_xe_hpg_core.cpp
View File

@@ -5,25 +5,17 @@
*
*/
#include "shared/source/device/device.h"
#include "shared/source/gmm_helper/client_context/gmm_client_context.h"
#include "shared/source/xe_hpg_core/hw_cmds.h"
#include "shared/source/xe_hpg_core/hw_cmds_base.h"
#include "opencl/source/context/context.h"
#include "opencl/source/mem_obj/image.inl"
namespace NEO {
using Family = XE_HPG_COREFamily;
static auto gfxCore = IGFX_XE_HPG_CORE;
} // namespace NEO
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
#include "opencl/source/mem_obj/image_xehp_and_later.inl"
namespace NEO {
// clang-format off
#include "opencl/source/mem_obj/image_tgllp_and_later.inl"
// factory initializer
#include "opencl/source/mem_obj/image_factory_init.inl"
// clang-format on
} // namespace NEO