merge from main (7e88d30a) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+21 −9

Original line number	Diff line number	Diff line
		@@ -396,8 +396,8 @@ stages:
		- fi
		- *build-and-create-float-ref-outputs

		- comp_args="--mld --ssnr --odg"

		- INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
		- comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"
		- summary_args="MLD DIFF SSNR ODG"
		- REPORT_ARG=""
		- if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi
		@@ -517,7 +517,7 @@ stages:

		- exit_code=0
		- rm -rf .pytest_cache \|\| true
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --mld --ssnr --odg --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt \|\| exit_code=$?
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt \|\| exit_code=$?

		- if [ $exit_code -ne 0 ]; then
		- exit_code=$EXIT_CODE_NON_BE
		@@ -601,6 +601,10 @@ stages:
		script:
		- *print-common-info

		# create empty files for all artifacts to suppress warnings in case of no regressions found or all is BE
		- touch $XML_REPORT_BRANCH $XML_REPORT_MAIN $HTML_REPORT_BRANCH $HTML_REPORT_MAIN $CSV_BRANCH $CSV_MAIN $SUMMARY_HTML_ARTIFACT_NAME $FLOAT_REF_COMMIT_FILE $CUT_COMMIT_FILE $MERGE_TARGET_COMMIT_FILE regressions_crashes.csv regressions_MLD.csv regressions_MAXIMUM_ABS_DIFF.csv regressions_MIN_SSNR.csv regressions_MIN_ODG.csv improvements_crashes.csv improvements_MLD.csv improvements_MAXIMUM_ABS_DIFF.csv improvements_MIN_SSNR.csv improvements_MIN_ODG.csv
		- mkdir $IMAGES_ARTIFACT_NAME

		- set -euxo pipefail

		- if [ -s $FAILED_TESTCASES_LIST ]; then
		@@ -632,13 +636,16 @@ stages:
		- echo $CI_MERGE_REQUEST_TITLE > tmp.txt
		- allow_regressions_flag=$(grep -c --ignore-case "\[allow[ -]*regression\]" tmp.txt) \|\| true

		- INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
		- comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

		### run branch first
		# this per default builds the branch and the reference and creates the reference outputs
		- *build-and-create-float-ref-outputs
		- *check-up-to-date-in-comparison-jobs
		# need to restore cache again
		- *overwrite-pytest-cache-with-artifact
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- zero_errors_branch=$(cat $XML_REPORT_BRANCH \| grep -c 'errors="0"') \|\| true
		- python3 scripts/parse_xml_report.py $XML_REPORT_BRANCH $CSV_BRANCH

		@@ -646,7 +653,6 @@ stages:
		- mv tests/dut tests/dut_branch

		# create the summary based on the branch
		- mkdir $IMAGES_ARTIFACT_NAME
		- for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py $CSV_BRANCH $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME

		@@ -657,7 +663,7 @@ stages:
		- make -j
		# need to restore cache again
		- *overwrite-pytest-cache-with-artifact
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		- python3 scripts/parse_xml_report.py $XML_REPORT_MAIN $CSV_MAIN

		### compare the two csv files for regressions
		@@ -748,7 +754,7 @@ stages:
		- set -euxo pipefail
		- make_args="CLANG=$CLANG_NUM"
		- if [[ $CLANG_NUM == 3 ]]; then
		- export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"
		- export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1,print_stacktrace=1"
		- python3 scripts/basop_create_ignorelist_for_ubsan.py
		- make_args="$make_args IGNORELIST=1"
		- fi
		@@ -795,10 +801,13 @@ stages:
		- fi
		- *build-float-ref-and-dut-binaries

		- INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")
		- comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

		### run pytest
		- exit_code=0
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-ref.html --self-contained-html --junit-xml=report-junit-ref.xml --mld --ssnr --odg -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $REF_ENCODER_PATH --dut_decoder_path $REF_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml --mld --ssnr --odg -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-ref.html --self-contained-html --junit-xml=report-junit-ref.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $REF_ENCODER_PATH --dut_decoder_path $REF_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH --compare_to_input \|\| exit_code=$?
		- zero_errors_ref=$(cat report-junit-ref.xml \| grep -c 'errors="0"') \|\| true
		- zero_errors_dut=$(cat report-junit-dut.xml \| grep -c 'errors="0"') \|\| true
		- python3 scripts/parse_xml_report.py report-junit-ref.xml report-ref.csv
		@@ -1738,6 +1747,8 @@ voip-be-on-merge-request:
		- *update-ltv-repo
		- *build-float-ref-and-dut-binaries
		- *complexity-measurements-setup
		# delete previous jobs logfiles if present (-f flag ensures return calue of 0 even in first run where this folder is not present)
		- rm -rf COMPLEXITY/logs
		- which coan
		artifacts:
		name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
		@@ -1745,6 +1756,7 @@ voip-be-on-merge-request:
		expire_in: 2 week
		paths:
		- $CI_JOB_NAME-public
		- COMPLEXITY/logs

		complexity-stereo-in-stereo-out:
		extends:

