Skip to content

Commit 560ea5f

Browse files
authored
Update ittapi to 3.26.4 (#1895)
1 parent 3b736d8 commit 560ea5f

File tree

4 files changed

+94
-146
lines changed

4 files changed

+94
-146
lines changed

src/tbb/tools_api/ittnotify.h

Lines changed: 63 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
Copyright (c) 2005-2024 Intel Corporation
2+
Copyright (c) 2005-2025 Intel Corporation
3+
Copyright (c) 2025 UXL Foundation Contributors
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
@@ -102,10 +103,9 @@ The same ID may not be reused for different instances, unless a previous
102103
#endif /* ITT_OS_FREEBSD */
103104

104105
#ifndef ITT_OS_OPENBSD
105-
# define ITT_OS_OPENBSD 5
106+
# define ITT_OS_OPENBSD 5
106107
#endif /* ITT_OS_OPENBSD */
107108

108-
109109
#ifndef ITT_OS
110110
# if defined WIN32 || defined _WIN32
111111
# define ITT_OS ITT_OS_WIN
@@ -274,6 +274,8 @@ The same ID may not be reused for different instances, unless a previous
274274
#define ITTNOTIFY_VOID_D4(n,d,x,y,z,a) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a)
275275
#define ITTNOTIFY_VOID_D5(n,d,x,y,z,a,b) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b)
276276
#define ITTNOTIFY_VOID_D6(n,d,x,y,z,a,b,c) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,z,a,b,c)
277+
#define ITTNOTIFY_VOID_D2_VA(n,d,x,...) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,__VA_ARGS__)
278+
#define ITTNOTIFY_VOID_D3_VA(n,d,x,y,...) (d == NULL) ? (void)0 : (!(d)->flags) ? (void)0 : (!ITTNOTIFY_NAME(n)) ? (void)0 : ITTNOTIFY_NAME(n)(d,x,y,__VA_ARGS__)
277279
#define ITTNOTIFY_DATA_D0(n,d) (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d)
278280
#define ITTNOTIFY_DATA_D1(n,d,x) (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d,x)
279281
#define ITTNOTIFY_DATA_D2(n,d,x,y) (d == NULL) ? 0 : (!(d)->flags) ? 0 : (!ITTNOTIFY_NAME(n)) ? 0 : ITTNOTIFY_NAME(n)(d,x,y)
@@ -318,7 +320,7 @@ extern "C" {
318320
* only pauses tracing and analyzing memory access.
319321
* It does not pause tracing or analyzing threading APIs.
320322
* .
321-
* Intel(R) VTune(TM) Profiler:
323+
* - Intel(R) VTune(TM) Profiler:
322324
* - Does continue to record when new threads are started.
323325
* .
324326
* - Other effects:
@@ -347,7 +349,7 @@ typedef enum {
347349
void ITTAPI __itt_pause_scoped(__itt_collection_scope);
348350
/** @brief Resume scoped collection */
349351
void ITTAPI __itt_resume_scoped(__itt_collection_scope);
350-
352+
351353
/** @cond exclude_from_documentation */
352354
#ifndef INTEL_NO_MACRO_BODY
353355
#ifndef INTEL_NO_ITTNOTIFY_API
@@ -393,7 +395,7 @@ ITT_STUBV(ITTAPI, void, detach, (void))
393395
* @defgroup Intel Processor Trace control
394396
* API from this group provides control over collection and analysis of Intel Processor Trace (Intel PT) data
395397
* Information about Intel Processor Trace technology can be found here (Volume 3 chapter 35):
396-
* https://github.com/tpn/pdfs/blob/master/Intel%2064%20and%20IA-32%20Architectures%20Software%20Developer's%20Manual%20-%20Combined%20Volumes%201-4%20-%20May%202018%20(325462-sdm-vol-1-2abcd-3abcd).pdf
398+
* https://software.intel.com/sites/default/files/managed/39/c5/325462-sdm-vol-1-2abcd-3abcd.pdf
397399
* Use this API to mark particular code regions for loading detailed performance statistics.
398400
* This mode makes your analysis faster and more accurate.
399401
* @{
@@ -2466,9 +2468,58 @@ typedef enum {
24662468
__itt_metadata_u16, /**< Unsigned 16-bit integer */
24672469
__itt_metadata_s16, /**< Signed 16-bit integer */
24682470
__itt_metadata_float, /**< Signed 32-bit floating-point */
2469-
__itt_metadata_double /**< SIgned 64-bit floating-point */
2471+
__itt_metadata_double /**< Signed 64-bit floating-point */
24702472
} __itt_metadata_type;
24712473

2474+
/**
2475+
* @ingroup parameters
2476+
* @brief Add metadata to an instance of a named entity.
2477+
* @param[in] domain The domain controlling the call
2478+
* @param[in] format The printf-style format of the metadata
2479+
* @param[in] ... The metadata itself as multiple arguments
2480+
*/
2481+
void ITTAPI __itt_formatted_metadata_add(const __itt_domain *domain, __itt_string_handle *format, ...);
2482+
2483+
/** @cond exclude_from_documentation */
2484+
#ifndef INTEL_NO_MACRO_BODY
2485+
#ifndef INTEL_NO_ITTNOTIFY_API
2486+
ITT_STUBV(ITTAPI, void, formatted_metadata_add, (const __itt_domain *domain, __itt_string_handle *format, ...))
2487+
#define __itt_formatted_metadata_add(d,x, ...) ITTNOTIFY_VOID_D2_VA(formatted_metadata_add,d,x,__VA_ARGS__)
2488+
#define __itt_formatted_metadata_add_ptr ITTNOTIFY_NAME(formatted_metadata_add)
2489+
#else /* INTEL_NO_ITTNOTIFY_API */
2490+
#define __itt_formatted_metadata_add(domain, format, metadata)
2491+
#define __itt_formatted_metadata_add_ptr 0
2492+
#endif /* INTEL_NO_ITTNOTIFY_API */
2493+
#else /* INTEL_NO_MACRO_BODY */
2494+
#define __itt_formatted_metadata_add_ptr 0
2495+
#endif /* INTEL_NO_MACRO_BODY */
2496+
/** @endcond */
2497+
2498+
/**
2499+
* @ingroup parameters
2500+
* @brief Add metadata to an instance of a named entity.
2501+
* @param[in] domain The domain controlling the call
2502+
* @param[in] taskid The identifier for this task instance, *cannot* be __itt_null.
2503+
* @param[in] format The printf-style format of the metadata
2504+
* @param[in] ... The metadata itself as multiple arguments
2505+
*/
2506+
void ITTAPI __itt_formatted_metadata_add_overlapped(const __itt_domain *domain, __itt_id taskid, __itt_string_handle *format, ...);
2507+
2508+
/** @cond exclude_from_documentation */
2509+
#ifndef INTEL_NO_MACRO_BODY
2510+
#ifndef INTEL_NO_ITTNOTIFY_API
2511+
ITT_STUBV(ITTAPI, void, formatted_metadata_add_overlapped, (const __itt_domain *domain, __itt_id taskid, __itt_string_handle *format, ...))
2512+
#define __itt_formatted_metadata_add_overlapped(d,x,y, ...) ITTNOTIFY_VOID_D3_VA(formatted_metadata_add_overlapped,d,x,y,__VA_ARGS__)
2513+
#define __itt_formatted_metadata_add_overlapped_ptr ITTNOTIFY_NAME(formatted_metadata_add_overlapped)
2514+
#else /* INTEL_NO_ITTNOTIFY_API */
2515+
#define __itt_formatted_metadata_add_overlapped(domain, taskid, format, metadata)
2516+
#define __itt_formatted_metadata_add_overlapped_ptr 0
2517+
#endif /* INTEL_NO_ITTNOTIFY_API */
2518+
#else /* INTEL_NO_MACRO_BODY */
2519+
#define __itt_formatted_metadata_add_overlapped_ptr 0
2520+
#endif /* INTEL_NO_MACRO_BODY */
2521+
/** @endcond */
2522+
24722523
/**
24732524
* @ingroup parameters
24742525
* @brief Add metadata to an instance of a named entity.
@@ -4010,21 +4061,21 @@ ITT_STUB(ITTAPI, __itt_histogram*, histogram_create, (const __itt_domain* domain
40104061

40114062
/**
40124063
* @brief Submit statistics for a histogram instance.
4013-
* @param[in] histogram Pointer to the histogram instance to which the histogram statistic is to be dumped.
4064+
* @param[in] hist Pointer to the histogram instance to which the histogram statistic is to be dumped.
40144065
* @param[in] length The number of elements in dumped axis data array.
40154066
* @param[in] x_data The X axis dumped data itself (may be NULL to calculate batch statistics).
40164067
* @param[in] y_data The Y axis dumped data itself.
40174068
*/
4018-
void ITTAPI __itt_histogram_submit(__itt_histogram* histogram, size_t length, void* x_data, void* y_data);
4069+
void ITTAPI __itt_histogram_submit(__itt_histogram* hist, size_t length, void* x_data, void* y_data);
40194070

40204071
/** @cond exclude_from_documentation */
40214072
#ifndef INTEL_NO_MACRO_BODY
40224073
#ifndef INTEL_NO_ITTNOTIFY_API
4023-
ITT_STUBV(ITTAPI, void, histogram_submit, (__itt_histogram* histogram, size_t length, void* x_data, void* y_data))
4074+
ITT_STUBV(ITTAPI, void, histogram_submit, (__itt_histogram* hist, size_t length, void* x_data, void* y_data))
40244075
#define __itt_histogram_submit ITTNOTIFY_VOID(histogram_submit)
40254076
#define __itt_histogram_submit_ptr ITTNOTIFY_NAME(histogram_submit)
40264077
#else /* INTEL_NO_ITTNOTIFY_API */
4027-
#define __itt_histogram_submit(histogram, length, x_data, y_data)
4078+
#define __itt_histogram_submit(hist, length, x_data, y_data)
40284079
#define __itt_histogram_submit_ptr 0
40294080
#endif /* INTEL_NO_ITTNOTIFY_API */
40304081
#else /* INTEL_NO_MACRO_BODY */
@@ -4630,7 +4681,7 @@ typedef enum __itt_error_code
46304681
{
46314682
__itt_error_success = 0, /*!< no error */
46324683
__itt_error_no_module = 1, /*!< module can't be loaded */
4633-
/* %1$s -- library name; win: %2$d -- system error code; unix: %2$s -- system error message. */
4684+
/* %1$s -- library name; win: %2$d -- system error code; unx: %2$s -- system error message. */
46344685
__itt_error_no_symbol = 2, /*!< symbol not found */
46354686
/* %1$s -- library name, %2$s -- symbol name. */
46364687
__itt_error_unknown_group = 3, /*!< unknown group specified */

src/tbb/tools_api/ittnotify_config.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
Copyright (c) 2005-2024 Intel Corporation
2+
Copyright (c) 2005-2025 Intel Corporation
3+
Copyright (c) 2025 UXL Foundation Contributors
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
@@ -244,10 +245,10 @@
244245
#define ITT_MAGIC { 0xED, 0xAB, 0xAB, 0xEC, 0x0D, 0xEE, 0xDA, 0x30 }
245246

246247
/* Replace with snapshot date YYYYMMDD for promotion build. */
247-
#define API_VERSION_BUILD 20230630
248+
#define API_VERSION_BUILD 20250807
248249

249250
#ifndef API_VERSION_NUM
250-
#define API_VERSION_NUM 3.24.4
251+
#define API_VERSION_NUM 3.26.3
251252
#endif /* API_VERSION_NUM */
252253

253254
#define API_VERSION "ITT-API-Version " ITT_TO_STR(API_VERSION_NUM) \
@@ -688,7 +689,7 @@ typedef struct ___itt_global
688689
h->y_type = y_type; \
689690
h->extra1 = 0; \
690691
h->extra2 = NULL; \
691-
h->next = NULL; \
692+
h->next = NULL; \
692693
if (h_tail == NULL) \
693694
(gptr)->histogram_list = h; \
694695
else \
@@ -708,7 +709,7 @@ typedef struct ___itt_global
708709
h->y_type = y_type; \
709710
h->extra1 = 0; \
710711
h->extra2 = NULL; \
711-
h->next = NULL; \
712+
h->next = NULL; \
712713
if (h_tail == NULL) \
713714
(gptr)->histogram_list = h; \
714715
else \

0 commit comments

Comments
 (0)