Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1106 ifs #130

Merged
merged 2 commits into from
Nov 9, 2023
+8 −6
Merged

1106 ifs #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d58651
ifs_common.sh: fix the atom core judgement problem
xupengfe Nov 6, 2023
5ffe129
ifs: skip ATOM offline CPU and scan sibling CPU tests and add interva…
xupengfe Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ifs/ifs_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,14 @@ cpuid_check_atom() {
cpu_num=$(grep -c "processor" /proc/cpuinfo)
cpu_id=$((cpu_num - 1))
# Check if CPU0 is ATOM
[[ $(taskset -c 0 "$cpu_check" 1a 0 0 0 a 29) ]] || {
taskset -c 0 "$cpu_check" 1a 0 0 0 a 29 && {
test_print_trc "CPU0 CPUID(EAX=0x1a),EAX bit29 is 1:ATOM"
IS_ATOM="$TRUE"
return 0
}

# Check max CPU ID is ATOM
[[ $(taskset -c "$cpu_id" "$cpu_check" 1a 0 0 0 a 29) ]] || {
taskset -c "$cpu_id" "$cpu_check" 1a 0 0 0 a 29 && {
test_print_trc "CPU num:$cpu_id CPUID(EAX=0x1a),EAX bit29 is 1:ATOM"
IS_ATOM="$TRUE"
return 0
Expand Down Expand Up @@ -974,6 +974,8 @@ ifs_scan_loop() {

for ((i=1; i<=times; i++)); do
test_print_trc "Scan loop times:$i"
# SPEC: Target 100ms at lowest frequency for all test content on a given core.
sleep 0.1
# If there is bin app, execute the app in target CPU
[[ -n "$bin" ]] && {
taskset -c "$cpu_num" "$bin" &
Expand Down
8 changes: 4 additions & 4 deletions ifs/ifs_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ run_ifs_tests() {
;;
legacy_twice_run)
online_all_cpu
modprobe -r "$IFS_NAME"
enable_ifs_trace
do_cmd "echo $BATCH_NUM > ${IFS_PATH}/${BATCH}"
# Need to wait after boot up 1800s, then could test ifs
Expand Down Expand Up @@ -132,13 +133,12 @@ run_ifs_tests() {
;;
"$IFS_OFFLINE")
online_all_cpu
enable_ifs_trace
is_atom
[[ "$IS_ATOM" == "$TRUE" ]] && {
if [[ "$BATCH_NUM" -eq 3 ]]; then
skip_test "It's an atom CPU, no sibling CPU for ifs testing."
fi
skip_test "It's an atom CPU, no sibling CPU for ifs testing."
}
modprobe -r "$IFS_NAME"
enable_ifs_trace
do_cmd "echo $BATCH_NUM > ${IFS_PATH}/${BATCH}"
init_log "${NAME}_${BATCH_NUM}"

Expand Down
Loading