intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-20 08:53:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Standardize DESTINATION_SURFACE_TYPE

Browse Source 
Standardizes DESTINATION_SURFACE_TYPE to align with the latest
specification.

Related-To: NEO-13147

Signed-off-by: Vysochyn, Illia <illia.vysochyn@intel.com>
This commit is contained in:
Vysochyn, Illia
2024-12-23 15:25:24 +00:00
committed by Compute-Runtime-Automation
parent 88a27df888
commit 83b7143485
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl
View File

@@ -3825,7 +3825,7 @@ typedef struct tagMI_USER_INTERRUPT {
struct tagCommon { struct tagCommon {
// DWORD 0 // DWORD 0
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22); uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28); uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
uint32_t CommandType : BITFIELD_RANGE(29, 31); uint32_t CommandType : BITFIELD_RANGE(29, 31);
} Common; } Common;
uint32_t RawData[1]; uint32_t RawData[1];
@@ -3838,7 +3838,7 @@ typedef struct tagMI_USER_INTERRUPT {
} COMMAND_TYPE; } COMMAND_TYPE;
inline void init() { inline void init() {
memset(&TheStructure, 0, sizeof(TheStructure)); memset(&TheStructure, 0, sizeof(TheStructure));
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT; TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND; TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;
} }
static tagMI_USER_INTERRUPT sInit() { static tagMI_USER_INTERRUPT sInit() {

14
shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl
View File

@@ -3377,7 +3377,7 @@ typedef struct tagMI_USER_INTERRUPT {
struct tagCommon { struct tagCommon {
// DWORD 0 // DWORD 0
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22); uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28); uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
uint32_t CommandType : BITFIELD_RANGE(29, 31); uint32_t CommandType : BITFIELD_RANGE(29, 31);
} Common; } Common;
uint32_t RawData[1]; uint32_t RawData[1];
@@ -3390,7 +3390,7 @@ typedef struct tagMI_USER_INTERRUPT {
} COMMAND_TYPE; } COMMAND_TYPE;
inline void init() { inline void init() {
memset(&TheStructure, 0, sizeof(TheStructure)); memset(&TheStructure, 0, sizeof(TheStructure));
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT; TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND; TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;
} }
static tagMI_USER_INTERRUPT sInit() { static tagMI_USER_INTERRUPT sInit() {
@@ -4555,10 +4555,10 @@ typedef struct tagXY_FAST_COLOR_BLT {
AUX_SPECIAL_OPERATIONS_MODE_FORCE_UNCOMPRESS = 0x2, AUX_SPECIAL_OPERATIONS_MODE_FORCE_UNCOMPRESS = 0x2,
} AUX_SPECIAL_OPERATIONS_MODE; } AUX_SPECIAL_OPERATIONS_MODE;
typedef enum tagDESTINATION_SURFACE_TYPE { typedef enum tagDESTINATION_SURFACE_TYPE {
DESTINATION_SURFACE_TYPE_1D = 0x0, DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0x0,
DESTINATION_SURFACE_TYPE_2D = 0x1, DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 0x1,
DESTINATION_SURFACE_TYPE_3D = 0x2, DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 0x2,
DESTINATION_SURFACE_TYPE_CUBE = 0x3, DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 0x3,
} DESTINATION_SURFACE_TYPE; } DESTINATION_SURFACE_TYPE;
inline void init() { inline void init() {
memset(&TheStructure, 0, sizeof(TheStructure)); memset(&TheStructure, 0, sizeof(TheStructure));
@@ -4573,7 +4573,7 @@ typedef struct tagXY_FAST_COLOR_BLT {
TheStructure.Common.DestinationTargetMemory = DESTINATION_TARGET_MEMORY_LOCAL_MEM; TheStructure.Common.DestinationTargetMemory = DESTINATION_TARGET_MEMORY_LOCAL_MEM;
TheStructure.Common.DestinationCompressionFormat = DESTINATION_COMPRESSION_FORMAT_CMF_R8; TheStructure.Common.DestinationCompressionFormat = DESTINATION_COMPRESSION_FORMAT_CMF_R8;
TheStructure.Common.AuxSpecialOperationsMode = AUX_SPECIAL_OPERATIONS_MODE_FAST_CLEAR_HW_FORMAT_CONVERSION; TheStructure.Common.AuxSpecialOperationsMode = AUX_SPECIAL_OPERATIONS_MODE_FAST_CLEAR_HW_FORMAT_CONVERSION;
TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_1D; TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_SURFTYPE_1D;
} }
static tagXY_FAST_COLOR_BLT sInit() { static tagXY_FAST_COLOR_BLT sInit() {
XY_FAST_COLOR_BLT state; XY_FAST_COLOR_BLT state;

14
shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl
View File

@@ -3367,7 +3367,7 @@ typedef struct tagMI_USER_INTERRUPT {
struct tagCommon { struct tagCommon {
// DWORD 0 // DWORD 0
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22); uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28); uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
uint32_t CommandType : BITFIELD_RANGE(29, 31); uint32_t CommandType : BITFIELD_RANGE(29, 31);
} Common; } Common;
uint32_t RawData[1]; uint32_t RawData[1];
@@ -3380,7 +3380,7 @@ typedef struct tagMI_USER_INTERRUPT {
} COMMAND_TYPE; } COMMAND_TYPE;
inline void init() { inline void init() {
memset(&TheStructure, 0, sizeof(TheStructure)); memset(&TheStructure, 0, sizeof(TheStructure));
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT; TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND; TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;
} }
static tagMI_USER_INTERRUPT sInit() { static tagMI_USER_INTERRUPT sInit() {
@@ -4545,10 +4545,10 @@ typedef struct tagXY_FAST_COLOR_BLT {
AUX_SPECIAL_OPERATIONS_MODE_FORCE_UNCOMPRESS = 0x2, AUX_SPECIAL_OPERATIONS_MODE_FORCE_UNCOMPRESS = 0x2,
} AUX_SPECIAL_OPERATIONS_MODE; } AUX_SPECIAL_OPERATIONS_MODE;
typedef enum tagDESTINATION_SURFACE_TYPE { typedef enum tagDESTINATION_SURFACE_TYPE {
DESTINATION_SURFACE_TYPE_1D = 0x0, DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0x0,
DESTINATION_SURFACE_TYPE_2D = 0x1, DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 0x1,
DESTINATION_SURFACE_TYPE_3D = 0x2, DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 0x2,
DESTINATION_SURFACE_TYPE_CUBE = 0x3, DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 0x3,
} DESTINATION_SURFACE_TYPE; } DESTINATION_SURFACE_TYPE;
inline void init() { inline void init() {
memset(&TheStructure, 0, sizeof(TheStructure)); memset(&TheStructure, 0, sizeof(TheStructure));
@@ -4563,7 +4563,7 @@ typedef struct tagXY_FAST_COLOR_BLT {
TheStructure.Common.DestinationTargetMemory = DESTINATION_TARGET_MEMORY_LOCAL_MEM; TheStructure.Common.DestinationTargetMemory = DESTINATION_TARGET_MEMORY_LOCAL_MEM;
TheStructure.Common.DestinationCompressionFormat = DESTINATION_COMPRESSION_FORMAT_CMF_R8; TheStructure.Common.DestinationCompressionFormat = DESTINATION_COMPRESSION_FORMAT_CMF_R8;
TheStructure.Common.AuxSpecialOperationsMode = AUX_SPECIAL_OPERATIONS_MODE_FAST_CLEAR_HW_FORMAT_CONVERSION; TheStructure.Common.AuxSpecialOperationsMode = AUX_SPECIAL_OPERATIONS_MODE_FAST_CLEAR_HW_FORMAT_CONVERSION;
TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_1D; TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_SURFTYPE_1D;
} }
static tagXY_FAST_COLOR_BLT sInit() { static tagXY_FAST_COLOR_BLT sInit() {
XY_FAST_COLOR_BLT state; XY_FAST_COLOR_BLT state;

12
shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl
View File

@@ -3372,7 +3372,7 @@ struct MI_USER_INTERRUPT {
union tagTheStructure { union tagTheStructure {
struct tagCommon { struct tagCommon {
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22); uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28); uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
uint32_t CommandType : BITFIELD_RANGE(29, 31); uint32_t CommandType : BITFIELD_RANGE(29, 31);
} Common; } Common;
uint32_t RawData[1]; uint32_t RawData[1];
@@ -3385,7 +3385,7 @@ struct MI_USER_INTERRUPT {
}; };
inline void init() { inline void init() {
memset(&TheStructure, 0, sizeof(TheStructure)); memset(&TheStructure, 0, sizeof(TheStructure));
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT; TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
} }
static MI_USER_INTERRUPT sInit() { static MI_USER_INTERRUPT sInit() {
MI_USER_INTERRUPT state; MI_USER_INTERRUPT state;
@@ -4453,10 +4453,10 @@ struct XY_FAST_COLOR_BLT {
}; };
enum DESTINATION_SURFACE_TYPE { enum DESTINATION_SURFACE_TYPE {
DESTINATION_SURFACE_TYPE_1D = 0, DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0,
DESTINATION_SURFACE_TYPE_2D = 1, DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 1,
DESTINATION_SURFACE_TYPE_3D = 2, DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 2,
DESTINATION_SURFACE_TYPE_CUBE = 3, DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 3,
}; };
enum INSTRUCTIONTARGET_OPCODE { enum INSTRUCTIONTARGET_OPCODE {
INSTRUCTIONTARGET_OPCODE_OPCODE = 0x44, INSTRUCTIONTARGET_OPCODE_OPCODE = 0x44,

12
shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl
View File

@@ -3127,7 +3127,7 @@ struct MI_USER_INTERRUPT {
union tagTheStructure { union tagTheStructure {
struct tagCommon { struct tagCommon {
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22); uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28); uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
uint32_t CommandType : BITFIELD_RANGE(29, 31); uint32_t CommandType : BITFIELD_RANGE(29, 31);
} Common; } Common;
uint32_t RawData[1]; uint32_t RawData[1];
@@ -3140,7 +3140,7 @@ struct MI_USER_INTERRUPT {
}; };
inline void init() { inline void init() {
memset(&TheStructure, 0, sizeof(TheStructure)); memset(&TheStructure, 0, sizeof(TheStructure));
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT; TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
} }
static MI_USER_INTERRUPT sInit() { static MI_USER_INTERRUPT sInit() {
MI_USER_INTERRUPT state; MI_USER_INTERRUPT state;
@@ -4205,10 +4205,10 @@ struct XY_FAST_COLOR_BLT {
}; };
enum DESTINATION_SURFACE_TYPE { enum DESTINATION_SURFACE_TYPE {
DESTINATION_SURFACE_TYPE_1D = 0, DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0,
DESTINATION_SURFACE_TYPE_2D = 1, DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 1,
DESTINATION_SURFACE_TYPE_3D = 2, DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 2,
DESTINATION_SURFACE_TYPE_CUBE = 3, DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 3,
}; };
enum INSTRUCTIONTARGET_OPCODE { enum INSTRUCTIONTARGET_OPCODE {
INSTRUCTIONTARGET_OPCODE_OPCODE = 0x44, INSTRUCTIONTARGET_OPCODE_OPCODE = 0x44,

2
shared/source/helpers/blit_commands_helper_xehp_and_later.inl
View File

@@ -279,7 +279,7 @@ void BlitCommandsHelper<GfxFamily>::appendSliceOffsets(const BlitProperties &bli
template <typename GfxFamily> template <typename GfxFamily>
void BlitCommandsHelper<GfxFamily>::appendTilingEnable(typename GfxFamily::XY_COLOR_BLT &blitCmd) { void BlitCommandsHelper<GfxFamily>::appendTilingEnable(typename GfxFamily::XY_COLOR_BLT &blitCmd) {
using XY_COLOR_BLT = typename GfxFamily::XY_COLOR_BLT; using XY_COLOR_BLT = typename GfxFamily::XY_COLOR_BLT;
blitCmd.setDestinationSurfaceType(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_2D); blitCmd.setDestinationSurfaceType(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_SURFTYPE_2D);
} }
template <typename GfxFamily> template <typename GfxFamily>

2
shared/test/common/cmd_parse/cmd_parse_base.inl
View File

@@ -223,7 +223,7 @@ MI_USER_INTERRUPT *genCmdCast<MI_USER_INTERRUPT *>(void *buffer) {
auto pCmd = reinterpret_cast<MI_USER_INTERRUPT *>(buffer); auto pCmd = reinterpret_cast<MI_USER_INTERRUPT *>(buffer);
return 0 == pCmd->TheStructure.Common.CommandType && return 0 == pCmd->TheStructure.Common.CommandType &&
MI_USER_INTERRUPT::MI_COMMAND_OPCODE_MI_USER_INTERRUPT == pCmd->TheStructure.Common.MICommandOpcode MI_USER_INTERRUPT::MI_COMMAND_OPCODE_MI_USER_INTERRUPT == pCmd->TheStructure.Common.MiCommandOpcode
? pCmd ? pCmd
: nullptr; : nullptr;
} }

2
shared/test/common/helpers/unit_test_helper_xehp_and_later.inl
View File

@@ -136,7 +136,7 @@ void UnitTestHelper<GfxFamily>::verifyDummyBlitWa(const RootDeviceEnvironment *r
EXPECT_EQ(1u, dummyBltCmd->getDestinationX2CoordinateRight()); EXPECT_EQ(1u, dummyBltCmd->getDestinationX2CoordinateRight());
EXPECT_EQ(4u, dummyBltCmd->getDestinationY2CoordinateBottom()); EXPECT_EQ(4u, dummyBltCmd->getDestinationY2CoordinateBottom());
EXPECT_EQ(static_cast<uint32_t>(MemoryConstants::pageSize), dummyBltCmd->getDestinationPitch()); EXPECT_EQ(static_cast<uint32_t>(MemoryConstants::pageSize), dummyBltCmd->getDestinationPitch());
EXPECT_EQ(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_2D, dummyBltCmd->getDestinationSurfaceType()); EXPECT_EQ(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_SURFTYPE_2D, dummyBltCmd->getDestinationSurfaceType());
} }
} }