Commit 56b2ec3b authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '31-develop-performance-measurement-build' of... 

Merge branch '31-develop-performance-measurement-build' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 31-develop-performance-measurement-build
parents e44ed6df 2fd36347

.gitlab-ci.yml

+31 −6
Original line number Diff line number Diff line
@@ -947,7 +947,20 @@ coverage-test-on-main-scheduled: 
  - 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 for "native" sampling rate

  - log_files=$(cat $public_dir/graphs_wmops_flc.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

  - log_files_48=$(cat $public_dir/graphs_wmops_flc_48kHz.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")

  - echo $log_files_48

  - for f in $log_files_48; 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}/
@@ -971,7 +984,9 @@ measure-complexity-linux-stereo-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - bash ci/complexity_measurements/getWmops.sh stereo

    - in_format=stereo

    - out_format=stereo

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-ism-test:
@@ -981,7 +996,9 @@ measure-complexity-linux-ism-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4"

    - in_format=ISM

    - out_format=EXT

    - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-sba-test:
@@ -991,7 +1008,9 @@ measure-complexity-linux-sba-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - bash ci/complexity_measurements/getWmops.sh SBA

    - in_format=SBA

    - out_format=HOA3

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-mc-test:
@@ -1001,7 +1020,9 @@ measure-complexity-linux-mc-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - bash ci/complexity_measurements/getWmops.sh MC

    - in_format=MC

    - out_format=7_1_4

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-masa-test:
@@ -1011,7 +1032,9 @@ measure-complexity-linux-masa-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - bash ci/complexity_measurements/getWmops.sh MASA

    - in_format=MASA

    - out_format=EXT

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-StereoDmxEVS-test:
@@ -1021,7 +1044,9 @@ measure-complexity-linux-StereoDmxEVS-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - bash ci/complexity_measurements/getWmops.sh StereoDmxEVS

    - in_format=StereoDmxEVS

    - out_format=mono

    - bash ci/complexity_measurements/getWmops.sh "$format" "$out_format"

    - *complexity-measurements-prepare-artifacts



# ---------------------------------------------------------------

ci/complexity_measurements/getWmops.sh

+5 −4
Original line number Diff line number Diff line
@@ -29,12 +29,13 @@ 
# the United Nations Convention on Contracts on the International Sales of Goods.



# get format from command line

if [ $# -ne 1 ]; then

  echo "Usage: $0 ivas-format"

if [ $# -ne 2 ]; then

  echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\""

  exit 1

fi



ivas_format=$1

output_format=$2



date=`date +%Y%m%d`                         # used for log-file file ending

shortDate=`date "+%b %d" | sed -e "s/\ /_/g"`    # stored in the log-file
@@ -56,8 +57,8 @@ wmopsFilenameFlc48kHzLast=wmops_newsletter_stereo_48kHz__${commit_sha}_${date} 
wmopsFilenameFlc48kHz=${destDir}/wmops/logs/${wmopsFilenameFlc48kHzLast}



# instrument and build

./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format -U $duration -f ${ep}

./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc48kHz} -C $ivas_format -R 48 -S 48 -U $duration -f ${ep}

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

./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc48kHz} -C $ivas_format -R 48 -S 48 -U $duration -f ${ep} --oc $output_format



# now get the info on worst case operating point: WMOPS number, enc-operating mode, dec-operating mode

### WMOPS

ci/complexity_measurements/index_complexity.html

+43 −22
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
 <meta http-equiv="content-language" content="en">

 <meta http-equiv="refresh" content="300">

 

 <title>IVAS Stereo - Worst Case WMOPS/Memory Performance</title>

 <title>IVAS FORMAT - Worst Case WMOPS/Memory Performance</title>

 

 <link rel="stylesheet" title="Default Stylesheet" type="text/css" href="style.css">
@@ -142,7 +142,7 @@ 
  </div>



  <div id="content">

    <h1 id="sec:graph-wmops">IVAS Stereo - Worst Case WMOPS Performance (Float, native SR)</h1>

    <h1 id="sec:graph-wmops">IVAS FORMAT - Worst Case WMOPS Performance (Float, native SR)</h1>



  <div class="graph-container">

  <div id="wmops-graph"></div>
@@ -163,7 +163,7 @@ 


  <hr />



    <h1 id="sec:graph-wmops_per_op">IVAS Stereo - Worst Case WMOPS Performance

    <h1 id="sec:graph-wmops_per_op">IVAS FORMAT - Worst Case WMOPS Performance

        per Operating Point (Float, native SR)</h1>



  <div class="graph-container">
@@ -177,7 +177,7 @@ 
  <hr />



  

    <h1 id="sec:graph-wmops_48kHz">IVAS Stereo - Worst Case WMOPS Performance (Float, 48 kHz)</h1>

    <h1 id="sec:graph-wmops_48kHz">IVAS FORMAT - Worst Case WMOPS Performance (Float, 48 kHz)</h1>



  <div class="graph-container">

  <div id="wmops-48kHz-graph"></div>
@@ -198,7 +198,7 @@ 


  <hr />



    <h1 id="sec:graph-wmops_per_op_48kHz">IVAS Stereo - Worst Case WMOPS Performance

    <h1 id="sec:graph-wmops_per_op_48kHz">IVAS FORMAT - Worst Case WMOPS Performance

        per Operating Point (Float, 48 kHz)</h1>



  <div class="graph-container">
@@ -214,7 +214,7 @@ 
  



  <!--

  <h1 id="sec:graph-wmops-basop">IVAS Stereo - Worst Case WMOPS Performance (BASOP)</h1>

  <h1 id="sec:graph-wmops-basop">IVAS FORMAT - Worst Case WMOPS Performance (BASOP)</h1>



  <div class="graph-container">

  <div id="wmops-graph-basop"></div>
@@ -235,7 +235,7 @@ 


  <hr />



  <h1 id="sec:graph-wmops_basop_per_op">IVAS Stereo - Worst Case WMOPS Performance

  <h1 id="sec:graph-wmops_basop_per_op">IVAS FORMAT - Worst Case WMOPS Performance

        per Operating Point (BASOP)</h1>



  <div class="graph-container">
@@ -248,7 +248,7 @@ 


  <hr />



  <h1 id="sec:graph-conversion_factors_basop_flc">IVAS Stereo - Measured WMOPS

  <h1 id="sec:graph-conversion_factors_basop_flc">IVAS FORMAT - Measured WMOPS

        Conversion Factors BASOP

      / Float</h1>
@@ -263,7 +263,7 @@ 
  <hr />

  -->



  <h1 id="sec:graph-ram">IVAS Stereo - Worst Case RAM Demand (Float)</h1>

  <h1 id="sec:graph-ram">IVAS FORMAT - Worst Case RAM Demand (Float)</h1>



  <div class="graph-container">

  <div id="ram-graph"></div>
@@ -297,7 +297,7 @@ 
  <hr />



  <!--

  <h1 id="sec:graph-ram-basop">IVAS Stereo - Worst Case RAM Demand (BASOP)</h1>

  <h1 id="sec:graph-ram-basop">IVAS FORMAT - Worst Case RAM Demand (BASOP)</h1>



  <div class="graph-container">

  <div id="ram-graph-basop"></div>
@@ -322,7 +322,7 @@ 
  <hr />

  -->



  <h1 id="sec:graph-rom">IVAS Stereo - Worst Case ROM Demand (Float)</h1>

  <h1 id="sec:graph-rom">IVAS FORMAT - Worst Case ROM Demand (Float)</h1>

  

  <div class="graph-container">

  <div id="rom-graph"></div>
@@ -338,7 +338,7 @@ 
  <!--

  <hr />

  

  <h1 id="sec:graph-rom-basop">IVAS Stereo - Worst Case ROM Demand (BASOP)</h1>

  <h1 id="sec:graph-rom-basop">IVAS FORMAT - Worst Case ROM Demand (BASOP)</h1>

  

  <div class="graph-container">

  <div id="rom-graph-basop"></div>
@@ -354,7 +354,7 @@ 
  <hr />

  -->



  <h1 id="sec:graph-prom">IVAS Stereo - Worst Case PROM Demand</h1>

  <h1 id="sec:graph-prom">IVAS FORMAT - Worst Case PROM Demand</h1>



  <div class="graph-container">

  <div id="prom-graph"></div>
@@ -450,8 +450,8 @@ 
  function showToolTip(x, y, contents) {

    var tipWidth = 165;

    var tipHeight = 75;

    var xOffset = 5;

    var yOffset = 5;

    var xOffset = -15;

    var yOffset = -15;

    var ie = document.all && !window.opera;

    var iebody = (document.compatMode == "CSS1Com[at")

               ? document.documentElement
@@ -533,7 +533,10 @@ 
		

        elt.bind("plothover", function (event, pos, item) {

            if (!item) {

                // only remove if not in tooltip anymore

                if ($('#tooltip:hover').length == 0) {

                  $("#tooltip").remove();

                }

                previousPoint = null;

                return;

            }
@@ -699,7 +702,10 @@ function WMOPS_perOP() { 


        elt.bind("plothover", function (event, pos, item) {

        if (!item) {

          // only remove if not in tooltip anymore

          if ($('#tooltip:hover').length == 0) {

            $("#tooltip").remove();

          }

          previousPoint = null;

          return;

        }
@@ -807,7 +813,10 @@ function WMOPS_perOP() { 
		

        elt.bind("plothover", function (event, pos, item) {

            if (!item) {

                // only remove if not in tooltip anymore

                if ($('#tooltip:hover').length == 0) {

                  $("#tooltip").remove();

                }

                previousPoint = null;

                return;

            }
@@ -973,7 +982,10 @@ function WMOPS_perOP_48kHz() { 


        elt.bind("plothover", function (event, pos, item) {

        if (!item) {

          // only remove if not in tooltip anymore

          if ($('#tooltip:hover').length == 0) {

            $("#tooltip").remove();

          }

          previousPoint = null;

          return;

        }
@@ -1080,7 +1092,10 @@ function RAM() { 
		

        elt.bind("plothover", function (event, pos, item) {

            if (!item) {

                // only remove if not in tooltip anymore

                if ($('#tooltip:hover').length == 0) {

                  $("#tooltip").remove();

                }

                previousPoint = null;

                return;

            }
@@ -1238,7 +1253,10 @@ function ROM() { 
		

        elt.bind("plothover", function (event, pos, item) {

            if (!item) {

                // only remove if not in tooltip anymore

                if ($('#tooltip:hover').length == 0) {

                  $("#tooltip").remove();

                }

                previousPoint = null;

                return;

            }
@@ -1404,7 +1422,10 @@ function PROM() { 
		

        elt.bind("plothover", function (event, pos, item) {

            if (!item) {

                // only remove if not in tooltip anymore

                if ($('#tooltip:hover').length == 0) {

                  $("#tooltip").remove();

                }

                previousPoint = null;

                return;

            }