From f81cd2f3e2e500a6e44edc4fb6166201c89c98d3 Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Tue, 13 Oct 2020 11:27:26 +0200
Subject: [PATCH] make/check_so_deps: Speed up the confirm_deps()

Instead of iterating over each symbol, create a regex group including
all the symbols to lookup and pass it to grep.

Also, refactor some small pieces:
 - filter event_ dependencies within import_libs_deps_mk()
 - convert SPDK_LIBS to an array built up with extglob
 - drop DEP_LIBS
 - drop missing_syms (unused)

The overall improvement (this covers the execution of the subshell
within which confirm_deps() is called for each .so):

real    1m23.688s
user    4m16.196s
sys     8m3.110s

real    0m3.537s
user    0m13.450s
sys     0m18.486s

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Id61c5f947cd116e0fa0107cc7c941beb2c0bdcb4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4632
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 test/make/check_so_deps.sh | 50 +++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh
index 0d6e29d60..76a077b50 100755
--- a/test/make/check_so_deps.sh
+++ b/test/make/check_so_deps.sh
@@ -179,7 +179,8 @@ function import_libs_deps_mk() {
 			fun_mk=${dep_mk//@('$('|')')/}
 			if [[ $fun_mk != "$dep_mk" ]]; then
 				eval "${fun_mk}() { echo \$$fun_mk ; }"
-			elif ((IGNORED_LIBS["$dep_mk"] == 1)); then
+			# Ignore any event_* dependencies. Those are based on the subsystem configuration and not readelf.
+			elif ((IGNORED_LIBS["$dep_mk"] == 1)) || [[ $dep_mk =~ event_ ]]; then
 				continue
 			fi
 			eval "$var_mk=\${$var_mk:+\$$var_mk }$dep_mk"
@@ -188,38 +189,28 @@ function import_libs_deps_mk() {
 }
 
 function confirm_deps() {
-	lib=$1
-	missing_syms=()
-	dep_names=()
-	found_symbol_lib=""
+	local lib=$1 deplib lib_shortname
 
 	lib_shortname=$(get_lib_shortname "$lib")
 	lib_make_deps=(${!lib_shortname})
 
-	symbols=$(readelf -s --wide $lib | grep -E "NOTYPE.*GLOBAL.*UND" | awk '{print $8}' | sort | uniq)
-	for symbol in $symbols; do
-		for deplib in $DEP_LIBS; do
-			if [ "$deplib" == "$lib" ]; then
-				continue
-			fi
-			found_symbol=$(readelf -s --wide $deplib | grep -E "DEFAULT\s+[0-9]+\s$symbol$") || true
-			if [ "$found_symbol" != "" ]; then
-				found_symbol_lib=$(get_lib_shortname "$deplib")
-				break
+	symbols=($(readelf -s --wide "$lib" | grep -E "NOTYPE.*GLOBAL.*UND" | awk '{print $8}' | sort -u))
+	symbols_regx=$(
+		IFS="|"
+		echo "(${symbols[*]})"
+	)
+
+	if ((${#symbols[@]} > 0)); then
+		for deplib in "$libdir/"libspdk_!("$lib_shortname").so; do
+			readelf -s --wide "$deplib" | grep -m1 -qE "DEFAULT\s+[0-9]+\s$symbols_regx$" || continue
+			found_symbol_lib=$(get_lib_shortname "$deplib")
+			# Ignore the env_dpdk readelf dependency. We don't want people explicitly linking against it.
+			if [[ $found_symbol_lib != *env_dpdk* ]]; then
+				dep_names+=("$found_symbol_lib")
 			fi
 		done
-		if [ "$found_symbol" == "" ]; then
-			missing_syms+=("$symbol")
-		else
-			dep_names+=("$found_symbol_lib")
-		fi
-	done
-	IFS=$'\n'
-	# Ignore any event_* dependencies. Those are based on the subsystem configuration and not readelf.
-	lib_make_deps=($(printf "%s\n" "${lib_make_deps[@]}" | sort | grep -v "event_"))
-	# Ignore the env_dpdk readelf dependency. We don't want people explicitly linking against it.
-	dep_names=($(printf "%s\n" "${dep_names[@]}" | sort | uniq | grep -v "env_dpdk"))
-	unset IFS
+	fi
+
 	diff=$(echo "${dep_names[@]}" "${lib_make_deps[@]}" | tr ' ' '\n' | sort | uniq -u)
 	if [ "$diff" != "" ]; then
 		touch $fail_file
@@ -258,8 +249,7 @@ echo "---------------------------------------------------------------------"
 # users can define their own environment abstraction. However we do want to still check it
 # for dependencies to avoid printing out a bunch of confusing symbols under the missing
 # symbols section.
-SPDK_LIBS=$(ls -1 $libdir/libspdk_*.so | grep -v libspdk_env_dpdk.so)
-DEP_LIBS=$(ls -1 $libdir/libspdk_*.so)
+SPDK_LIBS=("$libdir/"libspdk_!(env_dpdk).so)
 
 declare -A IGNORED_LIBS=()
 if grep -q 'CONFIG_VHOST_INTERNAL_LIB?=n' $rootdir/mk/config.mk; then
@@ -271,7 +261,7 @@ fi
 
 (
 	import_libs_deps_mk
-	for lib in $SPDK_LIBS; do confirm_deps $lib & done
+	for lib in "${SPDK_LIBS[@]}"; do confirm_deps "$lib" & done
 	wait
 )