From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59820C6FD1D for ; Tue, 4 Apr 2023 17:12:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232011AbjDDRMD (ORCPT ); Tue, 4 Apr 2023 13:12:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231750AbjDDRMC (ORCPT ); Tue, 4 Apr 2023 13:12:02 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AC41B5 for ; Tue, 4 Apr 2023 10:12:01 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-54629ed836aso192694477b3.10 for ; Tue, 04 Apr 2023 10:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680628320; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=GOgT1sPETj0q8HMl3FDDjzVshKnjlllm3myIaWYsAM8=; b=BYBxqbK2pUllPRrLNmM5XjfLeYeLPgW9BpbWzuu/eplCiVAJTvhoifRPPnINbdOBXM Bv0dQ0LKJep9TBIEjwA+CRf2ut3voBdXAsH4shFzn/MzH3yYH9e7/dAPIT/N97sAdwLM 3Hp4ln4eViOtBxKwuKRME+2OS2auQy1vlG9Im6bBgrCv12DwEUW+hzYuMZySqf3Vg2vG BQy35vV0su10XaBfNSVWyqaRLEFXujrxqcSdBls47E7shPzwX0T+VwRL41+Y49EcOre6 dtYd4WiFMxTyPmmw9PupmLtJqcRQXpS+7kxgvFhiMVDUndVsn7Psmute16dqIbenB1lP zBMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680628320; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GOgT1sPETj0q8HMl3FDDjzVshKnjlllm3myIaWYsAM8=; b=WvOWjAYO74MUej9lDhWg5QKOUI4+rthtLrMqPQt+S77tujci4JKF5k3cWrsANVv3w7 L8UwWPTVnRkZMA4OQX3dilug+iwqPkVSKHtmkxrgwapbD0D/jduPQjiVSVx87mi1OO+m 2+Ocb7f7OcIZl4m6Zb5S8JBLalxdMK28h2n4t0OyVNkqlSBzz3tkofashsW2gGXvXNfA QFkxWnKNnvfGHmULChoTFt5BDZjDvNXZ7kcyDG5Zv/ExJ/5xPmDBuLaZmwUFX2oVGujd GRKFC0tvDJvOFyt7NYegvViWgP7Wo4oepq7lXJklWrsQ8CdEjBDZrAv655QZOtIT+XFi uggQ== X-Gm-Message-State: AAQBX9diFYch0VZWIWKpbN3UD0nuC45sO5bkFaBy3pR0/iGzGh1SPM2L fXs9OME3G3/RmkMA1FemBI65fpSDWbz0 X-Google-Smtp-Source: AKy350aHB55zg30TbIzYb6EGEfJlq5BclAuDczTKHnBOT8GBOsqGlnfxujWMcePnaQu6BAgTrHIPniAeG1fp X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:a051:e074:d6f:dc29]) (user=irogers job=sendgmr) by 2002:a25:d406:0:b0:b7d:4c96:de0 with SMTP id m6-20020a25d406000000b00b7d4c960de0mr2002396ybf.5.1680628320495; Tue, 04 Apr 2023 10:12:00 -0700 (PDT) Date: Tue, 4 Apr 2023 10:11:44 -0700 Message-Id: <20230404171146.2018616-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v1 1/3] perf test: Write CSV output to a file From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Claire Jensen , Thomas Richter , Sumanth Korikkar , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Write the CSV output to a file, then sanity check this output. This avoids problems with debug/warning/error output corrupting the file format. Signed-off-by: Ian Rogers --- tools/perf/tests/shell/stat+csv_output.sh | 58 ++++++++++++++++------- 1 file changed, 42 insertions(+), 16 deletions(-) diff --git a/tools/perf/tests/shell/stat+csv_output.sh b/tools/perf/tests/shell/stat+csv_output.sh index 324fc9e6edd7..929c83977fa9 100755 --- a/tools/perf/tests/shell/stat+csv_output.sh +++ b/tools/perf/tests/shell/stat+csv_output.sh @@ -9,6 +9,20 @@ set -e skip_test=0 csv_sep=@ +stat_output=$(mktemp /tmp/__perf_test.stat_output.XXXXX.csv) + +cleanup() { + rm -f "${stat_output}" + + trap - EXIT TERM INT +} + +trap_cleanup() { + cleanup + exit 1 +} +trap trap_cleanup EXIT TERM INT + function commachecker() { local -i cnt=0 @@ -30,9 +44,11 @@ function commachecker() while read line do - # Check for lines beginning with Failed - x=${line:0:6} - [ "$x" = "Failed" ] && continue + # Ignore initial "started on" comment. + x=${line:0:1} + [ "$x" = "#" ] && continue + # Ignore initial blank line. + [ "$line" = "" ] && continue # Count the number of commas x=$(echo $line | tr -d -c $csv_sep) @@ -42,7 +58,7 @@ function commachecker() echo "wrong number of fields. expected $exp in $line" 1>&2 exit 1; } - done + done < "${stat_output}" return 0 } @@ -55,7 +71,8 @@ function ParanoidAndNotRoot() check_no_args() { echo -n "Checking CSV output: no args " - perf stat -x$csv_sep true 2>&1 | commachecker --no-args + perf stat -x$csv_sep -o "${stat_output}" true + commachecker --no-args echo "[Success]" } @@ -67,27 +84,29 @@ check_system_wide() echo "[Skip] paranoid and not root" return fi - perf stat -x$csv_sep -a true 2>&1 | commachecker --system-wide + perf stat -x$csv_sep -a -o "${stat_output}" true + commachecker --system-wide echo "[Success]" } check_system_wide_no_aggr() { - echo -n "Checking CSV output: system wide " + echo -n "Checking CSV output: system wide no aggregation " if ParanoidAndNotRoot 0 then echo "[Skip] paranoid and not root" return fi - echo -n "Checking CSV output: system wide no aggregation " - perf stat -x$csv_sep -A -a --no-merge true 2>&1 | commachecker --system-wide-no-aggr + perf stat -x$csv_sep -A -a --no-merge -o "${stat_output}" true + commachecker --system-wide-no-aggr echo "[Success]" } check_interval() { echo -n "Checking CSV output: interval " - perf stat -x$csv_sep -I 1000 true 2>&1 | commachecker --interval + perf stat -x$csv_sep -I 1000 -o "${stat_output}" true + commachecker --interval echo "[Success]" } @@ -95,7 +114,8 @@ check_interval() check_event() { echo -n "Checking CSV output: event " - perf stat -x$csv_sep -e cpu-clock true 2>&1 | commachecker --event + perf stat -x$csv_sep -e cpu-clock -o "${stat_output}" true + commachecker --event echo "[Success]" } @@ -107,7 +127,8 @@ check_per_core() echo "[Skip] paranoid and not root" return fi - perf stat -x$csv_sep --per-core -a true 2>&1 | commachecker --per-core + perf stat -x$csv_sep --per-core -a -o "${stat_output}" true + commachecker --per-core echo "[Success]" } @@ -119,7 +140,8 @@ check_per_thread() echo "[Skip] paranoid and not root" return fi - perf stat -x$csv_sep --per-thread -a true 2>&1 | commachecker --per-thread + perf stat -x$csv_sep --per-thread -a -o "${stat_output}" true + commachecker --per-thread echo "[Success]" } @@ -131,7 +153,8 @@ check_per_die() echo "[Skip] paranoid and not root" return fi - perf stat -x$csv_sep --per-die -a true 2>&1 | commachecker --per-die + perf stat -x$csv_sep --per-die -a -o "${stat_output}" true + commachecker --per-die echo "[Success]" } @@ -143,7 +166,8 @@ check_per_node() echo "[Skip] paranoid and not root" return fi - perf stat -x$csv_sep --per-node -a true 2>&1 | commachecker --per-node + perf stat -x$csv_sep --per-node -a -o "${stat_output}" true + commachecker --per-node echo "[Success]" } @@ -155,7 +179,8 @@ check_per_socket() echo "[Skip] paranoid and not root" return fi - perf stat -x$csv_sep --per-socket -a true 2>&1 | commachecker --per-socket + perf stat -x$csv_sep --per-socket -a -o "${stat_output}" true + commachecker --per-socket echo "[Success]" } @@ -202,4 +227,5 @@ then else echo "[Skip] Skipping tests for system_wide_no_aggr, per_core, per_die and per_socket since socket id exposed via topology is invalid" fi +cleanup exit 0 -- 2.40.0.348.gf938b09366-goog