Commit 408e5be8 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/voip-be-test

parents a5199c2d f5c8b410
Loading
Loading
Loading
Loading
Loading
+75 −0
Original line number Diff line number Diff line
@@ -88,3 +88,78 @@ coan_out_*
/scripts/mem_analysis_enc_STEREO_sw.csv
/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv
*.pwv
/dcr_ism1
/bwe_clicks_ism1
/BWD_issue
/.ipynb_checkpoints
/scripts/.ipynb_checkpoints
/scripts/wmops_analysis
/scripts/wmops_analysis_new
/tcx_hq_problem_ism1
/scripts/dly_error_profiles/dly_profile_19_.dat
/build.txt
/bit.64k
/bit.32k
/bit
/binaural_loudness.ipynb
/tmp.txt
/syn.wav
/syn.ref
/syn.64k.0.csv
/syn.64k
/syn.32k
/stvST32c_-stereo_32000_32.bit
/split_renderer_config_768_3dof_cldfbpc.txt
/split_out_sba_lcld_20ms_out.wav
/split_out_sba_lcld_20ms.pkt
/split_out_mc_lc3plus_20ms_out.wav
/split_out_mc_lc3plus_20ms.pkt
/run_ivas_codec.sh
/report.html
/report-junit.xm
/out.wav
/ltv48_1ISM.cut14.wav.0.csv
/ltv48_1ISM.cut14.pcm
/ltv48_1ISM.cut14.dec.pcm.0.csv
/ltv48_1ISM.cut14.64k.dec.pcm.0.csv
/ltv48_1ISM.cut14.64k.dec.pcm
/ltv48_1ISM.cut14.32k.dec.pcm
/IvasBuilder.txt
/ivas.192
/ism_loudness_stv48_48kHz.md
/ism_loudness_stv48_32kHz.md
/ism_loudness_sel48_48kHz.md
/ism_loudness_old.xlsx
/ism_loudness_ltv48_ISM4.md
/ism_loudness_ltv48_ISM3.md
/ism_loudness_ltv48_ISM2.md
/ism_loudness_ltv48_ISM1.md
/ism_loudness_ltv48_48kHz.md
/ism_loudness.xlsx
/ism_loudness.py
/HOA2_to_BINAURAL_ROOM_REVERBNone_rend_config_combined_20msNone_0-1000_2-500_1-500.wav
/git_blame_string.sh
/get_license_table.py
/enc_out_mc.pkt
/enc_out.pkt
/cut_ism.py
/scripts/Vlad_mergeNewsletters.py
/scripts/Vlad_extract_max_num_ind.py
/scripts/tables_obj.txt
/scripts/tables_exe.txt
/scripts/requirements.txt
/scripts/parseNewsletterWmops.py
/scripts/output.xlsx
/scripts/functions_obj.txt
/scripts/functions_exe.txt
/scripts/dep_tree.txt
/scripts/cmplx_evs_in_ivas.xlsx
/scripts/bit
/scripts/binaural_loudness.ipynb
/scripts/config/Vlad_self_test_ltv.prm
/scripts/config/Vlad_self_test.prm
/scripts/config/Vlad_ci_linux_ltv.json
/scripts/config/Vlad_ci_linux.json
/cmake-build
/bit.fix
/syn
+6 −18
Original line number Diff line number Diff line
@@ -1077,29 +1077,17 @@ check-first-frame-is-sid:
  script:
    - *print-common-info
    - *update-ltv-repo
    # Temporary fix to test only SID start config files in this job
    # this rm makes check-for-testvectors only check for the signals we actually need in this test
    - rm scripts/config/ci_linux_ltv.json scripts/config/ci_linux.json
    - *check-for-testvectors
    - cmake .
    - make -j

    - exit_code_no_sba=0
    - exit_code_hoa=0
    - exit_code_foa=0

    # run all modes and cut bitstream to start with an SID. Use stereo output to limit runtime, test is only about decoding
    - ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"
    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -vE "FOA|HOA" )
    - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 200 -U 0:20 --oc stereo $ism_md_cmd --timeout 10 || exit_code_no_sba=$?
    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -E "HOA")
    - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 70:80 --oc stereo --timeout 10 || exit_code_hoa=$?
    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep "FOA")
    - scripts/runIvasCodec.py -z console -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 100 -U 75:110 --oc stereo --timeout 10 || exit_code_foa=$?
    - bash ci/run-first-frame-is-sid-test.sh

    - if [ $exit_code_no_sba -ne 0 ] || [ $exit_code_hoa -ne 0 ] || [ $exit_code_foa -ne 0 ]; then exit 1; fi
  artifacts:
    paths:
      - out/logs
      - logs_enc
      - logs_dec_msan
      - logs_dec_asan
      - logs_dec_usan
    when: always
    name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart"
    expose_as: "logs-sidstart"
