Commit 61b97056 authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'main' into 1122-jbm-and-dtx-interaction-not-as-expected

parents 6db5b3a2 60c0805c

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -2464,6 +2464,9 @@ coverage-test-on-main-scheduled: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

  allow_failure:

    exit_codes:

      - 123

  artifacts:

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

    when: always

ci/complexity_measurements/getWmops.sh

+4 −3
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ wmopsFilenameFlcLast=wmops_newsletter_${ivas_format_for_filename}_to_${output_fo 
wmopsFilenameFlcDir=${destDir}/wmops/logs

wmopsFilenameFlc=${wmopsFilenameFlcDir}/${wmopsFilenameFlcLast}



ret_val=0



mode_arg=""

# for OSBA, there are just too many modes... -> only select HOA3 ones

if [ "$ivas_format" == "OSBA" ]; then
@@ -83,7 +81,7 @@ fi 


# instrument and build

./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format

ret_val=$?

ret_val_script=$?



# TODO: only split wmops and ram files

./ci/complexity_measurements/split_by_levels.py $(ls ${wmopsFilenameFlc}*.csv)
@@ -137,8 +135,11 @@ else 
  python3 ci/complexity_measurements/genWebpageData.py --wmops_per_op_log ${wmopsFilenameFlc}_WMOPS.csv --rom_log ${log_rom_all}

fi



ret_val=0

python3 ${scriptDir}/check_for_changes.py --wmops_logfiles $(ls ${destDir}/wmops/log_wmops_all*.txt) --ram_logfiles $(ls ${destDir}/wmops/log_ram_all*.txt) --rom_logfile ${destDir}/wmops/log_rom_all.txt

if [ "$?" != "0" ]; then

  ret_val=123

elif [ "$ret_val_script" != "0" ]; then

  ret_val=1

fi