Merge pull request #245 from xmos/release/v0.4.0

Release/v0.4.0
xmos · Mar 31, 2022 · af0afb5 · af0afb5
2 parents 893b930 + 58edc1a
commit af0afb5
Show file tree

Hide file tree

Showing 142 changed files with 258 additions and 181 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Avona Reference Design Change Log
 =================================
 
+0.4.0
+-----
+
+  * CHANGED: Increased ASR AGC amplitude target
+  * ADDED: -Os compile option for modules, examples and tests
+
 0.3.0
 -----
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(PROJECT_IS_TOP_LEVEL)
     find_package( Python3 COMPONENTS Interpreter )
 
     ## Compile flags for C/C++ for all apps (for all platforms)
-    list(APPEND   COMPILE_FLAGS        -MMD )
+    list(APPEND   COMPILE_FLAGS        -Os -MMD )
     list(APPEND   COMPILE_FLAGS        -Wno-format -Wall )
 
     message( STATUS "System name ${CMAKE_SYSTEM_NAME}" )

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
                  description: 'Force a full test. This increases the number of iterations/scope in some tests')
     booleanParam(name: 'PIPELINE_FULL_RUN',
                  defaultValue: false,
-                 description: 'Enables pipelines characterisation test which takes 2.5hrs by itself. Normally run nightly')
+                 description: 'Enables pipelines characterisation test which takes 5.0hrs by itself. Normally run nightly')
   }
   environment {
     REPO = 'sw_avona'
@@ -419,11 +419,15 @@ pipeline {
             dir("${REPO}/test/lib_adec/test_delay_estimator") {
               viewEnv() {
                 withVenv {
-                  sh 'mkdir -p ./input_wavs/'
-                  sh 'mkdir -p ./output_files/'
-                  sh "pytest -n 2 --junitxml=pytest_result.xml"
-                  junit "pytest_result.xml"
-                  runPython("python print_stats.py")
+                  withMounts([["projects", "projects/hydra_audio", "hydra_audio_test_de"]]) {
+                    withEnv(["hydra_audio_PATH=$hydra_audio_test_de_PATH"]) {
+                      sh 'mkdir -p ./input_wavs/'
+                      sh 'mkdir -p ./output_files/'
+                      sh "pytest -n 2 --junitxml=pytest_result.xml"
+                      junit "pytest_result.xml"
+                      runPython("python print_stats.py")
+                    }
+                  }
                 }
               }
             }
@@ -553,8 +557,7 @@ pipeline {
                       sh "pytest -n 4 --junitxml=pytest_result.xml -vv"
                       // sh "pytest -s --junitxml=pytest_result.xml" //Debug, run single threaded with STDIO captured
                       junit "pytest_result.xml"
-                      archiveArtifacts artifacts: "results_*.csv", fingerprint: true
-                      archiveArtifacts artifacts: "keyword_input_*/*.wav", fingerprint: true
+                      // Archive below (always section) even if fails
                     }
                   }
                 }