+2 −2
Original line number Diff line number Diff line
@@ -74,14 +74,14 @@ if(UNIX)
      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
    elseif("${CLANG}" MATCHES "3" OR "${CLANG}" MATCHES "usan")
      # NOTE: keep in sync with list in Makefile
      set(USAN_CHECKS_ENABLE
      set(USAN_CHECKS_LIST
        undefined # Default checks
        # Extra checks
        float-divide-by-zero
        implicit-conversion
        local-bounds
      )
      list(JOIN USAN_CHECKS_ENABLE "," USAN_CHECKS_ENABLE)
      string(JOIN , USAN_CHECKS_ENABLE ${USAN_CHECKS_LIST})

      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")
      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")
+56 −0
Original line number Diff line number Diff line
#! /usr/bin/bash

# build encoder without sanitizers for faster runtime
make clean
make -j IVAS_cod
mv IVAS_cod IVAS_cod_nosan

# run all modes and cut bitstream to start with an SID. Use mono output to limit runtime, test is only about decoding the first frame
modes_no_sba=$(scripts/runIvasCodec.py -l | grep dtx | grep -vE "FOA|HOA" )
modes_hoa=$(scripts/runIvasCodec.py -l | grep dtx | grep -E "HOA")
modes_foa=$(scripts/runIvasCodec.py -l | grep dtx | grep "FOA")

# config vars
testcase_timeout=20
bitstream_cut_length=5
common_args="-z console -p scripts/config/ci_linux_sidstart_test.json -s --oc mono --timeout $testcase_timeout --bs_length $bitstream_cut_length"

# first encoder + MSAN decoder
# hack to use the encoder with no sanitizers
mkdir CLANG1
make clean
make IVAS_dec -j CLANG=1
cp IVAS_dec CLANG1/IVAS_dec
cp IVAS_cod_nosan CLANG1/IVAS_cod

exit_code_msan=0
echo "-------------- 1. Encoder + Msan decoder -------------- "
echo "-------------- 1.1 all DTX modes except SBA -------------- "
scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m $modes_no_sba -U 0:20 $common_args || exit_code_msan=$?
echo "-------------- 1.2 HOA2 + HOA3 DTX modes -------------- "
scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m $modes_hoa -U 70:80 $common_args || exit_code_msan=$?
echo "-------------- 1.3 FOA DTX modes -------------- "
scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m $modes_foa -U 75:110 $common_args || exit_code_msan=$?
# archive encoder logs separately
mkdir logs_enc logs_dec_msan
mv CLANG1/logs/*.enc.txt logs_enc/
mv CLANG1/logs/*.dec*.txt logs_dec_msan/

# ASAN and USAN can be done in one go and decoder only
# copy encoder output from CLANG1 dir
mkdir CLANG2 CLANG3
cp -r CLANG1/enc CLANG2/enc
cp -r CLANG1/enc CLANG3/enc

exit_code_asan_usan=0
echo "-------------- 2. Asan + Usan decoder -------------- "
echo "-------------- 2.1 all DTX modes except SBA -------------- "
scripts/IvasBuildAndRunChecks.py --checks CLANG2 CLANG3 --decoder_only -m $modes_no_sba -U 0:20 $common_args || exit_code_asan_usan=$?
echo "-------------- 2.2 HOA2 + HOA3 DTX modes -------------- "
scripts/IvasBuildAndRunChecks.py --checks CLANG2 CLANG3 --decoder_only -m $modes_hoa -U 70:80 $common_args || exit_code_asan_usan=$?
echo "-------------- 2.3 FOA DTX modes -------------- "
scripts/IvasBuildAndRunChecks.py --checks CLANG2 CLANG3 --decoder_only -m $modes_foa -U 75:110 $common_args || exit_code_asan_usan=$?
mv CLANG2/logs logs_dec_asan
mv CLANG3/logs logs_dec_usan

if [ $exit_code_msan -ne 0 ] || [ $exit_code_asan_usan -ne 0 ]; then echo "There was either a crash or a sanitizer error encountered when decoding a bitstream that starts with an SID. Check the artifacts for the logfiles."; exit 1; fi
+2539 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading