From b53fd14375b5a22baa5a8c757ad8009d3b2c73c0 Mon Sep 17 00:00:00 2001
From: Feiyue Chen <Feiyue.Chen@verisilicon.com>
Date: Wed, 2 Nov 2022 14:03:44 +0800
Subject: [PATCH] Update x86_64_linux/include for 22Q3

update prebuilt-sdk/x86_64_linux/include
update VERSION file

Type:  Code Improvement
Signed-off-by: Feiyue Chen <Feiyue.Chen@verisilicon.com>
---
 prebuilt-sdk/x86_64_linux/VERSION                         | 2 +-
 prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn.h          | 2 ++
 prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn_internal.h | 8 ++++++++
 prebuilt-sdk/x86_64_linux/include/VX/vx_spinst.h          | 7 +++++++
 prebuilt-sdk/x86_64_linux/include/VX/vx_types.h           | 4 +++-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/prebuilt-sdk/x86_64_linux/VERSION b/prebuilt-sdk/x86_64_linux/VERSION
index e5a66ba..d8b37f0 100644
--- a/prebuilt-sdk/x86_64_linux/VERSION
+++ b/prebuilt-sdk/x86_64_linux/VERSION
@@ -1 +1 @@
-6.4.11
+6.4.12_CL562241A_D561555_A558512_R558399_T558462_Oeb44e5c
diff --git a/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn.h b/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn.h
index 623c541..c329f8c 100644
--- a/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn.h
+++ b/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn.h
@@ -63,6 +63,8 @@ enum vx_graph_attribute_internal_type_e
     VX_GRAPH_DATA_COMPRESSION_RATIO               = VX_ATTRIBUTE_BASE(VX_ID_VIVANTE, VX_TYPE_GRAPH) + 0x7,
     VX_GRAPH_ISP_EMULATION_PARAMETER              = VX_ATTRIBUTE_BASE(VX_ID_VIVANTE, VX_TYPE_GRAPH) + 0x8,
     VX_GRAPH_PROCESS_FPS                          = VX_ATTRIBUTE_BASE(VX_ID_VIVANTE, VX_TYPE_GRAPH) + 0x9,
+    /*This parameter.come from customer, not used by unify driver but lite driver*/
+    VX_GRAPH_CUSTOMER_PARAMETER_FOR_NBG           = VX_ATTRIBUTE_BASE(VX_ID_VIVANTE, VX_TYPE_GRAPH) + 0xA,
 };
 
 /*! \brief Size Alignment of User Memory
diff --git a/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn_internal.h b/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn_internal.h
index 66427cb..df2c517 100644
--- a/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn_internal.h
+++ b/prebuilt-sdk/x86_64_linux/include/VX/vx_khr_nn_internal.h
@@ -228,6 +228,14 @@ typedef struct _vx_nn_convolution_relu_pooling_params_ext5_t
     vx_spinst       spinst_obj;
 } vx_nn_convolution_relu_pooling_params_ext5_t, * vx_nn_convolution_relu_pooling_params_ext5;
 
+typedef struct _vx_nn_convolution_relu_pooling_params_ext6_t
+{
+    vx_nn_convolution_relu_pooling_params_ext5_t ext5;  /*!< \brief convolution relu pooling params <tt>\ref vx_nn_convolution_relu_pooling_params_ext_t</tt> */
+    vx_uint32       depth2space_block_x; /*!< \brief hw limitation: value between 2 and 16. 2, 16 included. */
+    vx_uint32       depth2space_block_y; /*!< \brief hw limitation: equals value of depth2space_block_x. */
+
+} vx_nn_convolution_relu_pooling_params_ext6_t, * vx_nn_convolution_relu_pooling_params_ext6;;
+
 /*! \brief [Graph] Creates a Convolutional Network Convolution and Activation(Relu) and Pooling Layer Node, this fucntion match kronos NN Extension 1.2 verion.
  * \details This function implement Convolutional Network Convolution and Activation(Relu) and Pooling layer.
  *  For fixed-point data types, a fixed point calculation is performed with round and saturate according to the number of accumulator bits. The number of the accumulator bits are implementation defined,
diff --git a/prebuilt-sdk/x86_64_linux/include/VX/vx_spinst.h b/prebuilt-sdk/x86_64_linux/include/VX/vx_spinst.h
index bcfe401..867b8ce 100644
--- a/prebuilt-sdk/x86_64_linux/include/VX/vx_spinst.h
+++ b/prebuilt-sdk/x86_64_linux/include/VX/vx_spinst.h
@@ -166,6 +166,13 @@ typedef enum _vx_sp_attribute_e
     VX_SP_ATTRIBUTE_SUM_ENGINE_NUM_CH_MINUS_ONE,
     VX_SP_ATTRIBUTE_SUM_ENGINE_2D_ACCUM_STORAGE,
 
+    VX_SP_ATTRIBUTE_NUM_OF_ELEMENTS_PER_LOOP_PER_INPUT,
+
+    VX_SP_ATTRIBUTE_NUM_OF_V11_RD_IN_FLUSH_CYCLE,
+    VX_SP_ATTRIBUTE_NUM_OF_V12_RD_IN_FLUSH_CYCLE,
+    VX_SP_ATTRIBUTE_NUM_OF_V11_WR_IN_FLUSH_CYCLE,
+    VX_SP_ATTRIBUTE_NUM_OF_V12_WR_IN_FLUSH_CYCLE,
+
     VX_SP_ATTRIBUTE_GENERAL_COUNT,
 
     VX_SP_ATTRIBUTE_CONST0,     /* NN post multiplier    */
diff --git a/prebuilt-sdk/x86_64_linux/include/VX/vx_types.h b/prebuilt-sdk/x86_64_linux/include/VX/vx_types.h
index e10a32e..6ce6f8a 100644
--- a/prebuilt-sdk/x86_64_linux/include/VX/vx_types.h
+++ b/prebuilt-sdk/x86_64_linux/include/VX/vx_types.h
@@ -1986,9 +1986,11 @@ enum vx_map_flag_e {
 
 enum vx_const_tensor_cache_mode
 {
-    VX_PRELOAD_NULL = 0,
+    VX_PRELOAD_NULL                 = 0,
     VX_PRELOAD_CONST_TENSOR_VIPSRAM = 1,
     VX_PRELOAD_CONST_TENSOR_AXISRAM = 2,
+    VX_KERNEL_CACHE_PARTIAL_MODE    = 3,
+    VX_KERNEL_CACHE_STREAM_MODE     = 4,
     VX_PRELOAD_TYPE_COUNT
 };
 #endif