Merge branch 'main' into ci/test-runner-speed (b3b23b7d) · Commits · SA4 / Audio / IVAS BASOP

.gitattributes

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		# Default behavior. Converts all text files to use LF in repository.
		* text=auto

		# List all known generic text files
		*.c text
		*.csv text
		*.h text
		*.json text
		*.m text
		*.md text
		*.prm text
		*.py text
		*.txt text

		# Set Windows specific text files to always use CRLF in working tree.
		*.bat text eol=crlf
		*.cmd text eol=crlf
		*.sln text eol=crlf
		*.vcxproj text eol=crlf
		*.vcxproj.filters text eol=crlf

		# Set Unix specific text files to always use LF (also covers Windows subsystem for Linux) in working tree
		*.sh text eol=lf

.gitlab-ci.yml

+49 −23

Original line number	Diff line number	Diff line
		@@ -45,13 +45,15 @@ variables:
		RUNNER_TAG: ""
		DELTA_ODG: ""
		COMPARE_DMX: ""
		SPLIT_COMPARISON: ""
		SKIP_REGRESSION_CHECK: ""
		FAILED_TESTCASES_LIST: "failed-testcases.txt"
		ERRORS_TESTCASES_LIST: "errors-testcases.txt"
		PYTEST_CACHE_ARTIFACT: "pytest_cache.zip"
		FLOAT_REF_COMMIT_FILE: "float-ref-git-sha"
		CUT_COMMIT_FILE: "CuT-git-sha"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha"
		MEASURES_FOR_REPORT: "MLD MAX_ABS_DIFF MIN_SSNR MIN_ODG"
		FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
		CUT_COMMIT_FILE: "CuT-git-sha.txt"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		@@ -172,7 +174,7 @@ stages:
		- git pull origin $FLOAT_REF_BRANCH
		- *activate-debug-mode-info-if-set
		- make clean
		- make -j
		- make -j >> /dev/null
		- mv ./IVAS_cod ./$REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_dec ./$REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_rend ./IVAS_rend_ref
		@@ -188,7 +190,7 @@ stages:
		- git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
		- *activate-debug-mode-info-if-set
		- make clean
		- make -j
		- make -j >> /dev/null
		- mv ./IVAS_cod ./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_dec ./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_rend ./IVAS_rend_merge_target
		@@ -203,7 +205,7 @@ stages:
		### build dut binaries
		- *activate-debug-mode-info-if-set
		- make clean
		- make -j
		- make -j >> /dev/null

		.build-and-create-float-ref-outputs: &build-and-create-float-ref-outputs
		- *build-float-ref-and-dut-binaries
		@@ -370,10 +372,13 @@ stages:
		variables:
		# keep "mld" in artifact name for backwards compatibility reasons
		CSV_ARTIFACT_NAME: "mld--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
		CSV_ARTIFACT_SPLIT: "mld--split--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
		MERGED_CSV_ARTIFACT_NAME: "$CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv"
		PAGES_HTML_ARTIFACT_NAME: "$CI_JOB_NAME-index.html"
		SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"
		SUMMARY_HTML_ARTIFACT_SPLIT: "summary_split_$CI_JOB_NAME.html"
		IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"
		IMAGES_ARTIFACT_SPLIT: "images_split_$CI_JOB_NAME"
		script:
		- set -euxo pipefail
		- *print-common-info
		@@ -394,14 +399,16 @@ stages:
		- if [ "$COMPARE_DMX" = "true" ] \|\| [ "$ENCODER_TEST" = "true" ]; then
		- BUILD_WITH_DEBUG_MODE_INFO="true"
		- fi
		- *build-and-create-float-ref-outputs

		- 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
		- if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; summary_args="${summary_args} DELTA_ODG"; REPORT_ARG="--delta_odg"; fi
		- if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; MEASURES_FOR_REPORT="$MEASURES_FOR_REPORT DELTA_ODG"; fi
		- if [ "$SPLIT_COMPARISON" = "true" ]; then comp_args="${comp_args} --split-comparison"; fi

		- *build-and-create-float-ref-outputs

		# DMX comparison only in manual job with no other metrics
		- if [ "$COMPARE_DMX" = "true" ]; then
		@@ -415,10 +422,20 @@ stages:
		- python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml $comp_args -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH \|\| exit_code=$?
		- zero_errors=$(cat report-junit.xml \| grep -c 'errors="0"') \|\| true

		- python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME $REPORT_ARG
		- mkdir $IMAGES_ARTIFACT_NAME
		- for MEASURE in $summary_args;do python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $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 --measures $summary_args
		### create histograms
		- python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME --split-csv-file $CSV_ARTIFACT_SPLIT

		# first for "whole" files comparison
		- python3 scripts/create_histograms.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT --write-out-histograms
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT

		- if [ "$SPLIT_COMPARISON" = "true" ]; then
		- python3 scripts/create_histograms.py $CSV_ARTIFACT_SPLIT $IMAGES_ARTIFACT_SPLIT --measures $MEASURES_FOR_REPORT --write-out-histograms
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_SPLIT $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_SPLIT --measures $MEASURES_FOR_REPORT
		- else
		# touch files to suppress warning for missing artifacts
		- touch $CSV_ARTIFACT_SPLIT $IMAGES_ARTIFACT_SPLIT
		- fi

		- if [ $USE_LTV -eq 1 ] && [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
		- id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH $CI_JOB_NAME $CI_PROJECT_ID)
		@@ -458,9 +475,12 @@ stages:
		- report.html
		- $PAGES_HTML_ARTIFACT_NAME
		- $CSV_ARTIFACT_NAME
		- $CSV_ARTIFACT_SPLIT
		- $MERGED_CSV_ARTIFACT_NAME
		- $SUMMARY_HTML_ARTIFACT_NAME
		- $SUMMARY_HTML_ARTIFACT_SPLIT
		- $IMAGES_ARTIFACT_NAME
		- $IMAGES_ARTIFACT_SPLIT
		expose_as: "pytest compare results"
		reports:
		junit:
		@@ -508,7 +528,7 @@ stages:
		- *build-float-ref-binaries
		- *build-merge-target-binaries
		- make clean
		- make -j
		- make -j >> /dev/null
		- *check-up-to-date-in-comparison-jobs

		- exit_code_target=0
		@@ -651,15 +671,15 @@ stages:
		# Store branch outputs for comparison
		- mv tests/dut tests/dut_branch

		# create the summary based on the branch
		- 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
		# create the summary based on the branch only
		- python3 scripts/create_histograms.py $CSV_BRANCH $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT

		### run main now
		- git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
		- git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
		- make clean
		- make -j
		- make -j >> /dev/null
		# 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 $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
		@@ -757,7 +777,7 @@ stages:
		- make_args="$make_args IGNORELIST=1"
		- fi
		- make clean
		- make -j $make_args
		- make -j $make_args >> /dev/null
		- testcase_timeout_arg="--testcase_timeout $TESTCASE_TIMEOUT_LTV_SANITIZERS"
		# disable per-testcase timeout for msan to evaluate what is going on that it takes so long
		- if [[ $CLANG_NUM = 1 ]]; then
		@@ -813,8 +833,8 @@ stages:

		# create summary
		- mkdir $IMAGES_ARTIFACT_NAME
		- for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py report-diff.csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE --diff; done
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME
		- python3 scripts/create_histograms.py report-diff.csv $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT --write-out-histograms --no-bins
		- python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT

		- exit 0

		@@ -1421,6 +1441,7 @@ ivas-pytest-compare_ref-long-enc:
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=1.0
		- SPLIT_COMPARISON="true"
		<<: *ivas-pytest-anchor

		ivas-pytest-compare_ref-long-dec:
		@@ -1432,6 +1453,7 @@ ivas-pytest-compare_ref-long-dec:
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		- LEVEL_SCALING=1.0
		- SPLIT_COMPARISON="true"
		<<: *ivas-pytest-anchor

		ivas-pytest-compare_ref-long-enc-lev-10:
		@@ -1443,6 +1465,7 @@ ivas-pytest-compare_ref-long-enc-lev-10:
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=0.3162
		- SPLIT_COMPARISON="true"
		<<: *ivas-pytest-anchor

		ivas-pytest-compare_ref-long-dec-lev-10:
		@@ -1454,6 +1477,7 @@ ivas-pytest-compare_ref-long-dec-lev-10:
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		- LEVEL_SCALING=0.3162
		- SPLIT_COMPARISON="true"
		<<: *ivas-pytest-anchor

		ivas-pytest-compare_ref-long-enc-lev+10:
		@@ -1465,6 +1489,7 @@ ivas-pytest-compare_ref-long-enc-lev+10:
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		- LEVEL_SCALING=3.162
		- SPLIT_COMPARISON="true"
		<<: *ivas-pytest-anchor

		ivas-pytest-compare_ref-long-dec-lev+10:
		@@ -1476,6 +1501,7 @@ ivas-pytest-compare_ref-long-dec-lev+10:
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		- LEVEL_SCALING=3.162
		- SPLIT_COMPARISON="true"
		<<: *ivas-pytest-anchor

		ivas-smoke-test-saturation:
		@@ -1535,7 +1561,7 @@ coverage-test-on-main-scheduled:
		- *copy-ltv-files-to-testv-dir
		- *build-float-ref-binaries
		# Build DuT binaries with GCOV
		- make clean
		- make clean >> /dev/null
		- make GCOV=1 -j
		- cp IVAS_rend IVAS_rend_ref # Copy to ensure instrumented renderer is run in the first pytest call

		@@ -1593,7 +1619,7 @@ be-2-evs-26444:
		- *print-common-info
		- *update-scripts-repo
		- sed -i".bak" "s/$#define EVS_FLOAT$/\/\/\1/" lib_com/options.h
		- make -j
		- make -j >> /dev/null

		# copy over to never change the testvector dir
		- cp -r $EVS_BE_TEST_DIR_BASOP ./evs_be_test
		@@ -1656,7 +1682,7 @@ voip-be-on-merge-request:
		script:
		- *print-common-info
		- make clean
		- make -j
		- make -j >> /dev/null
		- python3 -m pytest tests/test_be_for_jbm_neutral_dly_profile.py

