Merge branch 'main' into ci/dmx-comparison-manual-job (a56211fb) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+23 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ variables:
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 6000
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 7200
		CI_REGRESSION_THRESH_MLD: "0.1"
		CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
		CI_REGRESSION_THRESH_SSNR: "-1"
		@@ -33,6 +33,7 @@ variables:
		BUILD_WITH_DEBUG_MODE_INFO: ""
		ENCODER_TEST: ""
		COMPARE_DMX: ""
		SKIP_REGRESSION_CHECK: ""
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		@@ -538,7 +539,7 @@ stages:
		.ivas-pytest-sanitizers-anchor: &ivas-pytest-sanitizers-anchor
		stage: test
		needs: ["build-codec-linux-make"]
		timeout: "300 minutes"
		timeout: "420 minutes"
		rules:
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never
		@@ -554,7 +555,7 @@ stages:
		- *build-reference-and-dut-binaries
		- make clean
		- make -j CLANG=$CLANG_NUM
		- if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi
		- if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"; fi
		- testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS
		- python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH
		artifacts:
		@@ -1325,8 +1326,25 @@ voip-be-on-merge-request:
		- unzip artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html
		- ls
		- public_dir="$CI_JOB_NAME-public"

		# if is needed to catch case when no artifact is there (first run), similarly as above
		- if [[ -d $public_dir ]]; then mv $public_dir/* wmops/; fi
		- if [[ -d $public_dir ]]; then
		- mv $public_dir/* wmops/
		# check here if we have the split-by-levels files present - if not, fake them up with the existing global one
		# this is needed for the first run with split graphs on a branch where the global version did run previously
		# NOTE: checking only for level_1 file here as this should already be sufficient
		# NOTE2: also not chechking for RAM for same reason
		- wmops_all_global="wmops/log_wmops_all.txt"
		- ram_all_global="wmops/log_ram_all.txt"
		- if [ -f "${wmops_all_global}" ] && [ ! -f "wmops/log_wmops_all_level_1.txt" ]; then
		- declare -a suffixes=("level_1" "level_2" "level_3" "rate_sw")
		- for suffix in "${suffixes[@]}"; do
		- cp ${wmops_all_global} wmops/log_wmops_all_${suffix}.txt
		- cp ${ram_all_global} wmops/log_ram_all_${suffix}.txt
		- done
		- fi
		- fi

		- ls wmops
		- rm artifacts.zip
		- rm -rf $public_dir
		@@ -1343,7 +1361,7 @@ voip-be-on-merge-request:
		&complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
		- public_dir="$CI_JOB_NAME-public"
		- mkdir $public_dir
		- mv -f wmops/log__all.txt ./.js ${public_dir}/
		- mv -f wmops/log__all.txt ./*.js ${public_dir}/
		# move logfiles for links
		- mkdir $public_dir/logs
		# first move logs

Workspace_msvc/lib_enc.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -379,8 +379,6 @@
		<ClCompile Include="..\lib_enc\multi_harm.c" />
		<ClCompile Include="..\lib_enc\nelp_enc.c" />
		<ClCompile Include="..\lib_enc\nelp_enc_fx.c" />
		<ClCompile Include="..\lib_enc\noise_adjust.c" />
		<ClCompile Include="..\lib_enc\nois_est.c" />
		<ClCompile Include="..\lib_enc\pitch_ol.c" />
		<ClCompile Include="..\lib_enc\pitch_ol2.c" />
		<ClCompile Include="..\lib_enc\pit_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −4

Original line number	Diff line number	Diff line
		@@ -216,10 +216,6 @@
		<ClCompile Include="..\lib_enc\multi_harm.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\nois_est.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\noise_adjust.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\pit_enc.c">

lib_com/basop_util.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -45,9 +45,6 @@
		#include "basop_settings.h"
		#include "cnst.h"


		#define WMC_TOOL_SKIP

		extern const Word32 SqrtTable[32]; // Q31
		extern const Word16 SqrtDiffTable[32]; /* Q15 */

		@@ -2660,6 +2657,3 @@ cmplx CL_mult_32x16( cmplx input, cmplx_s coeff )
		#endif
		return result;
		}


		#undef WMC_TOOL_SKIP

lib_com/cldfb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1213,7 +1213,7 @@ void cldfbSynthesis_ivas_fx(
		/cplxMult(&iBuffer[2i], &iBuffer[2i+1],-imagBuffer[k][2i], imagBuffer[k][M1-1-2i], rot_vctr_re[i], rot_vctr_im[i]);/
		iBuffer_fx[2 * i] = Msub_32_32( Mpy_32_32( ( L_negate( imagBuffer_fx[k][2 * i] ) ), rot_vctr_re_fx[i] ), imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_im_fx[i] ); // Qx
		move32();
		iBuffer_fx[2 * i + 1] = Madd_32_32( Mpy_32_32( ( L_negate( imagBuffer_fx[k][2 * i] ) ), rot_vctr_im_fx[i] ), imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_re_fx[i] ); // Qx
		iBuffer_fx[2 * i + 1] = Msub_32_32( Mpy_32_32( imagBuffer_fx[k][( M1 - 1 ) - ( i * 2 )], rot_vctr_re_fx[i] ), imagBuffer_fx[k][2 * i], rot_vctr_im_fx[i] ); // Qx
		move32();
		}