Fix metric types for new experimental types

nrspruit · lisanna-dettwyler · commit 2325a8c7b20f · 2024-10-31T15:50:08.000-04:00
Signed-off-by: Neil R. Spruit &lt;neil.r.spruit@intel.com&gt;
diff --git a/include/ze.py b/include/ze.py
@@ -4,7 +4,7 @@
  SPDX-License-Identifier: MIT
 
  @file ze.py
- @version v1.11-r1.11.4
+ @version v1.11-r1.11.5
 
  """
 import platform
diff --git a/include/ze_api.h b/include/ze_api.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  *
  * @file ze_api.h
- * @version v1.11-r1.11.4
+ * @version v1.11-r1.11.5
  *
  */
 #ifndef _ZE_API_H
diff --git a/include/ze_ddi.h b/include/ze_ddi.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  *
  * @file ze_ddi.h
- * @version v1.11-r1.11.4
+ * @version v1.11-r1.11.5
  *
  */
 #ifndef _ZE_DDI_H
diff --git a/include/zes.py b/include/zes.py
@@ -4,7 +4,7 @@
  SPDX-License-Identifier: MIT
 
  @file zes.py
- @version v1.11-r1.11.4
+ @version v1.11-r1.11.5
 
  """
 import platform
diff --git a/include/zes_api.h b/include/zes_api.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  *
  * @file zes_api.h
- * @version v1.11-r1.11.4
+ * @version v1.11-r1.11.5
  *
  */
 #ifndef _ZES_API_H
diff --git a/include/zes_ddi.h b/include/zes_ddi.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  *
  * @file zes_ddi.h
- * @version v1.11-r1.11.4
+ * @version v1.11-r1.11.5
  *
  */
 #ifndef _ZES_DDI_H
diff --git a/include/zet.py b/include/zet.py
@@ -4,7 +4,7 @@
  SPDX-License-Identifier: MIT
 
  @file zet.py
