From ee65e2b619c510788e04d09af9b9a8a9d22529a5 Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Thu, 8 Aug 2024 10:23:19 +0200
Subject: [PATCH 1/2] try to run some commands in  prepare_instrumentation.sh
 in parallel

---
 scripts/prepare_instrumentation.sh | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh
index 281b4fba87..5c3881bb8b 100755
--- a/scripts/prepare_instrumentation.sh
+++ b/scripts/prepare_instrumentation.sh
@@ -67,9 +67,9 @@ done
 shift $((OPTIND-1))
 
 
-wmc_opt=""
+wmc_opt="-b"
 if [ "$MODE" = "MEM_ONLY" ]; then
-    wmc_opt="-s"
+    wmc_opt="-s ${wmc_opt}"
 fi
 
 
@@ -165,12 +165,19 @@ if coan_exists; then
     sed -i "/-DWMOPS/d" $ifdef_list
 	sed -i "/-UMEM_COUNT_DETAILS/d" $ifdef_list
 
-    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_{com,dec,enc,isar,rend,util,debug}/!(wmc_auto*).[hc]
-    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/apps/*.[hc]
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_com/*.[hc] &
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_dec/*.[hc] &
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_enc/*.[hc] &
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_isar/*.[hc] &
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_rend/*.[hc] &
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_util/*.[hc] &
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_debug/!(wmc_auto*).[hc] &
+    coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/apps/*.[hc] &
     if [ "$PROJECT" = "FLOAT" ]; then
-        coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_lc3plus/!(wmc_auto*).[hc]
-        coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_lc3plus/fft/!(wmc_auto*).[hc]
+        coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_lc3plus/*.[hc] &
+        coan source --replace --no-transients -E -K --file $ifdef_list $targetdir/lib_lc3plus/fft/*.[hc] &
     fi
+    wait
 else
     ./strip_defines_cppp.sh $targetdir $ifdef_list
 fi
@@ -180,15 +187,16 @@ shopt -u extglob
 find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(unsigned long\)\1\)/" \{\} \;
 
 # run wmc_tool
-"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c"  >> /dev/null
-"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null
+"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c"  >> /dev/null &
+"tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null &
 # ISAR post-renderer and lc3plus sources only need to be instrumented in float code
 if [ "$PROJECT" = "FLOAT" ]; then
-    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null
-    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null
+    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null &
+    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null &
 else
-    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null
+    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null &
 fi
+wait
 
 # automatically enable #define WMOPS in options.h
 sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*WMOPS\)[[:space:]]*\*\//\1/g" $targetdir/lib_com/options.h
-- 
GitLab


From 646881a4a5d3abe8619dd257a6e3b4286a85ea68 Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Mon, 12 Aug 2024 14:02:34 +0200
Subject: [PATCH 2/2] avoid running WMC tool on directories in parallel

---
 scripts/prepare_instrumentation.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh
index 5c3881bb8b..61993ec585 100755
--- a/scripts/prepare_instrumentation.sh
+++ b/scripts/prepare_instrumentation.sh
@@ -189,9 +189,10 @@ find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(u
 # run wmc_tool
 "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/encoder.c" "$targetdir/lib_enc/*.c" "$targetdir/lib_com/*.c"  >> /dev/null &
 "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null &
+wait
 # ISAR post-renderer and lc3plus sources only need to be instrumented in float code
 if [ "$PROJECT" = "FLOAT" ]; then
-    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null &
+    "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null
     "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/isar_post_rend.c" "$targetdir/lib_isar/*.c" "$targetdir/lib_lc3plus/*.c" "$targetdir/lib_lc3plus/fft/*.c" >> /dev/null &
 else
     "tools/$system/wmc_tool" $wmc_opt -m "$targetdir/apps/renderer.c" "$targetdir/lib_rend/*.c" >> /dev/null &
-- 
GitLab