Commit defd706d authored by norvell's avatar norvell
Browse files

Merge with main

parents 1682f462 92b81e4c

.gitlab-ci.yml

+25 −28
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ variables: 
  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"

  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"

  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"

  ENCODER_TEST_SUITE: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"

  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"

  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"

  TEST_SUITE: ""

  DUT_ENCODER_PATH: "./IVAS_cod"

  DUT_DECODER_PATH: "./IVAS_dec"
@@ -41,7 +42,7 @@ variables: 
      - 'pytest-compare-to-input'

      - 'pytest-saturation-smoke-test'

      - 'evs-26444'

      - 'sanitizer-stv'

      - 'sanitizer'

      - 'pytest-renderer'

      - 'complexity'

      - 'coverage'
@@ -82,7 +83,7 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'

      variables:

        IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer-stv'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer'

      variables:

        IVAS_PIPELINE_NAME: 'Short testvectors sanitizers'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer'
@@ -493,14 +494,14 @@ stages: 
.ivas-pytest-sanitizers-anchor: &ivas-pytest-sanitizers-anchor

  stage: test

  needs: ["build-codec-linux-make"]

  timeout: "90 minutes"

  timeout: "300 minutes"

  rules:

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

      when: never

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $IVAS_PYTEST_MSAN

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "sanitizer-stv"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "sanitizer"

  script:

    - *print-common-info

    - *update-scripts-repo
@@ -510,7 +511,7 @@ stages: 
    - make -j CLANG=$CLANG_NUM

    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi

    - testcase_timeout=$TESTCASE_TIMEOUT_STV_SANITIZERS

    - python3 -m pytest $SHORT_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

    - 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:

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"

    when: always
@@ -733,7 +734,7 @@ build-codec-linux-debugging-make: 
#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE"

#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

#     - LEVEL_SCALING=1.0

#   <<: *ivas-pytest-on-merge-request-anchor
@@ -744,7 +745,7 @@ build-codec-linux-debugging-make: 
#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE"

#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

#     - LEVEL_SCALING=0.3162

#   <<: *ivas-pytest-on-merge-request-anchor
@@ -755,7 +756,7 @@ build-codec-linux-debugging-make: 
#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE"

#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

#     - LEVEL_SCALING=3.162

#   <<: *ivas-pytest-on-merge-request-anchor
@@ -810,7 +811,7 @@ ivas-pytest-compare_to_ref-short-enc: 
    - USE_LTV=0

    - ENCODER_TEST="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$ENCODER_TEST_SUITE"

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-anchor
@@ -823,7 +824,7 @@ ivas-pytest-compare_to_ref-short-enc-lev-10: 
    - USE_LTV=0

    - ENCODER_TEST="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$ENCODER_TEST_SUITE"

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-anchor
@@ -836,7 +837,7 @@ ivas-pytest-compare_to_ref-short-enc-lev+10: 
    - USE_LTV=0

    - ENCODER_TEST="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$ENCODER_TEST_SUITE"

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-anchor
@@ -846,6 +847,7 @@ ivas-pytest-enc-msan: 
  before_script:

    - CLANG_NUM=1

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_ENCODER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-enc-asan:
@@ -854,6 +856,7 @@ ivas-pytest-enc-asan: 
  before_script:

    - CLANG_NUM=2

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_ENCODER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-enc-usan:
@@ -862,6 +865,7 @@ ivas-pytest-enc-usan: 
  before_script:

    - CLANG_NUM=3

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE=$SHORT_TEST_SUITE_ENCODER

  <<: *ivas-pytest-sanitizers-anchor

  

### jobs that test flt encoder -> fx decoder
@@ -921,28 +925,31 @@ ivas-pytest-compare-to-input-short-enc: 
    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-compare-to-input-anchor



ivas-pytest-dec-msan-short:

ivas-pytest-dec-msan:

  extends:

    - .test-job-linux

  before_script:

    - CLANG_NUM=1

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-asan-short:

