test: PC10 residency and resume time

ekurdybx · ekurdybx · commit d0acf87e2677 · 2025-11-12T15:31:05.000+01:00
Signed-off-by: Emilia Kurdybelska &lt;emiliax.kurdybelska@intel.com&gt;
diff --git a/test-case/check-suspend-resume.sh b/test-case/check-suspend-resume.sh
@@ -26,27 +26,33 @@ source "$TOPDIR"/case-lib/lib.sh
 random_min=3    # wait time should >= 3 for other device wakeup from sleep
 random_max=20
 
-OPT_NAME['l']='loop'     OPT_DESC['l']='loop count'
-OPT_HAS_ARG['l']=1       OPT_VAL['l']=5
+OPT_NAME['l']='loop'                   OPT_DESC['l']='loop count'
+OPT_HAS_ARG['l']=1                     OPT_VAL['l']=5
 
-OPT_NAME['T']='type'     OPT_DESC['T']="suspend/resume type from /sys/power/mem_sleep"
-OPT_HAS_ARG['T']=1       OPT_VAL['T']=""
+OPT_NAME['T']='type'                   OPT_DESC['T']="suspend/resume type from /sys/power/mem_sleep"
+OPT_HAS_ARG['T']=1                     OPT_VAL['T']=""
 
-OPT_NAME['S']='sleep'    OPT_DESC['S']='suspend/resume command:rtcwake sleep duration'
-OPT_HAS_ARG['S']=1       OPT_VAL['S']=5
+OPT_NAME['S']='sleep'                  OPT_DESC['S']='suspend/resume command:rtcwake sleep duration'
+OPT_HAS_ARG['S']=1                     OPT_VAL['S']=5
 
-OPT_NAME['u']='unload-audio'  OPT_DESC['u']='unload audio modules for the test'
-OPT_HAS_ARG['u']=0            OPT_VAL['u']=0
+OPT_NAME['u']='unload-audio'           OPT_DESC['u']='unload audio modules for the test'
+OPT_HAS_ARG['u']=0                     OPT_VAL['u']=0
 
-OPT_NAME['w']='wait'     OPT_DESC['w']='idle time after suspend/resume wakeup'
-OPT_HAS_ARG['w']=1       OPT_VAL['w']=5
+OPT_NAME['w']='wait'                   OPT_DESC['w']='idle time after suspend/resume wakeup'
+OPT_HAS_ARG['w']=1                     OPT_VAL['w']=5
 
-OPT_NAME['r']='random'   OPT_DESC['r']="Randomly setup wait/sleep time, range is [$random_min-$random_max], this option will overwrite s & w option"
-OPT_HAS_ARG['r']=0       OPT_VAL['r']=0
+OPT_NAME['r']='random'                 OPT_DESC['r']="Randomly setup wait/sleep time, range is [$random_min-$random_max], this option will overwrite s & w option"
+OPT_HAS_ARG['r']=0                     OPT_VAL['r']=0
 
 # processid is set by check-suspend-resume-with-audio.sh for audio test case
-OPT_NAME['p']='processid'     OPT_DESC['p']='Fail immediately if this process dies'
-OPT_HAS_ARG['p']=1            OPT_VAL['p']=''
+OPT_NAME['p']='processid'              OPT_DESC['p']='Fail immediately if this process dies'
+OPT_HAS_ARG['p']=1                     OPT_VAL['p']=''
+
+OPT_NAME['tt']='times-thresholds'      OPT_DESC['tt']='sleepgraph thresholds'
+OPT_HAS_ARG['tt']=1                    OPT_VAL['tt']=''
+
+OPT_NAME['st']='states-thresholds'     OPT_DESC['st']='power states min % values'
+OPT_HAS_ARG['st']=1                    OPT_VAL['st']=''
 
 func_opt_parse_option "$@"
 func_lib_check_sudo
