Commit 630f8fcb authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'update-main-pc-with-main' into 'main-pc' 

[skip-name-check][non-BE][renderer-non-BE][allow-regression][split-non-BE] Update main-pc with main

See merge request !1414
parents be48908c 789d0619

.gitlab-ci.yml

+31 −19
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ variables: 
  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"

  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'
@@ -221,7 +221,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
@@ -237,7 +237,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
@@ -252,7 +252,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
@@ -547,8 +547,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
@@ -660,7 +660,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
@@ -668,7 +668,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
@@ -787,13 +787,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
@@ -808,10 +811,10 @@ stages: 
    - 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 --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
@@ -907,7 +910,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
@@ -949,10 +952,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
@@ -1903,7 +1909,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
@@ -1963,7 +1969,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
@@ -2027,7 +2033,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
@@ -2252,13 +2258,19 @@ ivas-pytest-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

  allow_failure:

    exit_codes:

      - 123

  artifacts:

    name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"

    when: always

    expire_in: 2 week

    paths:

      - $CI_JOB_NAME-public

      - COMPLEXITY/logs



complexity-stereo-in-stereo-out:

  extends:

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -837,10 +837,8 @@ int main( 
        lfeRoutingConfigs[i] = NULL;

    }



#ifdef FIX_DISCLAIMER

    IVAS_REND_PrintDisclaimer();



#endif

    CmdlnArgs args = parseCmdlnArgs( argc, argv );



    if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) ||
@@ -1009,7 +1007,6 @@ int main( 
        exit( -1 );

    }



#ifdef FIX_DISCLAIMER

    fprintf( stdout, "Input audio file:       %s\n", args.inputFilePath );

    fprintf( stdout, "Output audio file:      %s\n\n", args.outputFilePath );
@@ -1052,7 +1049,6 @@ int main( 
        exit( -1 );

    }



#endif

    /* === Configure === */

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

    {

lib_com/basop32.c

+0 −4
Original line number Diff line number Diff line
@@ -2563,10 +2563,8 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow ) 
    {

        var_out = shr_o( var1, var2, Overflow );



#ifdef FIX_1049_SHR_RO_COMPLEXITY

#ifdef WMOPS

        multiCounter[currCounter].shr--;

#endif

#endif

        if ( var2 > 0 )

        {
@@ -2577,13 +2575,11 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow ) 
        }

    }



#ifdef FIX_1049_SHR_RO_COMPLEXITY

#ifdef WMOPS

    multiCounter[currCounter].shr_r++;

#endif



    BASOP_CHECK();

#endif



    return ( var_out );

}

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