Skip to content

Commit 83b7143

Browse files
ivysochynCompute-Runtime-Automation
ivysochyn
authored and
Compute-Runtime-Automation
committed
refactor: Standardize DESTINATION_SURFACE_TYPE
Standardizes DESTINATION_SURFACE_TYPE to align with the latest specification. Related-To: NEO-13147 Signed-off-by: Vysochyn, Illia <illia.vysochyn@intel.com>
1 parent 88a27df commit 83b7143

File tree

8 files changed

+31
-31
lines changed

8 files changed

+31
-31
lines changed

‎shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3825,7 +3825,7 @@ typedef struct tagMI_USER_INTERRUPT {
38253825
struct tagCommon {
38263826
// DWORD 0
38273827
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
3828-
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28);
3828+
uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
38293829
uint32_t CommandType : BITFIELD_RANGE(29, 31);
38303830
} Common;
38313831
uint32_t RawData[1];
@@ -3838,7 +3838,7 @@ typedef struct tagMI_USER_INTERRUPT {
38383838
} COMMAND_TYPE;
38393839
inline void init() {
38403840
memset(&TheStructure, 0, sizeof(TheStructure));
3841-
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
3841+
TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
38423842
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;
38433843
}
38443844
static tagMI_USER_INTERRUPT sInit() {

‎shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3377,7 +3377,7 @@ typedef struct tagMI_USER_INTERRUPT {
33773377
struct tagCommon {
33783378
// DWORD 0
33793379
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
3380-
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28);
3380+
uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
33813381
uint32_t CommandType : BITFIELD_RANGE(29, 31);
33823382
} Common;
33833383
uint32_t RawData[1];
@@ -3390,7 +3390,7 @@ typedef struct tagMI_USER_INTERRUPT {
33903390
} COMMAND_TYPE;
33913391
inline void init() {
33923392
memset(&TheStructure, 0, sizeof(TheStructure));
3393-
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
3393+
TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
33943394
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;
33953395
}
33963396
static tagMI_USER_INTERRUPT sInit() {
@@ -4555,10 +4555,10 @@ typedef struct tagXY_FAST_COLOR_BLT {
45554555
AUX_SPECIAL_OPERATIONS_MODE_FORCE_UNCOMPRESS = 0x2,
45564556
} AUX_SPECIAL_OPERATIONS_MODE;
45574557
typedef enum tagDESTINATION_SURFACE_TYPE {
4558-
DESTINATION_SURFACE_TYPE_1D = 0x0,
4559-
DESTINATION_SURFACE_TYPE_2D = 0x1,
4560-
DESTINATION_SURFACE_TYPE_3D = 0x2,
4561-
DESTINATION_SURFACE_TYPE_CUBE = 0x3,
4558+
DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0x0,
4559+
DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 0x1,
4560+
DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 0x2,
4561+
DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 0x3,
45624562
} DESTINATION_SURFACE_TYPE;
45634563
inline void init() {
45644564
memset(&TheStructure, 0, sizeof(TheStructure));
@@ -4573,7 +4573,7 @@ typedef struct tagXY_FAST_COLOR_BLT {
45734573
TheStructure.Common.DestinationTargetMemory = DESTINATION_TARGET_MEMORY_LOCAL_MEM;
45744574
TheStructure.Common.DestinationCompressionFormat = DESTINATION_COMPRESSION_FORMAT_CMF_R8;
45754575
TheStructure.Common.AuxSpecialOperationsMode = AUX_SPECIAL_OPERATIONS_MODE_FAST_CLEAR_HW_FORMAT_CONVERSION;
4576-
TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_1D;
4576+
TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_SURFTYPE_1D;
45774577
}
45784578
static tagXY_FAST_COLOR_BLT sInit() {
45794579
XY_FAST_COLOR_BLT state;

‎shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,7 +3367,7 @@ typedef struct tagMI_USER_INTERRUPT {
33673367
struct tagCommon {
33683368
// DWORD 0
33693369
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
3370-
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28);
3370+
uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
33713371
uint32_t CommandType : BITFIELD_RANGE(29, 31);
33723372
} Common;
33733373
uint32_t RawData[1];
@@ -3380,7 +3380,7 @@ typedef struct tagMI_USER_INTERRUPT {
33803380
} COMMAND_TYPE;
33813381
inline void init() {
33823382
memset(&TheStructure, 0, sizeof(TheStructure));
3383-
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
3383+
TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
33843384
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;
33853385
}
33863386
static tagMI_USER_INTERRUPT sInit() {
@@ -4545,10 +4545,10 @@ typedef struct tagXY_FAST_COLOR_BLT {
45454545
AUX_SPECIAL_OPERATIONS_MODE_FORCE_UNCOMPRESS = 0x2,
45464546
} AUX_SPECIAL_OPERATIONS_MODE;
45474547
typedef enum tagDESTINATION_SURFACE_TYPE {
4548-
DESTINATION_SURFACE_TYPE_1D = 0x0,
4549-
DESTINATION_SURFACE_TYPE_2D = 0x1,
4550-
DESTINATION_SURFACE_TYPE_3D = 0x2,
4551-
DESTINATION_SURFACE_TYPE_CUBE = 0x3,
4548+
DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0x0,
4549+
DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 0x1,
4550+
DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 0x2,
4551+
DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 0x3,
45524552
} DESTINATION_SURFACE_TYPE;
45534553
inline void init() {
45544554
memset(&TheStructure, 0, sizeof(TheStructure));
@@ -4563,7 +4563,7 @@ typedef struct tagXY_FAST_COLOR_BLT {
45634563
TheStructure.Common.DestinationTargetMemory = DESTINATION_TARGET_MEMORY_LOCAL_MEM;
45644564
TheStructure.Common.DestinationCompressionFormat = DESTINATION_COMPRESSION_FORMAT_CMF_R8;
45654565
TheStructure.Common.AuxSpecialOperationsMode = AUX_SPECIAL_OPERATIONS_MODE_FAST_CLEAR_HW_FORMAT_CONVERSION;
4566-
TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_1D;
4566+
TheStructure.Common.DestinationSurfaceType = DESTINATION_SURFACE_TYPE_SURFTYPE_1D;
45674567
}
45684568
static tagXY_FAST_COLOR_BLT sInit() {
45694569
XY_FAST_COLOR_BLT state;

‎shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3372,7 +3372,7 @@ struct MI_USER_INTERRUPT {
33723372
union tagTheStructure {
33733373
struct tagCommon {
33743374
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
3375-
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28);
3375+
uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
33763376
uint32_t CommandType : BITFIELD_RANGE(29, 31);
33773377
} Common;
33783378
uint32_t RawData[1];
@@ -3385,7 +3385,7 @@ struct MI_USER_INTERRUPT {
33853385
};
33863386
inline void init() {
33873387
memset(&TheStructure, 0, sizeof(TheStructure));
3388-
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
3388+
TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
33893389
}
33903390
static MI_USER_INTERRUPT sInit() {
33913391
MI_USER_INTERRUPT state;
@@ -4453,10 +4453,10 @@ struct XY_FAST_COLOR_BLT {
44534453
};
44544454

44554455
enum DESTINATION_SURFACE_TYPE {
4456-
DESTINATION_SURFACE_TYPE_1D = 0,
4457-
DESTINATION_SURFACE_TYPE_2D = 1,
4458-
DESTINATION_SURFACE_TYPE_3D = 2,
4459-
DESTINATION_SURFACE_TYPE_CUBE = 3,
4456+
DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0,
4457+
DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 1,
4458+
DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 2,
4459+
DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 3,
44604460
};
44614461
enum INSTRUCTIONTARGET_OPCODE {
44624462
INSTRUCTIONTARGET_OPCODE_OPCODE = 0x44,

‎shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3127,7 +3127,7 @@ struct MI_USER_INTERRUPT {
31273127
union tagTheStructure {
31283128
struct tagCommon {
31293129
uint32_t Reserved_0 : BITFIELD_RANGE(0, 22);
3130-
uint32_t MICommandOpcode : BITFIELD_RANGE(23, 28);
3130+
uint32_t MiCommandOpcode : BITFIELD_RANGE(23, 28);
31313131
uint32_t CommandType : BITFIELD_RANGE(29, 31);
31323132
} Common;
31333133
uint32_t RawData[1];
@@ -3140,7 +3140,7 @@ struct MI_USER_INTERRUPT {
31403140
};
31413141
inline void init() {
31423142
memset(&TheStructure, 0, sizeof(TheStructure));
3143-
TheStructure.Common.MICommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
3143+
TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_USER_INTERRUPT;
31443144
}
31453145
static MI_USER_INTERRUPT sInit() {
31463146
MI_USER_INTERRUPT state;
@@ -4205,10 +4205,10 @@ struct XY_FAST_COLOR_BLT {
42054205
};
42064206

42074207
enum DESTINATION_SURFACE_TYPE {
4208-
DESTINATION_SURFACE_TYPE_1D = 0,
4209-
DESTINATION_SURFACE_TYPE_2D = 1,
4210-
DESTINATION_SURFACE_TYPE_3D = 2,
4211-
DESTINATION_SURFACE_TYPE_CUBE = 3,
4208+
DESTINATION_SURFACE_TYPE_SURFTYPE_1D = 0,
4209+
DESTINATION_SURFACE_TYPE_SURFTYPE_2D = 1,
4210+
DESTINATION_SURFACE_TYPE_SURFTYPE_3D = 2,
4211+
DESTINATION_SURFACE_TYPE_SURFTYPE_CUBE = 3,
42124212
};
42134213
enum INSTRUCTIONTARGET_OPCODE {
42144214
INSTRUCTIONTARGET_OPCODE_OPCODE = 0x44,

‎shared/source/helpers/blit_commands_helper_xehp_and_later.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void BlitCommandsHelper<GfxFamily>::appendSliceOffsets(const BlitProperties &bli
279279
template <typename GfxFamily>
280280
void BlitCommandsHelper<GfxFamily>::appendTilingEnable(typename GfxFamily::XY_COLOR_BLT &blitCmd) {
281281
using XY_COLOR_BLT = typename GfxFamily::XY_COLOR_BLT;
282-
blitCmd.setDestinationSurfaceType(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_2D);
282+
blitCmd.setDestinationSurfaceType(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_SURFTYPE_2D);
283283
}
284284

285285
template <typename GfxFamily>

‎shared/test/common/cmd_parse/cmd_parse_base.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ MI_USER_INTERRUPT *genCmdCast<MI_USER_INTERRUPT *>(void *buffer) {
223223
auto pCmd = reinterpret_cast<MI_USER_INTERRUPT *>(buffer);
224224

225225
return 0 == pCmd->TheStructure.Common.CommandType &&
226-
MI_USER_INTERRUPT::MI_COMMAND_OPCODE_MI_USER_INTERRUPT == pCmd->TheStructure.Common.MICommandOpcode
226+
MI_USER_INTERRUPT::MI_COMMAND_OPCODE_MI_USER_INTERRUPT == pCmd->TheStructure.Common.MiCommandOpcode
227227
? pCmd
228228
: nullptr;
229229
}

‎shared/test/common/helpers/unit_test_helper_xehp_and_later.inl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void UnitTestHelper<GfxFamily>::verifyDummyBlitWa(const RootDeviceEnvironment *r
136136
EXPECT_EQ(1u, dummyBltCmd->getDestinationX2CoordinateRight());
137137
EXPECT_EQ(4u, dummyBltCmd->getDestinationY2CoordinateBottom());
138138
EXPECT_EQ(static_cast<uint32_t>(MemoryConstants::pageSize), dummyBltCmd->getDestinationPitch());
139-
EXPECT_EQ(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_2D, dummyBltCmd->getDestinationSurfaceType());
139+
EXPECT_EQ(XY_COLOR_BLT::DESTINATION_SURFACE_TYPE::DESTINATION_SURFACE_TYPE_SURFTYPE_2D, dummyBltCmd->getDestinationSurfaceType());
140140
}
141141
}
142142

0 commit comments

Comments
 (0)