@@ -172,20 +178,45 @@ main()
 
 analyze_sleepgraph_results()
 {
-    dlogi "TODO: Analyze sleepgraph results..."
+    dlogi "Analyzing sleepgraph results"
     results_file=$(ls suspend-* | grep html)
-    
+    thresholds=${OPT_VAL['tt']}
+
+    dlogi "Analyzing $results_file file..."
+    if python3 "$SCRIPT_HOME"/tools/analyze-sleepgraph-results.py "$results_file" "$thresholds"; then
+        dlogi "All times measurements within the thresholds"
+        return 0
+    else
+        dlogw "Time measurements not within the thresholds!"
+        return 1
+    fi
+}
+
+analyze_powertop_results()
+{
+    dlogi "Analyzing powertop results"
+    results_file=$(ls suspend-* | grep html)
+    thresholds=${OPT_VAL['st']}
+
+    dlogi "Analyzing $results_file file..."
+    if python3 "$SCRIPT_HOME"/tools/analyze-powertop-results.py "$results_file" "$thresholds"; then
+        dlogi "All times measurements within the thresholds"
+        return 0
+    else
+        dlogw "Time measurements not within the thresholds!"
+        return 1
+    fi
 }
 
 run_rtcwake()
 {
     if [[ "$RUN_SLEEPGRAPH" == true ]]; then
-        # Remove old sleepgraph results directories
-        sudo rm -rf suspend-*
         dlogc "Run the command: $SLEEPGRAPH_PATH -rtcwake ${sleep_lst[$i]} -m freeze" #TODO: change it back to mem
+        sudo powertop --csv="$log_dir"/powertop.csv -w "$HOME/pm-graph/sleepgraph.py -rtcwake 5 -m freeze"
         sudo "$SLEEPGRAPH_PATH" -rtcwake "${sleep_lst[$i]}" -m freeze ||
             dump_and_die "rtcwake returned $?"
         analyze_sleepgraph_results
+
     else
         dlogc "Run the command: rtcwake -m mem -s ${sleep_lst[$i]}"
         sudo rtcwake -m mem -s "${sleep_lst[$i]}" ||
diff --git a/test-case/test-socwatch.sh b/test-case/test-socwatch.sh
@@ -38,7 +38,7 @@ OPT_NAME['u']='unload-audio'  OPT_DESC['u']='unload audio modules for the test'
 OPT_HAS_ARG['u']=0            OPT_VAL['u']=0
 
 : "${SOCWATCH_PATH:=$HOME/socwatch}"
-SOCWATCH_VERSION=$("$SOCWATCH_PATH"/socwatch --version |grep Version)
+SOCWATCH_VERSION=$(sudo "$SOCWATCH_PATH"/socwatch --version |grep Version)
 
 # reference cmd: sudo ./socwatch -t 20 -s 5 -f cpu-cstate -f pkg-pwr -o fredtest5
 #SOCWATCH_CMD="./socwatch"
@@ -57,41 +57,57 @@ check_socwatch_module_loaded()
     lsmod | grep -q socwatch || dlogi "socwatch is not loaded"
 }
 
+check_for_PC10_state()
+{
+    pc10_count=$(awk '/Package C-State Summary: Entry Counts/{f=1; next} f && /PC10/{print $3; exit}' $socwatch_output.csv)
+    if [ -z "$pc10_count" ]; then
+        die "PC10 State not achieved"
+    fi
+    dlogi "Entered into PC10 State $pc10_count times"
+
+    pc10_per=$(awk '/Package C-State Summary: Residency/{f=1; next} f && /PC10/{print $3; exit}' $socwatch_output.csv)
+    pc10_time=$(awk '/Package C-State Summary: Residency/{f=1; next} f && /PC10/{print $5; exit}' $socwatch_output.csv)
+    dlogi "Spent $pc10_time ms ($pc10_per %) in PC10 State"
+
+    json_str=$( jq -n \
+                --arg id "$i" \
+                --arg cnt "$pc10_count" \
+                --arg time "$pc10_time" \
+                --arg per "$pc10_per" \
+                '{$id: {pc10_entires_count: $cnt, time_ms: $time, time_percentage: $per}}' )
+
+    results=$(jq --slurp 'add' <(echo "$results") <(echo "$json_str"))
+}
+
 socwatch_test_once()
 {
     local i="$1"
     dlogi "===== Loop($i/$loop_count) ====="
     dlogi "SoCWatch version: ${SOCWATCH_VERSION}"
 
+    socwatch_output="$LOG_ROOT/socwatch-results/socwatch_output_$i"
+
     # set up checkpoint for each iteration
     setup_kernel_check_point
 
-    # load socwatch module, if the module is loaded, go ahead with the testing (-q)
-    sudo "$SOCWATCH_PATH"/drivers/insmod-socwatch -q || true
-    check_socwatch_module_loaded || die "socwatch module not loaded"
-
     ( set -x
-      sudo "$SOCWATCH_PATH"/socwatch -t "$duration" -s "$wait_time" "${SOCWATCH_FEATURE_PARAMS[@]}" -o "$SOCWATCH_PATH/sofsocwatch-$i" ) ||
+      sudo "$SOCWATCH_PATH"/socwatch -m -f sys -f cpu -f cpu-hw -f pcie -f hw-cpu-cstate \
+      -f pcd-slps0 -f tcss-state -f tcss -f pcie-lpm -n 200 -t "$duration" -s "$wait_time" \
+      -r json -o "$socwatch_output" ) ||
     die "socwatch returned $?"
 
