Commit 360fcc2b authored by malenovsky's avatar malenovsky
Browse files

Merge branch '1595-wmc-tool-doesn-t-count-prom-main' into 'main'

Update WMC tool to v1.8 - fix counting of PROM of BASOP operators within function arguments

See merge request !2127
parents 5c7752e2 4771c3c8
Loading
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -352,6 +352,13 @@ build-codec-instrumented-linux:
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
    - ./scripts/prepare_instrumentation.sh
    - make -j -C scripts/c-code_instrument
  artifacts:
    when: always
    access: all
    expire_in: "30 days"
    paths:
      - wmc_tool_output.txt


# make sure that the codec builds with msan, asan and usan
build-codec-sanitizers-linux:
+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(u

# run wmc_tool, exit if the command fails
set -e
touch wmc_tool_output.txt
trap 'echo "Error calling WMC tool: $?"; cat wmc_tool_output.txt' ERR
"$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c" >>wmc_tool_output.txt 2>&1
"$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >>wmc_tool_output.txt 2>&1
for bak_file in $targetdir/lib_rend/*.bak; do mv "$bak_file" "${bak_file%.*}"; done # restore fresh .c files to avoid time-consuming des-instrumentation of files by the WMC tool
@@ -241,6 +243,7 @@ else
    # ISAR post rend
    "$scriptdir/tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$lc3plus_fftdir" >>wmc_tool_output.txt 2>&1
fi
trap - ERR
set +e

# automatically enable #define WMOPS in options.h
−79.7 KiB (595 KiB)

File changed.

No diff preview for this file type.

+3.22 KiB (372 KiB)

File changed.

No diff preview for this file type.

(131 B)

File changed.

No diff preview for this file type.