From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) (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 7163B6DCE1 for ; Wed, 24 Jun 2026 12:31:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782304318; cv=none; b=WoH7h0YWVSDL7U4ChwIHzAAU9eMOHZeaW9bf2dZSsJ42Nl8krUkHcKG6BRzxDVLsLvl0Y6SgSiAgoNaIuo/M9+fTv7k6gGez1IClueNwShpmYmfgKGauX5qnHYydwEVsJgHID5RXcrMhMM8itD+YA7B2rtCn1bjBi2fljvFc5No= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782304318; c=relaxed/simple; bh=msEno2fcYvrkHE9BPSN1njiooPdxcLdwdyC5c6EtgTk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XA0CK4HbCOI/PJvV3JKkd2/X5JSxClbb4cyn365BVXh2zVU75c8E9lpSDJFVLiqrjUnUYpbC8CT6/Hb/NXPJjVlxItPdFoT7uV77B02uMxo9+JunP6eG/XpwRrJecvBOA0Kzd1zF4P/Pcxhsn0f40gq+4XDCKuL44cYlWJPKm94= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=r7RXuR8k; arc=none smtp.client-ip=209.85.128.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r7RXuR8k" Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-7dfceeaf168so11081727b3.0 for ; Wed, 24 Jun 2026 05:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782304315; x=1782909115; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BfglCRldKyGKtWJv5Dc453U1idIPlMCphiiJzvFVkKI=; b=r7RXuR8kmMFkcg5y2jByb87BzTeFW4+kEAoThTtyikxCWqaLe7NjzO17TLwR90yu/F FoN9MqkhIO/GkxLLZo2y2JkMOTULFecZMnMdVc1aOXzQ3QnVx2pvDhWmiEWW3DxREuyq dN7bVqVe643e7Py71wXOQoDyEaCnXurLFYqJSwEP/nIpqFXSTvJpK0YaHEd3l0mfbOnu bBrfM824KzA+c8cEegZfvcteeREL2G6EHG5ABxzvBXmxyyaylqua/5WjzEP4EcvtSBFX iGa5ustSia/4zFAHih8NulbQDocVMsad/b7UdDJJ+uIPPgFSWijGOwtNF/mlm7tOZstV wzBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782304315; x=1782909115; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BfglCRldKyGKtWJv5Dc453U1idIPlMCphiiJzvFVkKI=; b=n/LS5pcunXdfLwFxu1ODD2qH7KrToYrMVk3mXYIZOmwAjqG/bZtRks4/IOITe6a6ol bdDKhkXe5SsEo0c3PSOiViNOyGA08zXj4YkPGkicbMygTtn5pj/Pm8JLUfnKf3mFD1Zh UZMsB+5IFJYwfw2+jWRjXu5/psUB1LmhhKeHIUsjvQJcPzFJxEGHNpVThldvDEyxCzqn nZ3ZURkFCQeURaG+YzvA1iG8b2bHjtXfGi2XvFYrEyAHi/oYtaM1+P19RUQ04+G9exQY RhdpsLEDcp7Nf4D7qyD87eVcS2d7oyUIyO89tmAbc7PAJi/qcr3hTJMc2D8EnV3IL67G MKlg== X-Forwarded-Encrypted: i=1; AHgh+RopKp3QB4EkKpeJILUf2aOf0e7h2NSqmm0E0i+b0j1HxvfNfcH/SrMFrXp/YCWEttISj7TdHfhuzCIIArs=@vger.kernel.org X-Gm-Message-State: AOJu0YzU4ket/Pt4m2TmgPDcBKlhJRQb53ddrSuyWdnBEPpV9OduCfFV e9FYhz9SsWwrV1ywjQtLCN2EU4se+RQt++FxxKCiILkXGYrKc2ZgnQuU X-Gm-Gg: AfdE7cmwoLopkWl/bZGyXo1pmH5qtMLV65DDWQkjvtcwGt5JYxL8z6fM8iYHoPY4NQJ K+WvrW9H0kxwOZrnoEPtIpD8tsahyKW68EsEStesDwt7EBHoaVDFBTLnk5GX+mqY6VWIeUyBIDT VLt5xfvHNXlw0sJQGNIA//hRRIsuAjy0d74Eqmll0mVLjc2uIpC6DwZykkerICi4FveGHx1T//0 f5squdUNk2FV+IZoyx/CxLqnSNnsszKjLLk03kXeK5aGvWNvFRBg/L0r0kJk1BHC//tDhM4PmK6 QYhjfnuMf3TQR5LS5Hv/hztoDul3+o00fScSwwAKB/SPTQZqnuS+S5wjNwZtw6lr/rx0zbDuyuh iorvyJI4xVlde1IZawotfKPpTRwZYmiuznC+2qOVuO1x4o/Nb0ByRmiJ4RPZWiHBegn/x741SFp 7HqkNWpypDxUUtAdgDIVgalY6+4A== X-Received: by 2002:a05:690c:586:b0:806:b1bb:75c with SMTP id 00721157ae682-806c17738afmr71319057b3.5.1782304315356; Wed, 24 Jun 2026 05:31:55 -0700 (PDT) Received: from Dev-Null-MSI ([2a0d:3344:52ac:a808:98a4:4381:be45:536f]) by smtp.gmail.com with ESMTPSA id 00721157ae682-8025f8da5fbsm57535257b3.30.2026.06.24.05.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2026 05:31:55 -0700 (PDT) From: Yousef Alhouseen To: ray.huang@amd.com, mario.limonciello@amd.com, perry.yuan@amd.com Cc: kprateek.nayak@amd.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Yousef Alhouseen Subject: [PATCH] tools/power: amd_pstate_trace: fix help path dependencies Date: Wed, 24 Jun 2026 14:31:35 +0200 Message-ID: <20260624123135.7193-1-alhouseenyousef@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit amd_pstate_trace imports Gnuplot and numpy before parsing command-line options. As a result, even "-h" fails if those optional runtime modules are not installed. It also handles "-h" by printing a blank line and exiting. Use the existing help printer for "-h", and move the numpy import to the path that needs it. The direct Gnuplot import is unused, so remove it. Signed-off-by: Yousef Alhouseen --- tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py b/tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py index 875b08655..b1b201b2e 100755 --- a/tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py +++ b/tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py @@ -27,8 +27,6 @@ import re import signal import sys import getopt -import Gnuplot -from numpy import * from decimal import * sys.path.append(os.path.join(os.path.dirname(__file__), "..", "intel_pstate_tracer")) import intel_pstate_tracer as ipt @@ -260,9 +258,6 @@ graph_data_present = False; valid1 = False valid2 = False -cpu_mask = zeros((MAX_CPUS,), dtype=int) - - try: opts, args = getopt.getopt(sys.argv[1:],"ht:i:c:n:m:",["help","trace_file=","interval=","cpu=","name=","memory="]) except getopt.GetoptError: @@ -270,7 +265,7 @@ except getopt.GetoptError: sys.exit(2) for opt, arg in opts: if opt == '-h': - print() + ipt.print_help('amd_pstate') sys.exit() elif opt in ("-t", "--trace_file"): valid1 = True @@ -291,6 +286,10 @@ if not (valid1 and valid2): ipt.print_help('amd_pstate') sys.exit() +from numpy import zeros + +cpu_mask = zeros((MAX_CPUS,), dtype=int) + if cpu_list: for p in re.split("[,]", cpu_list): if int(p) < MAX_CPUS : -- 2.54.0