ivas-pytest-dec-asan:

  extends:

    - .test-job-linux

  before_script:

    - CLANG_NUM=2

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-usan-short:

ivas-pytest-dec-usan:

  extends:

    - .test-job-linux

  before_script:

    - CLANG_NUM=3

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$SHORT_TEST_SUITE

  <<: *ivas-pytest-sanitizers-anchor



# ---------------------------------------------------------------
@@ -956,7 +963,7 @@ ivas-pytest-compare_ref-long-enc: 
  before_script:

    - USE_LTV=1

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE"

    - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-anchor
@@ -978,7 +985,7 @@ ivas-pytest-compare_ref-long-enc-lev-10: 
  before_script:

    - USE_LTV=1

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE"

    - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-anchor
@@ -1000,7 +1007,7 @@ ivas-pytest-compare_ref-long-enc-lev+10: 
  before_script:

    - USE_LTV=1

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE"

    - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-anchor
@@ -1213,16 +1220,6 @@ voip-be-on-merge-request: 
  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip

  - unzip -j artifacts_ref.zip "*latest_WMOPS.csv"



  ### 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"

.gitlab/issue_templates/default.md

+13 −3
Original line number Diff line number Diff line
@@ -2,14 +2,24 @@ 


<!--- Add commit SHA used to reproduce -->



- Float reference:

  - Encoder (float):

- Decoder:

  - Decoder (float):

- Fixed point:

  - Encoder (fixed):

  - Decoder (fixed):



# Bug description



# Ways to reproduce



(Clear steps or refer to a failing automated test, e.g. with a pipeline link)

Box folder: ...\Box_EXTERNAL_IVAS_BASOP_VERIFICATION\issues\issue-xxxx



<!-- Commandline or script -->



```bash



```



<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.

      Add further information to the first row and remove and add labels as necessary.  -->

.gitlab/issue_templates/default_complexity.md

0 → 100644
+34 −0
Original line number Diff line number Diff line 
# Basic info



<!--- Add commit SHA used to reproduce -->



- Float reference:

  - Encoder (float):

  - Decoder (float):

- Fixed point:

  - Encoder (fixed):

  - Decoder (fixed):



# Bug description



|   Metric   |  BASOP  |  Float  |

|------------|---------|---------|

| WMOPS Max. | | |

| WMOPS Min. | | |

| WMOPS Avg. | | |



# Ways to reproduce



Box folder: ...\Box_EXTERNAL_IVAS_BASOP_VERIFICATION\issues\issue-xxxx



<!-- Commandline or script -->



```bash



```



<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.

      Add further information to the first row and remove and add labels as necessary.  -->



/label ~Priority:: ~Company: ~Lib: ~Module:

/label ~Type:Bug ~Status::ToDo

.gitlab/issue_templates/fixed_point_decoder_crash.md

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Basic info



<!--- Add commit SHA used to reproduce -->



- Encoder and Decoder (float):

- Decoder (fixed):



# Bug description



# Ways to reproduce



Box folder: ...\Box_EXTERNAL_IVAS_BASOP_VERIFICATION\issues\issue-xxxx



<!-- Commandline or script -->



```bash



```



<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.

      Add further information to the first row and remove and add labels as necessary.  -->



/label ~Priority:: ~Company: ~Lib: ~Module:

/label ~Type:Bug ~Status::ToDo

.gitlab/issue_templates/fixed_point_encoder_crash.md

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Basic info



<!--- Add commit SHA used to reproduce -->



- Encoder and Decoder (float):

- Encoder (fixed):



# Bug description



# Ways to reproduce



Box folder: ...\Box_EXTERNAL_IVAS_BASOP_VERIFICATION\issues\issue-xxxx



<!-- Commandline or script -->



```bash



```



<!--- Below are labels that will be added but are not shown in description. This is a template to help fill them.

      Add further information to the first row and remove and add labels as necessary.  -->



/label ~Priority:: ~Company: ~Lib: ~Module:

/label ~Type:Bug ~Status::ToDo