lib_com/basop_util.c

+408 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/basop_util.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,13 @@ Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x, /!< i : Numerator/
		Word16 s ); /!< o : Additional scalefactor difference*/


		#ifdef DIV32_OPT_NEWTON
		Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, /!< i : Numerator/
		Word32 y, /!< i : Denominator/
		Word16 s ); /!< o : Additional scalefactor difference*/
		#endif


		/************************************************************************/
		/*!
		\brief Binary logarithm with 7 iterations

lib_com/bits_alloc_fx.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -439,6 +439,7 @@ static Word16 fcb_table(
		* Routine to allocate fixed innovation codebook bit-budget
		--------------------------------------------------------------------/

		#ifndef REMOVE_EVS_DUPLICATES
		static ivas_error acelp_FCB_allocator(
		Word16 nBits, / i/o: available bit-budget */
		Word16 fixed_cdk_index[], /* o : codebook index Q0 */
		@@ -599,7 +600,7 @@ static ivas_error acelp_FCB_allocator(

		return error;
		}

		#endif
		static ivas_error acelp_FCB_allocator_ivas(
		Word16 nBits, / i/o: available bit-budget */
		Word16 fixed_cdk_index[], /* o : codebook index Q0 */
		@@ -761,6 +762,7 @@ static ivas_error acelp_FCB_allocator_ivas(
		* - per channel bitrate minimum is 13250 kbps for ACELP@16kHz
		--------------------------------------------------------------------/

		#ifndef REMOVE_EVS_DUPLICATES
		ivas_error config_acelp1(
		const Word16 enc_dec, /* i : encoder/decoder flag */
		const Word32 total_brate, /* i : total bitrate */
		@@ -1885,7 +1887,7 @@ ivas_error config_acelp1(
		* - should be in range of <6700; 24350> for ACELP@12.8kHz
		* - per channel bitrate minimum is 13250 kbps for ACELP@16kHz
		--------------------------------------------------------------------/

		#endif
		ivas_error config_acelp1_IVAS(
		const Word16 enc_dec, /* i : encoder/decoder flag */
		const Word32 total_brate, /* i : total bitrate */