diff --git a/ifs/ifs_common.sh b/ifs/ifs_common.sh index ad7d6a10..5e06f42a 100755 --- a/ifs/ifs_common.sh +++ b/ifs/ifs_common.sh @@ -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 @@ -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" & diff --git a/ifs/ifs_tests.sh b/ifs/ifs_tests.sh index 379897bb..3b2fb938 100755 --- a/ifs/ifs_tests.sh +++ b/ifs/ifs_tests.sh @@ -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 @@ -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}"