From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F20D2E859 for ; Sat, 9 Nov 2024 00:34:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112451; cv=none; b=WQUzl51ETJOFJWuOpLp996PTtJ+yAZg5voluhGwAHVz+EbMzUSweDUoxZDzxjoXVEqfkVTk/D6CMQQrHTYok8skSa7cwijyofjv28a5B+2bPRcZfvsvs+vQW89bMKYzgXBNAWrq/zJhy++Koglm2dqia6LI4psNssPOJnfaz7L4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112451; c=relaxed/simple; bh=cJXlLHhPm/MxqQ001SlGf6LhXjO0VbFH7y7+7Dv6k6s=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=aOUKvlyfUXqRmMvAkgyoA4IbOCBTGJTR9iTn8jioF7wNsn+ejjaeEDkIYeDP9pyxZie+KshWJzaNnAblJhL+49tUEHKnGocNPcv4VEUFJ5F6x3tq12KVDrWxBxUtJqoKwRWimdRzUPlGVxIbyDAHVAFvxhY54B1GN59Xflgx1VM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=e35YxJu/; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="e35YxJu/" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e59dc7df64so33957427b3.1 for ; Fri, 08 Nov 2024 16:34:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731112448; x=1731717248; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=sMRp4SArakG3qttQ7Acj4+yjGFvVzfYJdi2BB3ubp6I=; b=e35YxJu/8ONoiAqd8b44cdEqmB75Cs1vGTbpwxzw6c/JRXGPx2XHbeJw4bXGciOGRi mgyETlFn1H+k5QsKanOeMDalkZOdLLQPnJcAgtw1deugISf0SF1aUqUiOJ6SX+TRpHc8 P+RKpyOi54Jcx/dvt0vDXA8w9QYaFIzq/XamiCEDVF+kgUSYEcQtf+KXb8dpbsiajAYl XEFb0ygsYEibLk1UJn/vRJmYk8A/+J3jlurKNajHbhS7z/BjEU0F1ABa9pmvd+CyD3EJ eQ+udEunsQWXJGq4zoRAI8sY8to5CGc5GvnNw/YXMwDeBRIsExCNC2neU/KpH3usYpza hggg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731112448; x=1731717248; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sMRp4SArakG3qttQ7Acj4+yjGFvVzfYJdi2BB3ubp6I=; b=NUrt3RtA6+DpgcCZ5yKI1kYPI1srWVmOk0lOgP+LroVjzVSdzHayl29sNY2+oEtA1C +UtiBGYhc4LaNBCXA5gKE/iT9gJTkX9fwBffbEQWfhWXDQHBBwYysgjE33FKEDckg5Hn lqQMCDFz7qciWovsc0GzGHzUx+/Albit7xXvYmsFZSbHu2nbjeVrOYUZUuxGTWUSMBad a/rrVECIha1dTeKTPDyKwLfkpRWxwPL7Tf/swJJ8UMFB1AjYmK7ItCrB4xsxTUfdo0Bg OmbXFDNcVu/lNNVIaa0qQz376QwihHarQ029V0wdQUa79EUdrpzY/uR6MA0a88hqkOny Daqg== X-Forwarded-Encrypted: i=1; AJvYcCVuLvx4MgZPU1fscuaB0x9QZEyWgbU9X51znl1KR33IIiJplCsfRHKkrOyGvXh0Oj335MRNX+2zfm+v1ELZ2Hzz@vger.kernel.org X-Gm-Message-State: AOJu0YywI4foa2jsW0Ei9N1kuBFAIo6RrplYNUzKEKsIbIy3uxXvijFG 1VznoUC/HjBxRhFN1A1ujRM987hwdQ3pTs1cM3xOoCKzC1VRpsVL7qHVIoOhR+/Z7+uerSzOWXJ hVtRuWg== X-Google-Smtp-Source: AGHT+IHWSPxvpPMbsE3XQO9hnnV7WweWqhHir2An9HkzqLRz4gVpezpyygCtEd3uv2Ei/uFmPRlSzP2EJLjO X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:6fd2:1e36:6d8c:7c49]) (user=irogers job=sendgmr) by 2002:a81:c844:0:b0:6e2:c1c7:ec27 with SMTP id 00721157ae682-6eadc006feemr465077b3.1.1731112448330; Fri, 08 Nov 2024 16:34:08 -0800 (PST) Date: Fri, 8 Nov 2024 16:33:54 -0800 In-Reply-To: <20241109003358.461437-1-irogers@google.com> Message-Id: <20241109003358.461437-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241109003358.461437-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.277.g8800431eea-goog Subject: [PATCH v8 3/7] perf test: Add hwmon filename parser test From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Ravi Bangoria , Weilin Wang , Yoshihiro Furudera , James Clark , Athira Jajeev , Howard Chu , Oliver Upton , Changbin Du , Ze Gao , Junhao He , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Filename parsing maps a hwmon filename to constituent parts enum/int parts for the hwmon config value. Add a test case for the parsing. Signed-off-by: Ian Rogers --- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/hwmon_pmu.c | 110 ++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 4 files changed, 113 insertions(+) create mode 100644 tools/perf/tests/hwmon_pmu.c diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 01ed9335db4d..ec4e1f034742 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -66,6 +66,7 @@ perf-test-y += sigtrap.o perf-test-y += event_groups.o perf-test-y += symbols.o perf-test-y += util.o +perf-test-y += hwmon_pmu.o perf-test-y += tool_pmu.o ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index d2cabaa8ad92..8dcf74d3c0a3 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -71,6 +71,7 @@ static struct test_suite *generic_tests[] = { &suite__PERF_RECORD, &suite__pmu, &suite__pmu_events, + &suite__hwmon_pmu, &suite__tool_pmu, &suite__dso_data, &suite__perf_evsel__roundtrip_name_test, diff --git a/tools/perf/tests/hwmon_pmu.c b/tools/perf/tests/hwmon_pmu.c new file mode 100644 index 000000000000..f5b58486d8d3 --- /dev/null +++ b/tools/perf/tests/hwmon_pmu.c @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +#include "debug.h" +#include "hwmon_pmu.h" +#include "tests.h" +#include +#include + +static int test__parse_hwmon_filename(struct test_suite *test __maybe_unused, + int subtest __maybe_unused) +{ + const struct hwmon_parse_test { + const char *filename; + enum hwmon_type type; + int number; + enum hwmon_item item; + bool alarm; + bool parse_ok; + } tests[] = { + { + .filename = "cpu0_accuracy", + .type = HWMON_TYPE_CPU, + .number = 0, + .item = HWMON_ITEM_ACCURACY, + .alarm = false, + .parse_ok = true, + }, + { + .filename = "temp1_input", + .type = HWMON_TYPE_TEMP, + .number = 1, + .item = HWMON_ITEM_INPUT, + .alarm = false, + .parse_ok = true, + }, + { + .filename = "fan2_vid", + .type = HWMON_TYPE_FAN, + .number = 2, + .item = HWMON_ITEM_VID, + .alarm = false, + .parse_ok = true, + }, + { + .filename = "power3_crit_alarm", + .type = HWMON_TYPE_POWER, + .number = 3, + .item = HWMON_ITEM_CRIT, + .alarm = true, + .parse_ok = true, + }, + { + .filename = "intrusion4_average_interval_min_alarm", + .type = HWMON_TYPE_INTRUSION, + .number = 4, + .item = HWMON_ITEM_AVERAGE_INTERVAL_MIN, + .alarm = true, + .parse_ok = true, + }, + { + .filename = "badtype5_baditem", + .type = HWMON_TYPE_NONE, + .number = 5, + .item = HWMON_ITEM_NONE, + .alarm = false, + .parse_ok = false, + }, + { + .filename = "humidity6_baditem", + .type = HWMON_TYPE_NONE, + .number = 6, + .item = HWMON_ITEM_NONE, + .alarm = false, + .parse_ok = false, + }, + }; + + for (size_t i = 0; i < ARRAY_SIZE(tests); i++) { + enum hwmon_type type; + int number; + enum hwmon_item item; + bool alarm; + + TEST_ASSERT_EQUAL("parse_hwmon_filename", + parse_hwmon_filename( + tests[i].filename, + &type, + &number, + &item, + &alarm), + tests[i].parse_ok + ); + if (tests[i].parse_ok) { + TEST_ASSERT_EQUAL("parse_hwmon_filename type", type, tests[i].type); + TEST_ASSERT_EQUAL("parse_hwmon_filename number", number, tests[i].number); + TEST_ASSERT_EQUAL("parse_hwmon_filename item", item, tests[i].item); + TEST_ASSERT_EQUAL("parse_hwmon_filename alarm", alarm, tests[i].alarm); + } + } + return TEST_OK; +} + +static struct test_case tests__hwmon_pmu[] = { + TEST_CASE("Basic parsing test", parse_hwmon_filename), + { .name = NULL, } +}; + +struct test_suite suite__hwmon_pmu = { + .desc = "Hwmon PMU", + .test_cases = tests__hwmon_pmu, +}; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index af284dd47e5c..cb58b43aa063 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -92,6 +92,7 @@ DECLARE_SUITE(perf_evsel__tp_sched_test); DECLARE_SUITE(syscall_openat_tp_fields); DECLARE_SUITE(pmu); DECLARE_SUITE(pmu_events); +DECLARE_SUITE(hwmon_pmu); DECLARE_SUITE(tool_pmu); DECLARE_SUITE(attr); DECLARE_SUITE(dso_data); -- 2.47.0.277.g8800431eea-goog