Skip to content

Commit 978fa45

Browse files
mtharu@qti.qualcomm.comquic-mtharu
authored andcommitted
Fastrpc Test: Eliminate architecture dependency and execute on default architecture.
1 parent f91f6d5 commit 978fa45

File tree

1 file changed

+5
-19
lines changed
  • Runner/suites/Multimedia/CDSP/fastrpc_test

1 file changed

+5
-19
lines changed

Runner/suites/Multimedia/CDSP/fastrpc_test/run.sh

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ RESULT_FILE="$TESTNAME.res"
3333
# Defaults
3434
REPEAT=1
3535
TIMEOUT=""
36-
ARCH=""
3736
BIN_DIR="" # optional: where fastrpc_test lives
3837
ASSETS_DIR="" # optional: parent containing linux/ etc
3938
VERBOSE=0
@@ -43,7 +42,6 @@ usage() {
4342
Usage: $0 [OPTIONS]
4443
4544
Options:
46-
--arch <name> Architecture (auto-detected if omitted)
4745
--bin-dir <path> Directory containing 'fastrpc_test' binary
4846
--assets-dir <path> Directory that CONTAINS 'linux/' (run from here if present)
4947
--repeat <N> Number of test repetitions (default: 1)
@@ -61,7 +59,6 @@ EOF
6159
# Parse arguments
6260
while [ $# -gt 0 ]; do
6361
case "$1" in
64-
--arch) ARCH="$2"; shift 2 ;;
6562
--bin-dir) BIN_DIR="$2"; shift 2 ;;
6663
--assets-dir) ASSETS_DIR="$2"; shift 2 ;;
6764
--repeat) REPEAT="$2"; shift 2 ;;
@@ -105,17 +102,6 @@ fi
105102
BINDIR="$(dirname "$FASTBIN")"
106103
log_info "Binary: $FASTBIN"
107104

108-
# ---------- Arch detection if needed ----------
109-
if [ -z "$ARCH" ]; then
110-
soc="$(cat /sys/devices/soc0/soc_id 2>/dev/null || echo "unknown")"
111-
case "$soc" in
112-
498) ARCH="v68" ;;
113-
676|534) ARCH="v73" ;;
114-
606) ARCH="v75" ;;
115-
*) log_warn "Unknown SoC ID: $soc; defaulting to 'v68'"; ARCH="v68" ;;
116-
esac
117-
fi
118-
119105
# ---------- Buffering tool availability ----------
120106
HAVE_STDBUF=0; command -v stdbuf >/dev/null 2>&1 && HAVE_STDBUF=1
121107
HAVE_SCRIPT=0; command -v script >/dev/null 2>&1 && HAVE_SCRIPT=1
@@ -198,7 +184,7 @@ LOG_ROOT="./logs_${TESTNAME}_${TS}"
198184
mkdir -p "$LOG_ROOT" || { log_error "Cannot create $LOG_ROOT"; echo "$TESTNAME : FAIL" >"$RESULT_FILE"; exit 1; }
199185

200186
tmo_label="none"; [ -n "$TIMEOUT" ] && tmo_label="${TIMEOUT}s"
201-
log_info "Arch: $ARCH | Repeats: $REPEAT | Timeout: $tmo_label | Buffering: $buf_label"
187+
log_info "Repeats: $REPEAT | Timeout: $tmo_label | Buffering: $buf_label"
202188
log_debug "Run dir: $RESOLVED_RUN_DIR | PATH=$PATH"
203189

204190
# ---------- Run loop ----------
@@ -216,23 +202,23 @@ while [ "$i" -le "$REPEAT" ]; do
216202
if [ $HAVE_STDBUF -eq 1 ]; then
217203
(
218204
cd "$RESOLVED_RUN_DIR" || exit 127
219-
run_with_timeout "$TIMEOUT" -- stdbuf -oL -eL "$FASTBIN" -d 3 -U 1 -t linux -a "$ARCH"
205+
run_with_timeout "$TIMEOUT" -- stdbuf -oL -eL "$FASTBIN" -d 3 -U 1 -t linux
220206
) >"$iter_log" 2>&1
221207
rc=$?
222208
elif [ $HAVE_SCRIPT -eq 1 ]; then
223209
(
224210
cd "$RESOLVED_RUN_DIR" || exit 127
225211
if [ -n "$TIMEOUT" ] && [ $HAVE_TIMEOUT -eq 1 ]; then
226-
script -q -c "timeout $TIMEOUT \"$FASTBIN\" -d 3 -U 1 -t linux -a \"$ARCH\"" /dev/null
212+
script -q -c "timeout $TIMEOUT \"$FASTBIN\" -d 3 -U 1 -t linux " /dev/null
227213
else
228-
script -q -c "\"$FASTBIN\" -d 3 -U 1 -t linux -a \"$ARCH\"" /dev/null
214+
script -q -c "\"$FASTBIN\" -d 3 -U 1 -t linux " /dev/null
229215
fi
230216
) >"$iter_log" 2>&1
231217
rc=$?
232218
else
233219
(
234220
cd "$RESOLVED_RUN_DIR" || exit 127
235-
run_with_timeout "$TIMEOUT" -- "$FASTBIN" -d 3 -U 1 -t linux -a "$ARCH"
221+
run_with_timeout "$TIMEOUT" -- "$FASTBIN" -d 3 -U 1 -t linux
236222
) >"$iter_log" 2>&1
237223
rc=$?
238224
fi

0 commit comments

Comments
 (0)