From 87646deb1fb587c79c3c452c9daf9700b38e4c32 Mon Sep 17 00:00:00 2001
From: Jan Kiene <jan.kiene@iis.fraunhofer.de>
Date: Mon, 9 Dec 2024 11:55:56 +0100
Subject: [PATCH] enable instrumentation of encoder

---
 .gitlab-ci.yml | 50 ++++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c3fc2526..c68efac33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1166,16 +1166,6 @@ voip-be-on-merge-request:
   - 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"
@@ -1225,7 +1215,7 @@ complexity-stereo-in-stereo-out:
   script:
     - in_format=stereo
     - out_format=stereo
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1240,7 +1230,7 @@ complexity-ism-in-binaural-out:
     - in_format=ISM
     - out_format=BINAURAL
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1255,7 +1245,7 @@ complexity-ism-in-binaural_room_ir-out:
     - in_format=ISM
     - out_format=BINAURAL_ROOM_IR
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1270,7 +1260,7 @@ complexity-ism-in-ext-out:
     - in_format=ISM
     - out_format=EXT
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1285,7 +1275,7 @@ complexity-sba-hoa3-in-hoa3-out:
     - in_format=HOA3
     - out_format=HOA3
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1300,7 +1290,7 @@ complexity-sba-hoa3-in-binaural-out:
     - in_format=HOA3
     - out_format=BINAURAL
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1315,7 +1305,7 @@ complexity-sba-hoa3-in-binaural_room_ir-out:
     - in_format=HOA3
     - out_format=BINAURAL_ROOM_IR
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1330,7 +1320,7 @@ complexity-mc-in-7_1_4-out:
     - in_format=MC
     - out_format=7_1_4
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1345,7 +1335,7 @@ complexity-mc-in-binaural-out:
     - in_format=MC
     - out_format=BINAURAL
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1360,7 +1350,7 @@ complexity-mc-in-binaural_room_ir-out:
     - in_format=MC
     - out_format=BINAURAL_ROOM_IR
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1375,7 +1365,7 @@ complexity-masa-in-ext-out:
     - in_format=MASA
     - out_format=EXT
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1390,7 +1380,7 @@ complexity-masa-in-binaural-out:
     - in_format=MASA
     - out_format=BINAURAL
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1405,7 +1395,7 @@ complexity-masa-in-hoa3-out:
     - in_format=MASA
     - out_format=HOA3
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1420,7 +1410,7 @@ complexity-masa-in-hoa3-out:
 #     - in_format=OMASA
 #     - out_format=EXT
 #     - ret_val=0
-#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
 #     - *complexity-measurements-prepare-artifacts
 #     - exit $ret_val
 
@@ -1435,7 +1425,7 @@ complexity-omasa-in-binaural-out:
     - in_format=OMASA
     - out_format=BINAURAL
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1450,7 +1440,7 @@ complexity-omasa-in-hoa3-out:
     - in_format=OMASA
     - out_format=HOA3
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1465,7 +1455,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
     - in_format=StereoDmxEVS
     - out_format=mono
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1480,7 +1470,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
 #     - in_format=OSBA
 #     - out_format=EXT
 #     - ret_val=0
-#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
 #     - *complexity-measurements-prepare-artifacts
 #     - exit $ret_val
 
@@ -1495,7 +1485,7 @@ complexity-osba-in-binaural-out:
     - in_format=OSBA
     - out_format=BINAURAL
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
@@ -1510,7 +1500,7 @@ complexity-osba-in-binaural_room_ir-out:
     - in_format=OSBA
     - out_format=BINAURAL_ROOM_IR
     - ret_val=0
-    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?
+    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop || ret_val=$?
     - *complexity-measurements-prepare-artifacts
     - exit $ret_val
 
-- 
GitLab