From 462b1a39bf60631a458776fb85ccffc262946a8f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 12:44:45 +0200 Subject: [PATCH 01/23] add switch in Makefile for activating WMOPS switch --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 0467146ba..52622713d 100644 --- a/Makefile +++ b/Makefile @@ -101,6 +101,10 @@ CFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic LDFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic endif +ifeq "$(WMOPS)" "1" +CFLAGS += -DWMOPS=1 +endif + ifeq "$(STRIP)" "1" CFLAGS += -fdata-sections -ffunction-sections ifneq ($(UNAME_S),Darwin) -- GitLab From fa6b79ff6222bc13e31a25d4aba508b4ff40984b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 12:56:58 +0200 Subject: [PATCH 02/23] add tet job for complexity measurement --- .gitlab-ci.yml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4d7b432a..53ec058dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ variables: TESTCASE_TIMEOUT_LTV: 2400 TESTCASE_TIMEOUT_STV_SANITIZERS: 1800 GIT_CLEAN_FLAGS: -ffdxq + MAKE_OPTIONS: "" MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger value: 'default' @@ -109,7 +110,7 @@ stages: ### build test binaries - git checkout $current_commit_sha - make clean - - make -j + - make -j "$MAKE_OPTIONS" .mld-test-setup-codec: &mld-test-setup-codec @@ -693,6 +694,36 @@ ivas-pytest-renderer: <<: *ivas-pytest-anchor +### Complexity measurement jobs + +# NOTE: test job for now +complexity-stereo-dec: + extends: + - .test-job-linux + rules: + - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "complexity" + variables: + - MAKE_OPTIONS: "WMOPS=1" + - COMPLEXITY_TABLES: "complexity_stereo.csv" + - CHECK: "COMPLEXITY" + script: + - *print-common-info + - *update-scripts-repo + - *setup-codec + + # hack to not have script build the binaries + - mkdir $CHECK + - cp IVAS_cod_ref $CHECK/IVAS_cod + - cp IVAS_dec $CHECK/IVAS_dec + + - python3 scripts/IvasBuildAndRunChecks.py -p scripts/config/ci_linux_ltv.json -m stereo_b48_fb_cbr --oc stereo --create_complexity_tables $COMPLEXITY_TABLES --checks $CHECK + - ls + artifacts: + when: always + paths: + - $COMPLEXITY_TABLES + + # job that sets up gitlab pages website pages: stage: deploy -- GitLab From 58b6956adf7bab0b2c15d414c74bb9b165a311a3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 13:00:59 +0200 Subject: [PATCH 03/23] fix variables section --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53ec058dc..5392145b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -703,9 +703,9 @@ complexity-stereo-dec: rules: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "complexity" variables: - - MAKE_OPTIONS: "WMOPS=1" - - COMPLEXITY_TABLES: "complexity_stereo.csv" - - CHECK: "COMPLEXITY" + MAKE_OPTIONS: "WMOPS=1" + COMPLEXITY_TABLES: "complexity_stereo.csv" + CHECK: "COMPLEXITY" script: - *print-common-info - *update-scripts-repo -- GitLab From 5b4400d484075b79abf324bae27b71098e06bad7 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 13:02:31 +0200 Subject: [PATCH 04/23] add manual pl type for complexity measurement --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5392145b2..3c0018740 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,7 @@ variables: - 'evs-26444' - 'sanitizer-stv' - 'pytest-renderer' + - 'complexity' default: @@ -71,6 +72,9 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer' variables: IVAS_PIPELINE_NAME: 'Renderer test: $CI_COMMIT_BRANCH' + - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'complexity' + variables: + IVAS_PIPELINE_NAME: 'Complexity Measurement on $CI_COMMIT_BRANCH' - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch variables: IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH' -- GitLab From b6e6ae1fd35d51f9c5600c6c6d4479e5f79e4e28 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 13:14:53 +0200 Subject: [PATCH 05/23] fix archiving of complexity tables --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c0018740..42042ba4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -708,7 +708,7 @@ complexity-stereo-dec: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "complexity" variables: MAKE_OPTIONS: "WMOPS=1" - COMPLEXITY_TABLES: "complexity_stereo.csv" + COMPLEXITY_TABLES_BASENAME: "complexity_stereo" CHECK: "COMPLEXITY" script: - *print-common-info @@ -720,12 +720,12 @@ complexity-stereo-dec: - cp IVAS_cod_ref $CHECK/IVAS_cod - cp IVAS_dec $CHECK/IVAS_dec - - python3 scripts/IvasBuildAndRunChecks.py -p scripts/config/ci_linux_ltv.json -m stereo_b48_fb_cbr --oc stereo --create_complexity_tables $COMPLEXITY_TABLES --checks $CHECK + - python3 scripts/IvasBuildAndRunChecks.py -p scripts/config/ci_linux_ltv.json -m stereo_b48_fb_cbr --oc stereo --create_complexity_tables $COMPLEXITY_TABLES_BASENAME --checks $CHECK - ls artifacts: when: always paths: - - $COMPLEXITY_TABLES + - "${COMPLEXITY_TABLES_BASENAME}*" # job that sets up gitlab pages website -- GitLab From e3922ba595c125dca7e70a01e93530bd1c80968e Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 15:20:40 +0200 Subject: [PATCH 06/23] add complexity measurement setup from float repo --- .gitlab-ci.yml | 73 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42042ba4d..990055f5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -698,34 +698,83 @@ ivas-pytest-renderer: <<: *ivas-pytest-anchor -### Complexity measurement jobs +# --------------------------------------------------------------- +# Complexity measurement jobs +# --------------------------------------------------------------- -# NOTE: test job for now -complexity-stereo-dec: +.complexity-measurements-setup: + &complexity-measurements-setup # create necessary environment + - mkdir -p wmops/logs + + - job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID) + - echo $job_id + - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip + - 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 + - ls wmops + - rm artifacts.zip + - rm -rf $public_dir + +.complexity-measurements-prepare-artifacts: + &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 wmops/*.js ${public_dir}/ + # move logfiles for links + - mkdir $public_dir/logs + # first move logs + - log_files=$(cat $public_dir/graphs*.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g") + - echo $log_files + - ls wmops/logs + - for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done + # copy index page blueprint + - cp ci/complexity_measurements/index_complexity.html ${public_dir}/index.html + # patch the format in the title + - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html + # do separately here to avoid overwrite complaints by mv + - mv -f ci/complexity_measurements/style.css ${public_dir}/ + - ls $public_dir + +.complexity-template: extends: - .test-job-linux + timeout: 3 hours 30 minutes + stage: test + artifacts: + name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA" + when: always + expire_in: 1 week + paths: + - $CI_JOB_NAME-public + +complexity-stereo-in-stereo-out: + extends: + - .complexity-template rules: - - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "complexity" + - if: $MEASURE_COMPLEXITY_LINUX variables: MAKE_OPTIONS: "WMOPS=1" - COMPLEXITY_TABLES_BASENAME: "complexity_stereo" - CHECK: "COMPLEXITY" script: - *print-common-info - *update-scripts-repo + - *update-ltv-repo - *setup-codec + - *complexity-measurements-setup # hack to not have script build the binaries - mkdir $CHECK - cp IVAS_cod_ref $CHECK/IVAS_cod - cp IVAS_dec $CHECK/IVAS_dec - - python3 scripts/IvasBuildAndRunChecks.py -p scripts/config/ci_linux_ltv.json -m stereo_b48_fb_cbr --oc stereo --create_complexity_tables $COMPLEXITY_TABLES_BASENAME --checks $CHECK - - ls - artifacts: - when: always - paths: - - "${COMPLEXITY_TABLES_BASENAME}*" + - in_format=stereo + - out_format=stereo + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val # job that sets up gitlab pages website -- GitLab From a32f3bc114a0c2f1579e7492ecbf9e75d369310f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 15:24:09 +0200 Subject: [PATCH 07/23] fix mkdir command --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 990055f5c..53bef2781 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -765,7 +765,7 @@ complexity-stereo-in-stereo-out: - *complexity-measurements-setup # hack to not have script build the binaries - - mkdir $CHECK + - mkdir COMPLEXITY - cp IVAS_cod_ref $CHECK/IVAS_cod - cp IVAS_dec $CHECK/IVAS_dec -- GitLab From c18f2af9dc6f99a1ad79b86f142ab7d23f7c3293 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 15:27:13 +0200 Subject: [PATCH 08/23] fix remaining obsolete variable usage --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53bef2781..0f2c42bd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -766,8 +766,8 @@ complexity-stereo-in-stereo-out: # hack to not have script build the binaries - mkdir COMPLEXITY - - cp IVAS_cod_ref $CHECK/IVAS_cod - - cp IVAS_dec $CHECK/IVAS_dec + - cp IVAS_cod_ref COMPLEXITY/IVAS_cod + - cp IVAS_dec COMPLEXITY/IVAS_dec - in_format=stereo - out_format=stereo -- GitLab From 5c35bf5f2c51fe403f134b007ad01afae76e83df Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 5 Jul 2024 16:01:22 +0200 Subject: [PATCH 09/23] use fixed encoder in complexity measurement --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f2c42bd5..e06df82a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -766,7 +766,7 @@ complexity-stereo-in-stereo-out: # hack to not have script build the binaries - mkdir COMPLEXITY - - cp IVAS_cod_ref COMPLEXITY/IVAS_cod + - cp IVAS_cod COMPLEXITY/IVAS_cod - cp IVAS_dec COMPLEXITY/IVAS_dec - in_format=stereo -- GitLab From a951c8471757cb764f7ff3c2386c5da22554bab0 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 11 Jul 2024 13:22:21 +0200 Subject: [PATCH 10/23] move more functionality into the template --- .gitlab-ci.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e06df82a2..a4a21b981 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -743,35 +743,34 @@ ivas-pytest-renderer: - .test-job-linux timeout: 3 hours 30 minutes stage: test - artifacts: - name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA" - when: always - expire_in: 1 week - paths: - - $CI_JOB_NAME-public - -complexity-stereo-in-stereo-out: - extends: - - .complexity-template rules: - if: $MEASURE_COMPLEXITY_LINUX variables: MAKE_OPTIONS: "WMOPS=1" - script: + ret_val: 0 + before_script: - *print-common-info - *update-scripts-repo - *update-ltv-repo - *setup-codec - *complexity-measurements-setup - # hack to not have script build the binaries - mkdir COMPLEXITY - cp IVAS_cod COMPLEXITY/IVAS_cod - cp IVAS_dec COMPLEXITY/IVAS_dec + artifacts: + name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA" + when: always + expire_in: 1 week + paths: + - $CI_JOB_NAME-public +complexity-stereo-in-stereo-out: + extends: + - .complexity-template + script: - in_format=stereo - out_format=stereo - - ret_val=0 - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val -- GitLab From 9274eeba5dca70d4612b9cf1705e7a10f3848718 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 11 Jul 2024 16:21:46 +0200 Subject: [PATCH 11/23] add more complexity jobs --- .gitlab-ci.yml | 198 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4a21b981..32e06eb3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -743,8 +743,6 @@ ivas-pytest-renderer: - .test-job-linux timeout: 3 hours 30 minutes stage: test - rules: - - if: $MEASURE_COMPLEXITY_LINUX variables: MAKE_OPTIONS: "WMOPS=1" ret_val: 0 @@ -768,6 +766,8 @@ ivas-pytest-renderer: complexity-stereo-in-stereo-out: extends: - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX script: - in_format=stereo - out_format=stereo @@ -775,6 +775,200 @@ complexity-stereo-in-stereo-out: - *complexity-measurements-prepare-artifacts - exit $ret_val +complexity-stereo-in-7_1_4-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + script: + - in_format=stereo + - out_format=7_1_4 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-ism-in-ext-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 1 hours + script: + - in_format=ISM + - out_format=EXT + - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-ism-in-binaural-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 1 hours + script: + - in_format=ISM + - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB + - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-hoa3-in-hoa3-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=HOA3 + - out_format=HOA3 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-hoa3-in-binaural-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=HOA3 + - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-osba-in-ext-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=OSBA + - out_format=EXT + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-osba-in-binaural-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=OSBA + - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-mc-in-7_1_4-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=MC + - out_format=7_1_4 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-mc-in-binaural-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=MC + - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-masa-in-ext-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=MASA + - out_format=EXT + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-masa-in-binaural-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=MASA + - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-omasa-in-ext-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=OMASA + - out_format=EXT + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-omasa-in-binaural-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=OMASA + - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + +complexity-StereoDmxEVS-stereo-in-mono-out: + extends: + - .complexity-template + rules: + - if: $MEASURE_COMPLEXITY_LINUX + # when: delayed: + # start_in: 2 hours + script: + - in_format=StereoDmxEVS + - out_format=mono + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - *complexity-measurements-prepare-artifacts + - exit $ret_val + # job that sets up gitlab pages website pages: -- GitLab From 27c10f994115e4c5b4aa8593d0ccfedc88f32a6c Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 2 Aug 2024 15:55:48 +0200 Subject: [PATCH 12/23] comment out mose complexity jobs for now --- .gitlab-ci.yml | 386 ++++++++++++++++++++++++------------------------- 1 file changed, 193 insertions(+), 193 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92668a5b6..bb874fa75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -775,199 +775,199 @@ complexity-stereo-in-stereo-out: - *complexity-measurements-prepare-artifacts - exit $ret_val -complexity-stereo-in-7_1_4-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - script: - - in_format=stereo - - out_format=7_1_4 - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-ism-in-ext-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 1 hours - script: - - in_format=ISM - - out_format=EXT - - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-ism-in-binaural-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 1 hours - script: - - in_format=ISM - - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB - - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-hoa3-in-hoa3-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=HOA3 - - out_format=HOA3 - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-hoa3-in-binaural-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=HOA3 - - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-osba-in-ext-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=OSBA - - out_format=EXT - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-osba-in-binaural-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=OSBA - - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-mc-in-7_1_4-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=MC - - out_format=7_1_4 - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-mc-in-binaural-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=MC - - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-masa-in-ext-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=MASA - - out_format=EXT - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-masa-in-binaural-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=MASA - - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-omasa-in-ext-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=OMASA - - out_format=EXT - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-omasa-in-binaural-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=OMASA - - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val - -complexity-StereoDmxEVS-stereo-in-mono-out: - extends: - - .complexity-template - rules: - - if: $MEASURE_COMPLEXITY_LINUX - # when: delayed: - # start_in: 2 hours - script: - - in_format=StereoDmxEVS - - out_format=mono - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - - *complexity-measurements-prepare-artifacts - - exit $ret_val +# complexity-stereo-in-7_1_4-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# script: +# - in_format=stereo +# - out_format=7_1_4 +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-ism-in-ext-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 1 hours +# script: +# - in_format=ISM +# - out_format=EXT +# - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-ism-in-binaural-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 1 hours +# script: +# - in_format=ISM +# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB +# - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-hoa3-in-hoa3-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=HOA3 +# - out_format=HOA3 +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-hoa3-in-binaural-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=HOA3 +# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-osba-in-ext-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=OSBA +# - out_format=EXT +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-osba-in-binaural-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=OSBA +# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-mc-in-7_1_4-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=MC +# - out_format=7_1_4 +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-mc-in-binaural-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=MC +# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-masa-in-ext-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=MASA +# - out_format=EXT +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-masa-in-binaural-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=MASA +# - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-omasa-in-ext-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=OMASA +# - out_format=EXT +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-omasa-in-binaural-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=OMASA +# - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB" +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val + +# complexity-StereoDmxEVS-stereo-in-mono-out: +# extends: +# - .complexity-template +# rules: +# - if: $MEASURE_COMPLEXITY_LINUX +# # when: delayed: +# # start_in: 2 hours +# script: +# - in_format=StereoDmxEVS +# - out_format=mono +# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? +# - *complexity-measurements-prepare-artifacts +# - exit $ret_val # job that sets up gitlab pages website -- GitLab From 69c9a828f42b061ae8f49e89715917fcb96096f3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 2 Aug 2024 16:49:52 +0200 Subject: [PATCH 13/23] adjust complexity job --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb874fa75..15c0e8c9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -744,7 +744,6 @@ ivas-pytest-renderer: timeout: 3 hours 30 minutes stage: test variables: - MAKE_OPTIONS: "WMOPS=1" ret_val: 0 before_script: - *print-common-info @@ -752,10 +751,6 @@ ivas-pytest-renderer: - *update-ltv-repo - *setup-codec - *complexity-measurements-setup - # hack to not have script build the binaries - - mkdir COMPLEXITY - - cp IVAS_cod COMPLEXITY/IVAS_cod - - cp IVAS_dec COMPLEXITY/IVAS_dec artifacts: name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA" when: always @@ -771,7 +766,7 @@ complexity-stereo-in-stereo-out: script: - in_format=stereo - out_format=stereo - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val -- GitLab From ab78b1985a30ba12e41bf1b2cf00901e3af1a403 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 2 Aug 2024 17:14:51 +0200 Subject: [PATCH 14/23] remove obsolete anchor usage and variable --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15c0e8c9c..e457d49db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ variables: TESTCASE_TIMEOUT_LTV: 2400 TESTCASE_TIMEOUT_STV_SANITIZERS: 1800 GIT_CLEAN_FLAGS: -ffdxq - MAKE_OPTIONS: "" MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger value: 'default' @@ -114,7 +113,7 @@ stages: ### build test binaries - git checkout $current_commit_sha - make clean - - make -j "$MAKE_OPTIONS" + - make -j .mld-test-setup-codec: &mld-test-setup-codec @@ -749,7 +748,6 @@ ivas-pytest-renderer: - *print-common-info - *update-scripts-repo - *update-ltv-repo - - *setup-codec - *complexity-measurements-setup artifacts: name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA" -- GitLab From 8644693a5819e6346c74a75868a9a4c3ff9ec61f Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 2 Aug 2024 17:19:49 +0200 Subject: [PATCH 15/23] add check for coan being present --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e457d49db..3c5ef6acf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -749,6 +749,7 @@ ivas-pytest-renderer: - *update-scripts-repo - *update-ltv-repo - *complexity-measurements-setup + - which coan artifacts: name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA" when: always -- GitLab From c5bca976c90ca75acfd6abc2b39ce13ab40d6757 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 5 Aug 2024 17:19:28 +0200 Subject: [PATCH 16/23] build manually before calling the complexity script --- .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c5ef6acf..861869966 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,8 @@ variables: TESTCASE_TIMEOUT_LTV: 2400 TESTCASE_TIMEOUT_STV_SANITIZERS: 1800 GIT_CLEAN_FLAGS: -ffdxq + BUILD_INSTRUMENTED: "" + INSTR_DIR: "c-code_instrument" MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger value: 'default' @@ -105,12 +107,21 @@ stages: - git checkout $REFERENCE_BRANCH - git pull - make clean - - make -j - - mv ./IVAS_cod ./IVAS_cod_ref - - mv ./IVAS_dec ./IVAS_dec_ref - - mv ./IVAS_rend ./IVAS_rend_ref + - if [ "$BUILD_INSTRUMENTED" != "" ]; then + - bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY + - make -j -C $INSTR_DIR + - mv $INSTR_DIR/IVAS_cod ./IVAS_cod_ref + - mv $INSTR_DIR/IVAS_dec ./IVAS_dec_ref + - mv $INSTR_DIR/IVAS_rend ./IVAS_rend_ref + - else + - make -j + - mv ./IVAS_cod ./IVAS_cod_ref + - mv ./IVAS_dec ./IVAS_dec_ref + - mv ./IVAS_rend ./IVAS_rend_ref + - fi ### build test binaries + - git restore . - git checkout $current_commit_sha - make clean - make -j @@ -703,6 +714,7 @@ ivas-pytest-renderer: .complexity-measurements-setup: &complexity-measurements-setup # create necessary environment + ### 1. part: mainly same as in float repo - this is boilerplate code to make the gitlab pages presentation work - mkdir -p wmops/logs - job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID) @@ -717,6 +729,16 @@ ivas-pytest-renderer: - rm artifacts.zip - rm -rf $public_dir + ### 2. part: setup specific for BASOP repo + # hack for using the reference encoder -> need to build manually to make script use ref enc and BASOP dec + - mkdir COMPLEXITY + - cp IVAS_cod_ref COMPLEXITY/IVAS_cod + # build branch code aain with instrumentation + - make clean + - bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY + - make -j -C $INSTR_DIR + - cp $INSTR_DIR/IVAS_dec COMPLEXITY/IVAS_dec + .complexity-measurements-prepare-artifacts: &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory - public_dir="$CI_JOB_NAME-public" @@ -744,10 +766,12 @@ ivas-pytest-renderer: stage: test variables: ret_val: 0 + BUILD_INSTRUMENTED: "true" before_script: - *print-common-info - *update-scripts-repo - *update-ltv-repo + - *setup-codec - *complexity-measurements-setup - which coan artifacts: -- GitLab From b30ac599eb3e8f3cc0c825e404d173a3c65225d6 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 5 Aug 2024 18:04:24 +0200 Subject: [PATCH 17/23] correct path to instrumentation dir --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 861869966..f1f0610be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ variables: TESTCASE_TIMEOUT_STV_SANITIZERS: 1800 GIT_CLEAN_FLAGS: -ffdxq BUILD_INSTRUMENTED: "" - INSTR_DIR: "c-code_instrument" + INSTR_DIR: "scripts/c-code_instrument" MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger value: 'default' -- GitLab From 6c356032dc5db7c9a121ceb4a4af3cec617214f8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 6 Aug 2024 07:45:40 +0200 Subject: [PATCH 18/23] use ref encoder in complexity run without instrumentation --- .gitlab-ci.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1f0610be..1cf46a52a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ variables: TESTCASE_TIMEOUT_LTV: 2400 TESTCASE_TIMEOUT_STV_SANITIZERS: 1800 GIT_CLEAN_FLAGS: -ffdxq - BUILD_INSTRUMENTED: "" INSTR_DIR: "scripts/c-code_instrument" MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger @@ -107,18 +106,10 @@ stages: - git checkout $REFERENCE_BRANCH - git pull - make clean - - if [ "$BUILD_INSTRUMENTED" != "" ]; then - - bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY - - make -j -C $INSTR_DIR - - mv $INSTR_DIR/IVAS_cod ./IVAS_cod_ref - - mv $INSTR_DIR/IVAS_dec ./IVAS_dec_ref - - mv $INSTR_DIR/IVAS_rend ./IVAS_rend_ref - - else - - make -j - - mv ./IVAS_cod ./IVAS_cod_ref - - mv ./IVAS_dec ./IVAS_dec_ref - - mv ./IVAS_rend ./IVAS_rend_ref - - fi + - make -j + - mv ./IVAS_cod ./IVAS_cod_ref + - mv ./IVAS_dec ./IVAS_dec_ref + - mv ./IVAS_rend ./IVAS_rend_ref ### build test binaries - git restore . @@ -766,7 +757,6 @@ ivas-pytest-renderer: stage: test variables: ret_val: 0 - BUILD_INSTRUMENTED: "true" before_script: - *print-common-info - *update-scripts-repo -- GitLab From aa6332e4f50ff1a659db8f7fb8b11c329ecf5a66 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 7 Aug 2024 16:10:36 +0200 Subject: [PATCH 19/23] add ; after macro to fix instrumented build --- lib_enc/igf_enc_fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/igf_enc_fx.c b/lib_enc/igf_enc_fx.c index 61b844fde..b9f03750a 100644 --- a/lib_enc/igf_enc_fx.c +++ b/lib_enc/igf_enc_fx.c @@ -498,7 +498,7 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou #else L_tmp = L_add( pPowerSpectrum[i], highPassEner_Ovfl ); #endif - BASOP_SATURATE_WARNING_ON_EVS + BASOP_SATURATE_WARNING_ON_EVS; IF( L_tmp < 0 ) { -- GitLab From 209b0d90f49b0300bbf4b3117840969f91143f97 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 7 Aug 2024 16:13:13 +0200 Subject: [PATCH 20/23] update build job test for instrumented code --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cf46a52a..acc043cc5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -410,8 +410,9 @@ build-codec-linux-instrumented-make: - .build-job-linux script: - *print-common-info - - sed -i".bak" "s/\/\*#define WMOPS 1\*\//#define WMOPS 1/g" lib_com/count.h - - make -j + - *update-scripts-repo + - bash scripts/prepare_instrumentation.sh -m MEM_ONLY -p BASOP + - make -j -C $INSTR_DIR # --------------------------------------------------------------- # Short test jobs -- GitLab From 7c5e34c139227c9849ec3bcfb709d6d058720ff8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 7 Aug 2024 16:20:12 +0200 Subject: [PATCH 21/23] increase timeout of build job --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acc043cc5..70f78566e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -408,6 +408,7 @@ build-codec-linux-instrumented-make: when: never extends: - .build-job-linux + timeout: "7 minutes" script: - *print-common-info - *update-scripts-repo -- GitLab From e2ef7f6cbb68c14e799bd8518120141d1f0db80a Mon Sep 17 00:00:00 2001 From: norvell Date: Wed, 14 Aug 2024 05:33:58 +0000 Subject: [PATCH 22/23] Fix merge conflict after renaming of setup-codec anchor --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36fdae754..25893ea8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ workflow: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' variables: IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME' - ### disabled for now because pipeline setup is redundant with MR pipeline with current workflow + ### disabled for now because pipeline cd is redundant with MR pipeline with current workflow # - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main # variables: # IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH' @@ -970,7 +970,7 @@ ivas-pytest-renderer: - *print-common-info - *update-scripts-repo - *update-ltv-repo - - *setup-codec + - *build-reference-and-dut-binaries - *complexity-measurements-setup - which coan artifacts: -- GitLab From fe97a8fb0e8edfc81fdafd3e8e5599afafef923d Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 14 Aug 2024 08:57:31 +0200 Subject: [PATCH 23/23] Fix line comment terminated with */, which confuses parse_options_h.sh --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5cb264d35..ef85b0124 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -121,7 +121,7 @@ #define IVAS_CNST #define REMOVE_IVAS_UNUSED_PARAMETERS_WARNING /*temporary operation on unused EVS parameters to remove warnings, these parameters will be used in IVAS */ -#define MOD_BIT_ALLOC_ROM_TABLE // Just to highlight modification in bit allocation table and to ensure these modifications doesn't affect EVS modes*/ +#define MOD_BIT_ALLOC_ROM_TABLE /* Just to highlight modification in bit allocation table and to ensure these modifications doesn't affect EVS modes*/ #define SIMPLIFY_CODE_BE // Simplify synthesis loop #define CR_2109_to_2112_cd0_ce0 /* This is related to the CRs include in the 26.444 package of 21-12. Concerns lead_deindexing and */ -- GitLab