-    # filter output and copy to log directory
-    grep "Package C-State Summary: Residency" -B 8 -A 11 "$SOCWATCH_PATH/sofsocwatch-$i.csv" | tee "$SOCWATCH_PATH/socwatch-$i.txt"
-    grep "Package Power Summary: Average Rate" -B 6 -A 4 "$SOCWATCH_PATH/sofsocwatch-$i.csv" | tee -a "$SOCWATCH_PATH/socwatch-$i.txt"
-    # zip original csv report
-    gzip "$SOCWATCH_PATH/sofsocwatch-$i.csv"
-    mv "$SOCWATCH_PATH/socwatch-$i.txt" "$SOCWATCH_PATH/sofsocwatch-$i.csv.gz" "$LOG_ROOT"/
+    # analyze SoCWatch results
+    check_for_PC10_state
 
-    dlogi "Check for the kernel log status"
     # check kernel log for each iteration to catch issues
+    dlogi "Check for the kernel log status"
     sof-kernel-log-check.sh "$KERNEL_CHECKPOINT" || die "Caught error in kernel log"
-
-    # unload socwatch module
-    sudo "$SOCWATCH_PATH"/drivers/rmmod-socwatch || true
 }
 
-main()
+unload_modules()
 {
-    local keep_modules=true already_unloaded=false
+    keep_modules=true
+    already_unloaded=false
 
     [ -d "$SOCWATCH_PATH" ] ||
         die "SOCWATCH not found in SOCWATCH_PATH=$SOCWATCH_PATH"
@@ -108,20 +124,44 @@ main()
 
     $already_unloaded || $keep_modules || "$TOPDIR"/tools/kmod/sof_remove.sh ||
         die "Failed to unload audio drivers"
+}
+
+load_modules()
+{
+    $already_unloaded || $keep_modules || "$TOPDIR"/tools/kmod/sof_insert.sh ||
+        die "Failed to reload audio drivers"
+    sof-kernel-log-check.sh "$KERNEL_CHECKPOINT" ||
+        die "Found kernel error after reloading audio drivers"
+}
+
+run_socwatch_tests()
+{
+    # load socwatch module, if the module is loaded, go ahead with the testing
+    sudo "$SOCWATCH_PATH"/drivers/insmod-socwatch || true
+    check_socwatch_module_loaded || die "socwatch module not loaded"
+
+    mkdir "$LOG_ROOT/socwatch-results"
+    pc10_results_file="$LOG_ROOT/socwatch-results/pc10_results.json"
+    touch "$pc10_results_file"
 
-    # socwatch test from here
     for i in $(seq 1 "$loop_count")
     do
         socwatch_test_once "$i"
     done
+    echo "$results" > "$pc10_results_file"
 
-    $already_unloaded || $keep_modules || "$TOPDIR"/tools/kmod/sof_insert.sh ||
-        die "Failed to reload audio drivers"
-    sof-kernel-log-check.sh "$KERNEL_CHECKPOINT" ||
-        die "Found kernel error after reloading audio drivers"
+    # zip all SoCWatch reports
+    tar -zcvf "$LOG_ROOT/socwatch-results.tar.gz" "$LOG_ROOT/socwatch-results/"
 
-    # DON"T delete socwatch directory after test, delete before new test
-    # rm -rf $SOCWATCH_PATH
+    # unload socwatch module
+    sudo "$SOCWATCH_PATH"/drivers/rmmod-socwatch
+}
+
+main()
+{
+    unload_modules
+    run_socwatch_tests
+    load_modules
 }
 
 main "$@"
