Skip to content

Commit 57be52d

Browse files
pengwan1intel-mediadev
pengwan1
authored and
intel-mediadev
committed
[MOS] [PDVT-SH] enable warning level into the mos message level
enable warning level into the mos message level.
1 parent 2a5ff36 commit 57be52d

File tree

28 files changed

+228
-89
lines changed

28 files changed

+228
-89
lines changed

‎media_common/agnostic/common/heap_manager/heap.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Intel Corporation
2+
* Copyright (c) 2017-2025, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -43,6 +43,9 @@
4343
//! Asserts and prints \a _message at critical message level
4444
#define HEAP_ASSERTMESSAGE(_message, ...) \
4545
MOS_ASSERTMESSAGE(MOS_COMPONENT_HW, MOS_SUBCOMP_SELF, _message, ##__VA_ARGS__)
46+
//! Prints \a _message at warning message level
47+
#define HEAP_WARNINGMESSAGE(_message, ...) \
48+
MOS_WARNINGMESSAGE(MOS_COMPONENT_HW, MOS_SUBCOMP_SELF, _message, ##__VA_ARGS__)
4649
//! Prints \a _message at normal message level
4750
#define HEAP_NORMALMESSAGE(_message, ...) \
4851
MOS_NORMALMESSAGE(MOS_COMPONENT_HW, MOS_SUBCOMP_SELF, _message, ##__VA_ARGS__)

‎media_common/agnostic/common/os/mos_util_user_feature_keys.h‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023, Intel Corporation
2+
* Copyright (c) 2009-2025, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -189,12 +189,12 @@
189189
//! \brief Message level and assert flag for each component is set through the user feature keys
190190
//! "Mos Message Tags", "Codec Message Tags", "VP Message Tags",
191191
//! "CP Message Tags", "DDI Message Tags" and "CM Message Tags"
192-
//! 3 bits for level, 1 bit for assert on/off per sub-component.
192+
//! 3 bits for level, 1 bit for assert on/off, 1 bit for warning message per sub-component.
193193
//! Each component has to create a separate key for its sub-comps.
194194
//!
195-
//! 31____________________________________________________________________________3__________0
196-
//! | | |Asrt|level|
197-
//! |________________________________|__________|__________|__________|__________|__________|
195+
//! 31________________________________________________________________________4_______________0
196+
//! | | |Warn|Asrt|level|
197+
//! |________________________________|__________|__________|__________|______|_______________|
198198
//!
199199

200200
//!
@@ -203,10 +203,10 @@
203203
#define __MOS_USER_FEATURE_KEY_MESSAGE_OS_TAG "Mos Message Tags"
204204
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_OS "Mos Tags By Sub Component"
205205
//!
206-
//! \brief 63____________________________________________________________________________3__________0
207-
//! | | Self |
208-
//! | Reserved (HLT can be added as a sub-comp of MOS) |Asrt|level|
209-
//! |____________________________________________________________________________|__________|
206+
//! \brief 63_________________________________________________________________________4_______________0
207+
//! | | Self |
208+
//! | Reserved (HLT can be added as a sub-comp of MOS) |Warn|Asrt|level|
209+
//! |_________________________________________________________________________|_______________|
210210
//!
211211
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_OS_TAG "Mos Sub Components Tags"
212212

@@ -216,10 +216,10 @@
216216
#define __MOS_USER_FEATURE_KEY_MESSAGE_MHW_TAG "Mhw Message Tags"
217217
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_MHW "Mhw Tags By Sub Component"
218218
//!
219-
//! \brief 63____________________________________________________________________________3__________0
220-
//! | | Self |
221-
//! | Reserved (HLT can be added as a sub-comp of MOS) |Asrt|level|
222-
//! |____________________________________________________________________________|__________|
219+
//! \brief 63________________________________________________________________________4_______________0
220+
//! | | Self |
221+
//! | Reserved (HLT can be added as a sub-comp of MOS) |Warn|Asrt|level|
222+
//! |________________________________________________________________________|_______________|
223223
//!
224224
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_MHW_TAG "Mhw Sub Components Tags"
225225

@@ -230,13 +230,13 @@
230230
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_CODEC "Codec Tags By Sub Component"
231231
//!
232232
//! \brief Message level and assert flag for each sub-comp of CodecHal set through this user feature key
233-
//! 3 bits for level, 1 bit for assert on/off per sub-component.
233+
//! 3 bits for level, 1 bit for assert on/off, 1 bit for warning message per sub-component.
234234
//! Each component has to create a separate key for its sub-comps.
235235
//!
236-
//! 63___________________24_23______20_19______16_15______12_11_______8_7________4_3_________0
237-
//! | | Debug | Public | HW | Encode | Decode | DDI |
238-
//! | Reserved |Asrt|level|Asrt|level|Asrt|level|Asrt|level|Asrt|level|Asrt|level|
239-
//! |________________________________|__________|__________|__________|__________|__________|
236+
//! 63___________________30_29___________25_24___________20_19___________15_14___________10_9_____________5_4______________0
237+
//! | | Debug | Public | HW | Encode | Decode | DDI |
238+
//! | Reserved |Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|
239+
//! |_____________________________________|_______________|_______________|_______________|_______________|_______________|
240240
//!
241241
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_CODEC_TAG "Codec Sub Components Tags"
242242

@@ -247,13 +247,13 @@
247247
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_VP "VP Tags By Sub Component"
248248
//!
249249
//! \brief Message level and assert flag for each sub-comp of VP set through this user feature key
250-
//! 3 bits for level, 1 bit for assert on/off per sub-component.
250+
//! 3 bits for level, 1 bit for assert on/off, 1 bit for warning message per sub-component.
251251
//! Each component has to create a separate key for its sub-comps.
252252
//!
253-
//! 63___________________24_23______20_19______16_15______12_11_______8_7________4_3_________0
254-
//! | | Reserved | Render | Debug | Public | HW | DDI |
255-
//! | Reserved |Asrt|level|Asrt|level|Asrt|level|Asrt|level|Asrt|level|Asrt|level|
256-
//! |________________________________|__________|__________|__________|__________|__________|
253+
//! 63___________________30_29___________25_24___________20_19___________15_14____________10_9____________5_4______________0
254+
//! | | Reserved | Render | Debug | Public | HW | DDI |
255+
//! | Reserved |Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|Warn|Asrt|level|
256+
//! |_____________________________________|_______________|_______________|_______________|_______________|_______________|
257257
//!
258258
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_VP_TAG "VP Sub Components Tags"
259259

@@ -265,13 +265,13 @@
265265
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_CP "CP Tags By Sub Component"
266266
//!
267267
//! \brief Message level and assert flag for each sub-comp of CP set through this user feature key
268-
//! 3 bits for level, 1 bit for assert on/off per sub-component.
268+
//! 3 bits for level, 1 bit for assert on/off, 1 bit for warning message per sub-component.
269269
//! Each component has to create a separate key for its sub-comps.
270270
//!
271-
//! 63_____48_47___44_43____40_39_______36_35_________32_31___28_27____24_23___20_19___16_15__12_11__8_7_________4_3_________0
272-
//! | | LIB | DLL |AUTHCHANNEL|SECURESESSION|CMD_BFR|UMD_CTXT| CODEC |GPU_HAL|PCH_HAL| OS | DEVICE |CP_DDI |
273-
//! |Reserved| A|L | A|L | A|L | A|L | A|L | A|L | A|L | A|L | A|L |A|L |Asrt|level |Asrt|level|
274-
//! |________|_______|________|___________|_____________|_______|________|_______|_______|_______|____|___________|__________|
271+
//! 63_____60_59_____55_54______50_49_______45_44_________40_39_____35_34______30_29_____25_24_____20_19_____15_14__10_9_____________5_4______________0
272+
//! | | LIB | DLL |AUTHCHANNEL|SECURESESSION| CMD_BFR | UMD_CTXT | CODEC | GPU_HAL | PCH_HAL | OS | DEVICE | CP_DDI |
273+
//! |Reserved| W|A|L | W|A|L | W|A|L | W|A|L | W|A|L | W|A|L | W|A|L | W|A|L | W|A|L |W|A|L |Warn|Asrt|level|Warn|Asrt|level|
274+
//! |________|_________|__________|___________|_____________|_________|__________|_________|_________|_________|______|_______________|_______________|
275275
//!
276276
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_CP_TAG "CP Sub Components Tags"
277277

@@ -281,10 +281,10 @@
281281
#define __MOS_USER_FEATURE_KEY_MESSAGE_DDI_TAG "DDI Message Tags"
282282
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_DDI "DDI Tags By Sub Component"
283283
//!
284-
//! \brief 63____________________________________________________________________________3__________0
285-
//! | | Self |
286-
//! | Reserved (can create DDI subcomponents) |Asrt|level|
287-
//! |____________________________________________________________________________|__________|
284+
//! \brief 63____________________________________________________________________________4_______________0
285+
//! | | Self |
286+
//! | Reserved (can create DDI subcomponents) |Warn|Asrt|level|
287+
//! |____________________________________________________________________________|_______________|
288288
//!
289289
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_DDI_TAG "DDI Sub Components Tags"
290290

@@ -294,10 +294,10 @@
294294
#define __MOS_USER_FEATURE_KEY_MESSAGE_CM_TAG "CM Message Tags"
295295
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_CM "CM Tags By Sub Component"
296296
//!
297-
//! \brief 63________________________________________________________________8_7________4_3_________0
298-
//! | | Self | DDI |
299-
//! | Reserved (can create CM subcomponents) |Asrt|level|Asrt|level|
300-
//! |____________________________________________________________________________|__________|
297+
//! \brief 63______________________________________________________________9_______________5_4______________0
298+
//! | | Self | Self |
299+
//! | Reserved (can create CM subcomponents) |Warn|Asrt|level |Warn|Asrt|level|
300+
//! |______________________________________________________________|________________|_______________|
301301
//!
302302
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_CM_TAG "CM Sub Components Tags"
303303

@@ -307,10 +307,10 @@
307307
#define __MOS_USER_FEATURE_KEY_MESSAGE_SCALABILITY_TAG "SCALABILITY Message Tags"
308308
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_SCALABILITY "SCALABILITY Tags By Sub Component"
309309
//!
310-
//! \brief 63____________________________________________________________________________3__________0
311-
//! | | Self |
312-
//! | Reserved (can create SCALABILITY subcomponents) |Asrt|level|
313-
//! |____________________________________________________________________________|__________|
310+
//! \brief 63____________________________________________________________________________4_______________0
311+
//! | | Self |
312+
//! | Reserved (can create SCALABILITY subcomponents) |Warn|Asrt|level|
313+
//! |____________________________________________________________________________|_______________|
314314
//!
315315
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_SCALABILITY_TAG "SCALABILITY Sub Components Tags"
316316

@@ -321,10 +321,10 @@
321321
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_MMC "MMC Tags By Sub Component"
322322

323323
//!
324-
//! \brief 63____________________________________________________________________________3__________0
325-
//! | | Self |
326-
//! | Reserved (can create MMC subcomponents) |Asrt|level|
327-
//! |____________________________________________________________________________|__________|
324+
//! \brief 63____________________________________________________________________________4_______________0
325+
//! | | Self |
326+
//! | Reserved (can create MMC subcomponents) |Warn|Asrt|level|
327+
//! |____________________________________________________________________________|_______________|
328328
//!
329329
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_MMC_TAG "MMC Sub Components Tags"
330330

@@ -334,10 +334,10 @@
334334
#define __MOS_USER_FEATURE_KEY_MESSAGE_MCPY_TAG "MCPY Message Tags"
335335
#define __MOS_USER_FEATURE_KEY_BY_SUB_COMPONENT_MCPY "MCPY Tags By Sub Component"
336336
//!
337-
//! \brief 63____________________________________________________________________________3__________0
338-
//! | | Self |
339-
//! | Reserved (can create MCPY subcomponents) |Asrt|level|
340-
//! |____________________________________________________________________________|__________|
337+
//! \brief 63____________________________________________________________________________4_______________0
338+
//! | | Self |
339+
//! | Reserved (can create MCPY subcomponents) |Warn|Asrt|level|
340+
//! |____________________________________________________________________________|_______________|
341341
//!
342342
#define __MOS_USER_FEATURE_KEY_SUB_COMPONENT_MCPY_TAG "MCPY Sub Components Tags"
343343

‎media_common/agnostic/common/renderhal/renderhal.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2022, Intel Corporation
2+
* Copyright (c) 2009-2025, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -51,6 +51,9 @@ class XRenderHal_Platform_Interface;
5151
#define MHW_RENDERHAL_ASSERTMESSAGE(_message, ...) \
5252
MOS_ASSERTMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_RENDERHAL, _message, ##__VA_ARGS__)
5353

54+
#define MHW_RENDERHAL_WARNINGMESSAGE(_message, ...) \
55+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_RENDERHAL, _message, ##__VA_ARGS__)
56+
5457
#define MHW_RENDERHAL_NORMALMESSAGE(_message, ...) \
5558
MOS_NORMALMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_RENDERHAL, _message, ##__VA_ARGS__)
5659

‎media_driver/agnostic/Xe_M/Xe_XPM_plus/shared/renderhal_memdecomp.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
#define RENDERHAL_MEMORY_DECOMP_ASSERTMESSAGE(_message, ...) \
4343
MOS_ASSERTMESSAGE(MOS_COMPONENT_VP, MOS_VP_SUBCOMP_RENDER, _message, ##__VA_ARGS__)
4444

45+
#define RENDERHAL_MEMORY_DECOMP_WARNINGMESSAGE(_message, ...) \
46+
MOS_WARNINGMESSAGE(MOS_COMPONENT_VP, MOS_VP_SUBCOMP_RENDER, _message, ##__VA_ARGS__)
47+
4548
#define RENDERHAL_MEMORY_DECOMP_NORMALMESSAGE(_message, ...) \
4649
MOS_NORMALMESSAGE(MOS_COMPONENT_VP, MOS_VP_SUBCOMP_RENDER, _message, ##__VA_ARGS__)
4750

‎media_driver/agnostic/common/cm/cm_debug.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018-2021, Intel Corporation
2+
* Copyright (c) 2018-2025, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -54,7 +54,14 @@
5454
MOS_ASSERTMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_PUBLIC, msg, ##__VA_ARGS__)
5555
#define CM_ASSERTMESSAGE_RENDERHAL(msg, ...) \
5656
MOS_ASSERTMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_RENDERHAL, msg, ##__VA_ARGS__)
57-
57+
#define CM_WARNINGMESSAGE(msg, ...) \
58+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_SELF, msg, ##__VA_ARGS__)
59+
#define CM_WARNINGMESSAGE_DDI(msg, ...) \
60+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_DDI, msg, ##__VA_ARGS__)
61+
#define CM_WARNINGMESSAGE_PUBLIC(msg, ...) \
62+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_PUBLIC, msg, ##__VA_ARGS__)
63+
#define CM_WARNINGMESSAGE_RENDERHAL(msg, ...) \
64+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_RENDERHAL, msg, ##__VA_ARGS__)
5865
#define CM_NORMALMESSAGE(msg, ...) \
5966
MOS_NORMALMESSAGE(MOS_COMPONENT_CM, MOS_CM_SUBCOMP_SELF, msg, ##__VA_ARGS__)
6067
#define CM_NORMALMESSAGE_DDI(msg, ...) \

‎media_driver/agnostic/common/codec/hal/codechal_decoder.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011-2021, Intel Corporation
2+
* Copyright (c) 2011-2025, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -60,6 +60,9 @@ class CodechalDecodeHistogram;
6060
#define CODECHAL_DECODE_ASSERTMESSAGE(_message, ...) \
6161
MOS_ASSERTMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_DECODE, _message, ##__VA_ARGS__)
6262

63+
#define CODECHAL_DECODE_WARNINGMESSAGE(_message, ...) \
64+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_DECODE, _message, ##__VA_ARGS__)
65+
6366
#define CODECHAL_DECODE_NORMALMESSAGE(_message, ...) \
6467
MOS_NORMALMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_DECODE, _message, ##__VA_ARGS__)
6568

‎media_driver/agnostic/common/codec/hal/codechal_encoder_base.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017-2024, Intel Corporation
2+
* Copyright (c) 2017-2025, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -52,6 +52,9 @@
5252
#define CODECHAL_ENCODE_ASSERTMESSAGE(_message, ...) \
5353
MOS_ASSERTMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_ENCODE, _message, ##__VA_ARGS__)
5454

55+
#define CODECHAL_ENCODE_WARNINGMESSAGE(_message, ...) \
56+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_ENCODE, _message, ##__VA_ARGS__)
57+
5558
#define CODECHAL_ENCODE_NORMALMESSAGE(_message, ...) \
5659
MOS_NORMALMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_ENCODE, _message, ##__VA_ARGS__)
5760

‎media_driver/agnostic/common/codec/hal/codechal_hw.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011-2021, Intel Corporation
2+
* Copyright (c) 2011-2025, Intel Corporation
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a
55
* copy of this software and associated documentation files (the "Software"),
@@ -62,6 +62,9 @@
6262
#define CODECHAL_HW_ASSERTMESSAGE(_message, ...) \
6363
MOS_ASSERTMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_HW, _message, ##__VA_ARGS__)
6464

65+
#define CODECHAL_HW_WARNINGMESSAGE(_message, ...) \
66+
MOS_WARNINGMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_HW, _message, ##__VA_ARGS__)
67+
6568
#define CODECHAL_HW_NORMALMESSAGE(_message, ...) \
6669
MOS_NORMALMESSAGE(MOS_COMPONENT_CODEC, MOS_CODEC_SUBCOMP_HW, _message, ##__VA_ARGS__)
6770

0 commit comments

Comments
 (0)