From nobody Tue Mar 3 17:11:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fQMlS1fpjz6TMyy for ; Tue, 03 Mar 2026 17:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fQMlS03Ctz3C8V for ; Tue, 03 Mar 2026 17:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772557876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QI1EdwQfBRECeK19oU8TmeHawBlQTTETn36nk94R3Wo=; b=fSkswCjz9x3ZwItLaVwoKEZOuZQyR1FyXjq0GG8y7ee00zVXSaWngksOOX5cYfxVLxiNJz XZM4Zo9RDytOZs2iwrQE+Gy4EACtvQ3yYHzmZJ1hTLYnFi0Cv1/UsiB/xjDAYaOrtaqE9Q VKADdRV8SL64qmj+oDtKnPlEYDG0NJtcU4V43ld81bLvHC35U2e2qcRRGr4+9ilG+4Cccl Xv+aW7VbwL3xzyWQu/8HgpWFq9UeVBSrIrVMwIuKb7ycCzEFBuciLwBxdMiyGbfIj3CZI2 AcY2LP5IBwcmsC5g47pgjj3+MjwoCsAEjSzrh7KQF5bzbUieqQQfZ68idcNcAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772557876; a=rsa-sha256; cv=none; b=mBsSqoO719VR25qdNLb4feZvo2YQkwXEgQUv6nwHD3vgTTYAzmNUOiwzC3XSoEcM9RM6Z5 aGceVdbTU0jIU/Ysy+ClmT5wf17QtQOpRcsC7DD68a4uaGQvWDoi9/7Pw6mz0OV1J3Myer WKdw5TavGZgdMDrZFyugJzOH25EYuwJkAltbwWOvtJg3ziptW1B3p0V/bm0SoZB9sMeTDv aQeNXmEjlZDGlWPSicKeg5Qms0IAcNwfuhQVzef/q1vBwSoX6begNEmdWE7opYpl5QmELq C+ZNfIJ4mMtMg3VaYpEqaA/xOFsEil97hXI1lb1vhS8KJa358Bsxcw17sg1NKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772557876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QI1EdwQfBRECeK19oU8TmeHawBlQTTETn36nk94R3Wo=; b=BARutvG/3LDEnQJL9ecaptAgfvHqy0Hkj2arnmfQq8dY6g2y8W1QV3y9MEBjrfMS8uBuib +pvsA751+6p94H2tveceSu1EaHlTuS9+z6chgwDJQZyLRM54chxm/tpzoYCNdMkx521h8U EF+n5RXMxlwSF7Lh55574xMh8dL/phSEd/B7c4fXKWfJnF9CqqdwNiY6DvH9+rK0uZTr4A 8MHhMKijlYXveSJH3D2BctpfOHAfg4dVn54FwkqRi0dHmcsSp/t2GnWLr7JhFkEASgokTu mY4CYW58+ZPI7/WOiM9wikEiNPRHVf1FJeMNPMlF2lO4JWLQngDfuIvMqnYCQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQMlR6kscz1SMJ for ; Tue, 03 Mar 2026 17:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e996 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Mar 2026 17:11:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: George V. Neville-Neil Subject: git: bc9229035c5f - main - Allow programs run under this program to have arguments. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gnn X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc9229035c5f46674cf06b48d66e9f039b3a9875 Auto-Submitted: auto-generated Date: Tue, 03 Mar 2026 17:11:10 +0000 Message-Id: <69a7162e.3e996.108a155f@gitrepo.freebsd.org> The branch main has been updated by gnn: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9229035c5f46674cf06b48d66e9f039b3a9875 commit bc9229035c5f46674cf06b48d66e9f039b3a9875 Author: George V. Neville-Neil AuthorDate: 2026-03-03 17:10:26 +0000 Commit: George V. Neville-Neil CommitDate: 2026-03-03 17:10:42 +0000 Allow programs run under this program to have arguments. --- tools/test/hwpmc/pmctest.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/test/hwpmc/pmctest.py b/tools/test/hwpmc/pmctest.py index ba20306f1d68..1c113c256e32 100755 --- a/tools/test/hwpmc/pmctest.py +++ b/tools/test/hwpmc/pmctest.py @@ -27,6 +27,7 @@ import argparse import tempfile from pathlib import Path import os +import shlex def gather_counters(): """Run program and return output as array of lines.""" @@ -58,7 +59,9 @@ def main(): print("Choose one of --count OR --sample.") sys.exit() - program = Path(args.program).name + # Split program and arguments properly + program_parts = shlex.split(args.program) + program = Path(program_parts[0]).name if args.count == True: tmpdir = tempfile.mkdtemp(prefix=program + "-", suffix="-counting-pmc") @@ -73,8 +76,7 @@ def main(): continue if args.count == True: with open(tmpdir + "/" + program + "-" + counter + ".txt", 'w') as file: - p = subprocess.Popen(["pmcstat", - "-p", counter, args.program], + p = subprocess.Popen(["pmcstat", "-p", counter] + program_parts, text=True, stderr=file, stdout=file) result = p.wait() print(result) @@ -82,7 +84,7 @@ def main(): pmcout = tmpdir + "/" + program + "-" + counter + ".pmc" p = subprocess.Popen(["pmcstat", "-O", pmcout, - "-P", counter, args.program], + "-P", counter] + program_parts, text=True, stderr=PIPE) result = p.wait() resdir = tmpdir + "/" + program + "-" + counter + ".results" @@ -97,7 +99,7 @@ def main(): if Path(gmondir).is_dir(): with open(gmondir + "/" + "gprof.out", "w") as file: p = subprocess.Popen(["gprof", - args.program, + program_parts[0], program + ".gmon"], cwd=gmondir, text=True, @@ -109,7 +111,7 @@ def main(): print(result) else: - p = subprocess.Popen(["pmcstat", "-p", counter, args.program], + p = subprocess.Popen(["pmcstat", "-p", counter] + program_parts, text=True, stderr=PIPE) result = p.wait() print(result)