diff --git a/tools/analyze-powertop-results.py b/tools/analyze-powertop-results.py
@@ -1,49 +1,41 @@
-from bs4 import BeautifulSoup
 import re
 import sys
 import json
 
-ACCEPTANCE_RANGE=0.2
-
-
-def analyze_powertop_file(file, thresholds):
-    with open(file, 'r', encoding='utf-8') as f:
-        soup = BeautifulSoup(f, 'lxml')
-        complete_results={}
-        test_passed=True
-
-        components=thresholds.keys()
-        for component in components:
-            results = {}
-            divs = soup.find_all("div", title=lambda t: t and component in t)
-
-            for div in divs:
-                title = div.get('title')
-                # print(title)
-                match = re.search(r'\((\d+(?:\.\d+)?)\s*ms\)\s+(\S+)$', title)
-                if match:
-                    time_ms = float(match.group(1))
-                    measurement_name = match.group(2)
-                    if measurement_name in thresholds[component]:
-                        results[measurement_name] = {"value": time_ms, "pass": True}
-                        threshold = float(thresholds[component][measurement_name])
-                        if time_ms<(threshold * (1-acceptance_range)) and time_ms>(threshold * (1+acceptance_range)):
-                            results[measurement_name]["pass"] = False
-                            test_passed = False
-
-        complete_results[component]=results
-
-    print(complete_results)
-    return test_passed, complete_results
-    
+
+def analyze_powertop_file(filename, thresholds):
+    results={}
+    test_passed=True
+    regex_pattern = r'^\s*C\d+;\s*\d+(\.\d+)?%$'  # Search for lines like: C1; 0,5%
+
+    with open(filename, "r", encoding="utf-8") as f:
+        for line in f:
+            if re.match(regex_pattern, line):
+                text = line.strip().split("; ")
+                power_state = text[0]
+                percentage = float(text[1].strip("%"))
+                results[power_state] = {"percentage_value": percentage}
+                print(f"{power_state}: {percentage}%")
+                if power_state in thresholds:
+                    results[power_state] = {"percentage_value": percentage, "pass": True}
+                    if percentage < float(thresholds[power_state].strip("%")):
+                        results[power_state]["pass"] = False
+                        test_passed = False
+                        
+
+        print(results)
+        return test_passed, results 
+
+
 
 if __name__ == "__main__":
     if len(sys.argv) != 3:
         print("Incorrect args. Usage: python3 analyze-powertop-results.py <path_to_csv_file> <expected_pc10_%")
         sys.exit(1)
 
     filename = sys.argv[1]
-    threshold = sys.argv[2]
+    thresholds = json.loads(sys.argv[2])
     
-    test_passed, results = analyze_powertop_file(filename, threshold)
+    test_passed, results = analyze_powertop_file(filename, thresholds)
+    print(f"Powertop report analysis passed: {test_passed}")
     sys.exit(0 if test_passed else 1)
diff --git a/tools/analyze-sleepgraph-results.py b/tools/analyze-sleepgraph-results.py
@@ -19,7 +19,6 @@ def analyze_sleepgraph_file(file, thresholds, acceptance_range=ACCEPTANCE_RANGE)
 
             for div in divs:
                 title = div.get('title')
-                # print(title)
                 match = re.search(r'\((\d+(?:\.\d+)?)\s*ms\)\s+(\S+)$', title)
                 if match:
                     time_ms = float(match.group(1))
@@ -33,8 +32,8 @@ def analyze_sleepgraph_file(file, thresholds, acceptance_range=ACCEPTANCE_RANGE)
 
         complete_results[component]=results
 
-    print(complete_results)
-    return test_passed, complete_results
+        print(complete_results)
+        return test_passed, complete_results
     
 
 if __name__ == "__main__":
@@ -46,4 +45,5 @@ def analyze_sleepgraph_file(file, thresholds, acceptance_range=ACCEPTANCE_RANGE)
     thresholds = json.loads(sys.argv[2])
     
     test_passed, results = analyze_sleepgraph_file(sleepgraph_file, thresholds)
+    print(f"Sleepgraph report analysis passed: {test_passed}")
     sys.exit(0 if test_passed else 1)