@@ -565,12 +568,13 @@ pipeline {
       }//stages
       post {
         always {
-          //All build files
-          // archiveArtifacts artifacts: "${REPO}/build/**/*", fingerprint: true
           //AEC aretfacts
           archiveArtifacts artifacts: "${REPO}/test/lib_adec/test_adec_profile/**/adec_prof*.log", fingerprint: true
           //NS artefacts
           archiveArtifacts artifacts: "${REPO}/test/lib_ns/test_ns_profile/ns_prof.log", fingerprint: true
+          //Pipelines tests
+          archiveArtifacts artifacts: "${REPO}/test/pipeline/results_*.csv", fingerprint: true
+          archiveArtifacts artifacts: "${REPO}/test/pipeline/keyword_input_*/*.wav", fingerprint: true
         }
         cleanup {
           cleanWs()

diff --git a/examples/bare-metal/aec_1_thread/src/aec_app.c b/examples/bare-metal/aec_1_thread/src/aec_app.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/examples/bare-metal/aec_2_threads/src/aec_app.c b/examples/bare-metal/aec_2_threads/src/aec_app.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/examples/bare-metal/doc/ic_output.png b/examples/bare-metal/doc/ic_output.png
diff --git a/examples/bare-metal/ic/doit.sh b/examples/bare-metal/ic/doit.sh
diff --git a/examples/bare-metal/ic/input.wav b/examples/bare-metal/ic/input.wav
diff --git a/examples/bare-metal/ic/src/ic_test_task.c b/examples/bare-metal/ic/src/ic_test_task.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #if !X86_BUILD
 #ifdef __XC__

diff --git a/examples/bare-metal/pipeline_multi_threaded/src/pipeline.c b/examples/bare-metal/pipeline_multi_threaded/src/pipeline.c
@@ -1,4 +1,4 @@
-// Copyright 2018-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <string.h>
 #include <stdlib.h>

diff --git a/examples/bare-metal/pipeline_single_threaded/src/pipeline.c b/examples/bare-metal/pipeline_single_threaded/src/pipeline.c
@@ -1,4 +1,4 @@
-// Copyright 2018-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <string.h>
 #include <stdlib.h>

diff --git a/examples/bare-metal/shared_src/aec/aec_memory_pool.h b/examples/bare-metal/shared_src/aec/aec_memory_pool.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AEC_MEMORY_POOL_H
 #define AEC_MEMORY_POOL_H

diff --git a/examples/bare-metal/shared_src/aec/aec_process_frame_1thread.c b/examples/bare-metal/shared_src/aec/aec_process_frame_1thread.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <string.h>

diff --git a/examples/bare-metal/shared_src/aec/aec_process_frame_2threads.c b/examples/bare-metal/shared_src/aec/aec_process_frame_2threads.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <string.h>

diff --git a/examples/bare-metal/shared_src/file_utils/wav_utils.c b/examples/bare-metal/shared_src/file_utils/wav_utils.c
@@ -1,4 +1,4 @@
-// Copyright 2018-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/examples/bare-metal/shared_src/file_utils/wav_utils.h b/examples/bare-metal/shared_src/file_utils/wav_utils.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef WAV_UTILS_H
 #define WAV_UTILS_H

diff --git a/examples/bare-metal/shared_src/profile/profile.c b/examples/bare-metal/shared_src/profile/profile.c
@@ -1,4 +1,4 @@
-// Copyright 2018-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <platform.h>
 #include <stdio.h>

diff --git a/examples/bare-metal/shared_src/profile/profile.h b/examples/bare-metal/shared_src/profile/profile.h
@@ -1,4 +1,4 @@
-// Copyright 2018-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <string.h>

diff --git a/examples/bare-metal/shared_src/python/run_xcoreai.py b/examples/bare-metal/shared_src/python/run_xcoreai.py
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 XMOS LIMITED.
+# Copyright 2022 XMOS LIMITED.
 # This Software is subject to the terms of the XMOS Public Licence: Version 1.
 import xscope_fileio
 import argparse

diff --git a/examples/bare-metal/shared_src/test_streams/pipeline_example_input.wav b/examples/bare-metal/shared_src/test_streams/pipeline_example_input.wav
diff --git a/modules/lib_adec/CMakeLists.txt b/modules/lib_adec/CMakeLists.txt
@@ -14,6 +14,11 @@ target_include_directories(avona_module_lib_adec
         api
 )
 
+target_compile_options(avona_module_lib_adec
+    PRIVATE
+        "-Os"
+)
+
 target_link_libraries(avona_module_lib_adec
     PUBLIC
         sdk::lib_xs3_math

diff --git a/modules/lib_adec/api/adec_api.h b/modules/lib_adec/api/adec_api.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include "adec_state.h"
 

diff --git a/modules/lib_adec/api/adec_defines.h b/modules/lib_adec/api/adec_defines.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef ADEC_DEFINES_H
 #define ADEC_DEFINES_H

diff --git a/modules/lib_adec/api/adec_state.h b/modules/lib_adec/api/adec_state.h
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef __ADEC_TYPES_H__
 #define __ADEC_TYPES_H__

diff --git a/modules/lib_adec/src/de_impl.c b/modules/lib_adec/src/de_impl.c
@@ -1,4 +1,4 @@
-// Copyright 2019-2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 
 #include "aec_api.h"

diff --git a/modules/lib_aec/CMakeLists.txt b/modules/lib_aec/CMakeLists.txt
@@ -17,6 +17,11 @@ target_include_directories(avona_module_lib_aec
         src ## this is needed for the IC
 )
 
+target_compile_options(avona_module_lib_aec
+    PRIVATE
+        "-Os"
+)
+
 target_link_libraries(avona_module_lib_aec
     PUBLIC
         sdk::lib_xs3_math

diff --git a/modules/lib_aec/api/aec_api.h b/modules/lib_aec/api/aec_api.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AEC_API_H
 #define AEC_API_H

diff --git a/modules/lib_aec/api/aec_defines.h b/modules/lib_aec/api/aec_defines.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AEC_DEFINES_H
 #define AEC_DEFINES_H

diff --git a/modules/lib_aec/api/aec_state.h b/modules/lib_aec/api/aec_state.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AEC_STATE_H
 #define AEC_STATE_H

diff --git a/modules/lib_aec/src/aec_impl.c b/modules/lib_aec/src/aec_impl.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <string.h>

diff --git a/modules/lib_aec/src/aec_l2_impl.c b/modules/lib_aec/src/aec_l2_impl.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <string.h>

diff --git a/modules/lib_aec/src/aec_priv.h b/modules/lib_aec/src/aec_priv.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AEC_PRIV_H
 #define AEC_PRIV_H

diff --git a/modules/lib_aec/src/aec_priv_impl.c b/modules/lib_aec/src/aec_priv_impl.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <stdio.h>
 #include <string.h>

diff --git a/modules/lib_agc/CMakeLists.txt b/modules/lib_agc/CMakeLists.txt
@@ -12,6 +12,11 @@ target_include_directories(avona_module_lib_agc
         api
 )
 
+target_compile_options(avona_module_lib_agc
+    PRIVATE
+        "-Os"
+)
+
 target_link_libraries(avona_module_lib_agc
     PUBLIC
         sdk::lib_xs3_math

diff --git a/modules/lib_agc/api/agc_api.h b/modules/lib_agc/api/agc_api.h
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AGC_API_H
 #define AGC_API_H

diff --git a/modules/lib_agc/api/agc_profiles.h b/modules/lib_agc/api/agc_profiles.h
@@ -1,4 +1,4 @@
-// Copyright 2021-2022 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AGC_PROFILES_H
 #define AGC_PROFILES_H
@@ -31,8 +31,8 @@
     .gain = float_to_float_s32(500), \
     .max_gain = float_to_float_s32(1000), \
     .min_gain = float_to_float_s32(0), \
-    .upper_threshold = float_to_float_s32(0.7079), \
-    .lower_threshold = float_to_float_s32(0.1905), \
+    .upper_threshold = float_to_float_s32(0.9999), \
+    .lower_threshold = float_to_float_s32(0.7000), \
     .gain_inc = float_to_float_s32(1.197), \
     .gain_dec = float_to_float_s32(0.87), \
     .lc_enabled = 0, \
@@ -83,4 +83,5 @@
     .lc_gain_min = float_to_float_s32(0), \
     }
 
+
 #endif
diff --git a/modules/lib_agc/src/agc_defines.h b/modules/lib_agc/src/agc_defines.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef AGC_DEFINES_H
 #define AGC_DEFINES_H

diff --git a/modules/lib_agc/src/agc_impl.c b/modules/lib_agc/src/agc_impl.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <limits.h>
 #include "agc_defines.h"

diff --git a/modules/lib_ic/CMakeLists.txt b/modules/lib_ic/CMakeLists.txt
@@ -13,6 +13,11 @@ target_include_directories(avona_module_lib_ic
         api
 )
 
+target_compile_options(avona_module_lib_ic
+    PRIVATE
+        "-Os"
+)
+
 target_link_libraries(avona_module_lib_ic
     PUBLIC
         sdk::lib_xs3_math

diff --git a/modules/lib_ic/src/ic.c b/modules/lib_ic/src/ic.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 
 #include <stdio.h>

diff --git a/modules/lib_ic/src/ic_low_level.c b/modules/lib_ic/src/ic_low_level.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 
 #include "ic_low_level.h"

diff --git a/modules/lib_ic/src/ic_low_level.h b/modules/lib_ic/src/ic_low_level.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 
 #ifndef IC_LOW_LEVEL_H

diff --git a/modules/lib_ns/CMakeLists.txt b/modules/lib_ns/CMakeLists.txt
@@ -14,6 +14,11 @@ target_include_directories(avona_module_lib_ns
         src
 )
 
+target_compile_options(avona_module_lib_ns
+    PRIVATE
+        "-Os"
+)
+
 target_link_libraries(avona_module_lib_ns
     PUBLIC
         sdk::lib_xs3_math

diff --git a/modules/lib_ns/api/ns_api.h b/modules/lib_ns/api/ns_api.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 
 #ifndef NS_API_H

diff --git a/modules/lib_ns/api/ns_state.h b/modules/lib_ns/api/ns_state.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef NS_STATE_H
 #define NS_STATE_H

diff --git a/modules/lib_ns/src/ns_impl.c b/modules/lib_ns/src/ns_impl.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <string.h>
 #include <limits.h>

diff --git a/modules/lib_ns/src/ns_low_level.c b/modules/lib_ns/src/ns_low_level.c
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #include <string.h>
 #include <bfp_math.h>

diff --git a/modules/lib_ns/src/ns_priv.h b/modules/lib_ns/src/ns_priv.h
@@ -1,4 +1,4 @@
-// Copyright 2021 XMOS LIMITED.
+// Copyright 2022 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
 #ifndef _NS_PRIV_H
 #define _NS_PRIV_H

diff --git a/modules/lib_vad/CMakeLists.txt b/modules/lib_vad/CMakeLists.txt
@@ -13,6 +13,11 @@ target_include_directories(avona_module_lib_vad
         src
 )
 
+target_compile_options(avona_module_lib_vad
+    PRIVATE
+        "-Os"
+)
+
 target_link_libraries(avona_module_lib_vad
     PUBLIC
         sdk::lib_xs3_math

diff --git a/settings.json b/settings.json
@@ -1,5 +1,5 @@
 {
     "title": "Avona Voice Reference Design",
     "project": "Avona",
-    "version": "0.3.0"
+    "version": "0.4.0"
 }
diff --git a/test/lib_adec/de_unit_tests/conftest.py b/test/lib_adec/de_unit_tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 XMOS LIMITED.
+# Copyright 2022 XMOS LIMITED.
 # This Software is subject to the terms of the XMOS Public Licence: Version 1.
 from builtins import str
 import os.path
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,11 @@ target_include_directories(avona_module_lib_adec @@
             api
     )
+    target_compile_options(avona_module_lib_adec
+        PRIVATE
+            "-Os"
+    )
     target_link_libraries(avona_module_lib_adec
         PUBLIC
             sdk::lib_xs3_math
@@ Expand Down @@