From f74f666fb06ce7aa43ff91c3886edb6c0407eec1 Mon Sep 17 00:00:00 2001
From: Christophe Favergeon <Christophe.Favergeon@arm.com>
Date: Wed, 28 Sep 2022 07:03:36 +0200
Subject: [PATCH] Added more customization hooks to compute graph.

---
 ComputeGraph/cg.scvd                                  | 2 +-
 ComputeGraph/cg/static/src/GenericNodes.h             | 9 +++++++++
 cmsisdsp/__init__.py                                  | 6 +++---
 cmsisdsp/cg/static/scheduler/templates/code.cpp       | 1 +
 cmsisdsp/cg/static/scheduler/templates/codeArray.cpp  | 3 +++
 cmsisdsp/cg/static/scheduler/templates/codeSwitch.cpp | 1 +
 cmsisdsp/cg/static/scheduler/templates/commonc.cpp    | 1 +
 cmsisdsp/version.py                                   | 2 +-
 8 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ComputeGraph/cg.scvd b/ComputeGraph/cg.scvd
index 8b2edb9b..0e34a207 100644
--- a/ComputeGraph/cg.scvd
+++ b/ComputeGraph/cg.scvd
@@ -40,7 +40,7 @@
 
       <event id="0x0100 + 0x01" level="API" property="NodeExecution" info="Execution of a node" value="ID=%d[val1]" />
 
-      <event id="0x0100 + 0x02" level="NodeError" property="Error" info="Error during execution of a node" value="err=%d[val1]" />
+      <event id="0x0100 + 0x02" level="Error" property="Error" info="Error during execution of a node" value="err=%d[val1]" />
     
       
     </events>
diff --git a/ComputeGraph/cg/static/src/GenericNodes.h b/ComputeGraph/cg/static/src/GenericNodes.h
index 1274e23d..30c6cd5d 100644
--- a/ComputeGraph/cg/static/src/GenericNodes.h
+++ b/ComputeGraph/cg/static/src/GenericNodes.h
@@ -398,4 +398,13 @@ public:
 #define CG_AFTER_ITERATION
 #endif 
 
+#if !defined(CG_BEFORE_SCHEDULE)
+#define CG_BEFORE_SCHEDULE
+#endif
+
+#if !defined(CG_BEFORE_NODE_INIT)
+#define CG_BEFORE_NODE_INIT
+#endif
+       
+
 #endif
diff --git a/cmsisdsp/__init__.py b/cmsisdsp/__init__.py
index 508fa79a..d12403ea 100755
--- a/cmsisdsp/__init__.py
+++ b/cmsisdsp/__init__.py
@@ -19,15 +19,15 @@ from cmsisdsp_svm import *
 __version__ = cmsisdsp.version.__version__
 
 # CMSIS-DSP Version used to build the wrapper
-cmsis_dsp_version="1.12.1"
+cmsis_dsp_version="1.14.1"
 
 
 # CMSIS-DSP Commit hash used to build the wrapper
-commit_hash="142dcec5c333781c2299fe43824545cc57a5bcb0"
+commit_hash="b8177102d9a4aaf83fd3f067364ecfa3100966c2"
 
 # True if development version of CMSIS-DSP used
 # (So several CMSIS-DSP versions may have same version number hence the commit hash)
-developmentVersion=True
+developmentVersion=False
 
 __all__ = ["datatype", "fixedpoint", "mfcc"]
 
diff --git a/cmsisdsp/cg/static/scheduler/templates/code.cpp b/cmsisdsp/cg/static/scheduler/templates/code.cpp
index 9c57eedf..491b027b 100644
--- a/cmsisdsp/cg/static/scheduler/templates/code.cpp
+++ b/cmsisdsp/cg/static/scheduler/templates/code.cpp
@@ -4,6 +4,7 @@
 {% endblock %}
 
 {% block scheduleLoop %}
+    CG_BEFORE_SCHEDULE;
 {% if config.debug %}
     while((cgStaticError==0) && (debugCounter > 0))
 {% else %}
diff --git a/cmsisdsp/cg/static/scheduler/templates/codeArray.cpp b/cmsisdsp/cg/static/scheduler/templates/codeArray.cpp
index 7d7007aa..fc17d2b9 100644
--- a/cmsisdsp/cg/static/scheduler/templates/codeArray.cpp
+++ b/cmsisdsp/cg/static/scheduler/templates/codeArray.cpp
@@ -93,6 +93,7 @@ uint32_t {{config.schedName}}(int *error{{optionalargs()}})
 {% endif %}
 {% endfor %}
 
+    CG_BEFORE_NODE_INIT;
     /* 
     Create node objects 
     */
@@ -108,6 +109,8 @@ uint32_t {{config.schedName}}(int *error{{optionalargs()}})
 {% endif %}
 {% endfor %}
 
+    CG_BEFORE_SCHEDULE;
+
     /* Run several schedule iterations */
 {% if config.debug %}
     while((cgStaticError==0) && (debugCounter > 0))
diff --git a/cmsisdsp/cg/static/scheduler/templates/codeSwitch.cpp b/cmsisdsp/cg/static/scheduler/templates/codeSwitch.cpp
index 2ef651ad..8e1b4cd9 100644
--- a/cmsisdsp/cg/static/scheduler/templates/codeSwitch.cpp
+++ b/cmsisdsp/cg/static/scheduler/templates/codeSwitch.cpp
@@ -13,6 +13,7 @@ static unsigned int schedule[{{schedLen}}]=
 {% endblock %}
 
 {% block scheduleLoop %}
+    CG_BEFORE_SCHEDULE;
 {% if config.debug %}
     while((cgStaticError==0) && (debugCounter > 0))
 {% else %}
diff --git a/cmsisdsp/cg/static/scheduler/templates/commonc.cpp b/cmsisdsp/cg/static/scheduler/templates/commonc.cpp
index c13999dc..6b629e0a 100644
--- a/cmsisdsp/cg/static/scheduler/templates/commonc.cpp
+++ b/cmsisdsp/cg/static/scheduler/templates/commonc.cpp
@@ -60,6 +60,7 @@ uint32_t {{config.schedName}}(int *error{{optionalargs()}})
 {% endif %}
 {% endfor %}
 
+    CG_BEFORE_NODE_INIT;
     /* 
     Create node objects
     */
diff --git a/cmsisdsp/version.py b/cmsisdsp/version.py
index d018d844..f2709910 100755
--- a/cmsisdsp/version.py
+++ b/cmsisdsp/version.py
@@ -1,2 +1,2 @@
 # Python wrapper version
-__version__ = "1.8.0"
+__version__ = "1.8.1"