Workspace_msvc/lib_com.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -277,7 +277,6 @@
		<ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />
		<ClCompile Include="..\lib_com\swb_bwe_com_hr_fx.c" />
		<ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c" />
		<ClCompile Include="..\lib_com\swb_tbe_com.c" />
		<ClCompile Include="..\lib_com\swb_tbe_com_fx.c" />
		<ClCompile Include="..\lib_com\syn_12k8_fx.c" />
		<ClCompile Include="..\lib_com\syn_filt_fx.c" />
		@@ -316,7 +315,6 @@
		<ClInclude Include="..\lib_com\ivas_cnst.h" />
		<ClInclude Include="..\lib_com\ivas_error.h" />
		<ClInclude Include="..\lib_com\ivas_error_utils.h" />
		<ClInclude Include="..\lib_com\ivas_prot.h" />
		<ClInclude Include="..\lib_com\ivas_prot_fx.h" />
		<ClInclude Include="..\lib_com\ivas_rom_com.h" />
		<ClInclude Include="..\lib_com\ivas_stat_com.h" />

Workspace_msvc/lib_com.vcxproj.filters

+1 −7

Original line number	Diff line number	Diff line
		@@ -430,9 +430,6 @@
		<ClCompile Include="..\lib_com\rom_com.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\swb_tbe_com.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\tcx_mdct_window.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		@@ -573,9 +570,6 @@
		<ClInclude Include="..\lib_com\ivas_error_utils.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\ivas_prot.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\ivas_rom_com.h">
		<Filter>common_h</Filter>
		</ClInclude>
		@@ -619,7 +613,7 @@
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\prot_fx.h">
		<Filter>common_all_c</Filter>
		<Filter>common_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>

Workspace_msvc/lib_rend.vcxproj

+1 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@
		<ClCompile Include="..\lib_rend\lib_rend.c" />
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_rend\ivas_prot_rend.h" />
		<ClInclude Include="..\lib_rend\ivas_prot_rend_fx.h" />
		<ClInclude Include="..\lib_rend\ivas_rom_binauralRenderer.h" />
		<ClInclude Include="..\lib_rend\ivas_rom_binaural_crend_head.h" />
		<ClInclude Include="..\lib_rend\ivas_rom_rend.h" />

Workspace_msvc/lib_rend.vcxproj.filters

+3 −3

Original line number	Diff line number	Diff line
		@@ -125,9 +125,6 @@
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_rend\lib_rend.h" />
		<ClInclude Include="..\lib_rend\ivas_prot_rend.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_rend\ivas_rom_rend.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		@@ -143,6 +140,9 @@
		<ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_rend\ivas_prot_rend_fx.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>
		<Filter Include="rend_h">