- @version v1.11-r1.11.4
+ @version v1.11-r1.11.5
 
  """
 import platform
@@ -417,16 +417,16 @@ class zet_metric_type_v(IntEnum):
     FLAG = 5                                                                ## Metric type: flag
     RATIO = 6                                                               ## Metric type: ratio
     RAW = 7                                                                 ## Metric type: raw
-    IP_EXP = 8                                                              ## Metric type: instruction pointer. Deprecated, use
-                                                                            ## ::ZET_METRIC_TYPE_IP.
-    IP = 9                                                                  ## Metric type: instruction pointer
-    EVENT_EXP_TIMESTAMP = 10                                                ## Metric type: event with only timestamp and value has no meaning
-    EVENT_EXP_START = 11                                                    ## Metric type: the first event of a start/end event pair
-    EVENT_EXP_END = 12                                                      ## Metric type: the second event of a start/end event pair
-    EXPORT_DMA_BUF = 0x7ffffffd                                             ## Metric which exports linux dma_buf, which could be imported/mapped to
-                                                                            ## the host process
-    EVENT_EXP_MONOTONIC_WRAPS_VALUE = 0x7ffffffe                            ## Metric type: value of the event is a monotonically increasing value
+    EVENT_EXP_TIMESTAMP = 0x7ffffff9                                        ## Metric type: event with only timestamp and value has no meaning
+    EVENT_EXP_START = 0x7ffffffa                                            ## Metric type: the first event of a start/end event pair
+    EVENT_EXP_END = 0x7ffffffb                                              ## Metric type: the second event of a start/end event pair
+    EVENT_EXP_MONOTONIC_WRAPS_VALUE = 0x7ffffffc                            ## Metric type: value of the event is a monotonically increasing value
                                                                             ## that can wrap around
+    EXP_EXPORT_DMA_BUF = 0x7ffffffd                                         ## Metric which exports linux dma_buf, which could be imported/mapped to
+                                                                            ## the host process
+    IP_EXP = 0x7ffffffe                                                     ## Metric type: instruction pointer. Deprecated, use
+                                                                            ## ::ZET_METRIC_TYPE_IP.
+    IP = 0x7ffffffe                                                         ## Metric type: instruction pointer
 
 class zet_metric_type_t(c_int):
     def __str__(self):
diff --git a/include/zet_api.h b/include/zet_api.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  *
  * @file zet_api.h
- * @version v1.11-r1.11.4
+ * @version v1.11-r1.11.5
  *
  */
 #ifndef _ZET_API_H
@@ -1012,16 +1012,16 @@ typedef enum _zet_metric_type_t
     ZET_METRIC_TYPE_FLAG = 5,                                               ///< Metric type: flag
     ZET_METRIC_TYPE_RATIO = 6,                                              ///< Metric type: ratio
     ZET_METRIC_TYPE_RAW = 7,                                                ///< Metric type: raw
-    ZET_METRIC_TYPE_IP_EXP = 8,                                             ///< Metric type: instruction pointer. Deprecated, use
-                                                                            ///< ::ZET_METRIC_TYPE_IP.
-    ZET_METRIC_TYPE_IP = 9,                                                 ///< Metric type: instruction pointer
-    ZET_METRIC_TYPE_EVENT_EXP_TIMESTAMP = 10,                               ///< Metric type: event with only timestamp and value has no meaning
-    ZET_METRIC_TYPE_EVENT_EXP_START = 11,                                   ///< Metric type: the first event of a start/end event pair
-    ZET_METRIC_TYPE_EVENT_EXP_END = 12,                                     ///< Metric type: the second event of a start/end event pair
-    ZET_METRIC_TYPE_EXPORT_DMA_BUF = 0x7ffffffd,                            ///< Metric which exports linux dma_buf, which could be imported/mapped to
-                                                                            ///< the host process
-    ZET_METRIC_TYPE_EVENT_EXP_MONOTONIC_WRAPS_VALUE = 0x7ffffffe,           ///< Metric type: value of the event is a monotonically increasing value
+    ZET_METRIC_TYPE_EVENT_EXP_TIMESTAMP = 0x7ffffff9,                       ///< Metric type: event with only timestamp and value has no meaning
+    ZET_METRIC_TYPE_EVENT_EXP_START = 0x7ffffffa,                           ///< Metric type: the first event of a start/end event pair
+    ZET_METRIC_TYPE_EVENT_EXP_END = 0x7ffffffb,                             ///< Metric type: the second event of a start/end event pair
+    ZET_METRIC_TYPE_EVENT_EXP_MONOTONIC_WRAPS_VALUE = 0x7ffffffc,           ///< Metric type: value of the event is a monotonically increasing value
                                                                             ///< that can wrap around
+    ZET_METRIC_TYPE_EXP_EXPORT_DMA_BUF = 0x7ffffffd,                        ///< Metric which exports linux dma_buf, which could be imported/mapped to
+                                                                            ///< the host process
+    ZET_METRIC_TYPE_IP_EXP = 0x7ffffffe,                                    ///< Metric type: instruction pointer. Deprecated, use
+                                                                            ///< ::ZET_METRIC_TYPE_IP.
+    ZET_METRIC_TYPE_IP = 0x7ffffffe,                                        ///< Metric type: instruction pointer
     ZET_METRIC_TYPE_FORCE_UINT32 = 0x7fffffff
 
 } zet_metric_type_t;
diff --git a/include/zet_ddi.h b/include/zet_ddi.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: MIT
  *
  * @file zet_ddi.h
- * @version v1.11-r1.11.4
+ * @version v1.11-r1.11.5
  *
  */
 #ifndef _ZET_DDI_H

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* SPDX-License-Identifier: MIT`
`6`	`6`	`*`
`7`	`7`	`* @file ze_api.h`
`8`		`- * @version v1.11-r1.11.4`
	`8`	`+ * @version v1.11-r1.11.5`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`	`#ifndef _ZE_API_H`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* SPDX-License-Identifier: MIT`
`6`	`6`	`*`
`7`	`7`	`* @file ze_ddi.h`
`8`		`- * @version v1.11-r1.11.4`
	`8`	`+ * @version v1.11-r1.11.5`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`	`#ifndef _ZE_DDI_H`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* SPDX-License-Identifier: MIT`
`6`	`6`	`*`
`7`	`7`	`* @file zes_api.h`
`8`		`- * @version v1.11-r1.11.4`
	`8`	`+ * @version v1.11-r1.11.5`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`	`#ifndef _ZES_API_H`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* SPDX-License-Identifier: MIT`
`6`	`6`	`*`
`7`	`7`	`* @file zes_ddi.h`
`8`		`- * @version v1.11-r1.11.4`
	`8`	`+ * @version v1.11-r1.11.5`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`	`#ifndef _ZES_DDI_H`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* SPDX-License-Identifier: MIT`
`6`	`6`	`*`
`7`	`7`	`* @file zet_ddi.h`
`8`		`- * @version v1.11-r1.11.4`
	`8`	`+ * @version v1.11-r1.11.5`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`	`#ifndef _ZET_DDI_H`