From nobody Tue Mar 3 17:11:10 2026 X-Original-To: dev-commits-src-main@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 4fQMlL5qXqz6TMtm for ; Tue, 03 Mar 2026 17:11:10 +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 4fQMlL4xw3z3C7q for ; Tue, 03 Mar 2026 17:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772557870; 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=RNZ7yBqke/mXbeLpCQ4IpSi1/885joqyU8S9XRocDcv93kZERnYcd9t1fMhL6Tyxj0EeR+ mUnGirBmvZvYKhKcPZbSu3krtQ9qfcuAFU1tGIfbuKZXpOsrXBffduSSmv0k63n+V12EET JVxaNKqaNIEUpn0wEusa200SFtb68JxG+qwqRbi5el2pjxulSs8og3LbzTED9Ji6lopzTG royOh7J6AbxMbph8zT7eY+CiRaeumG4nxTnFx7KxU5MclFx3STmjHTjm2y3ohusAdWrVeP ri/+yCNAoA6bNHgI7pwmd2EQbKv5fLay5oLR2ITlf7dEijZJpFs2zHjHmCKysA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772557870; a=rsa-sha256; cv=none; b=yP9qht6//if47QtPe6CuBJLS6w8muPrWJ/Ef3NLrH2bf4ou3yMNGBshel/B7LUDNmWI/Rj 2hgEIwcpeM20kkwIY7j8cYX5GsHd1S0TIkoqaKdUm66PMX7+8+mw5NGDPNr6JKzZwWoWk+ SmbXay2cRnyUMFs49GnjIIMrt5at2Boo+rqryfotqDTlcz5ODx3UKFi+I0CCeptpKKP0Jv i5+Ny0tSNqt7pPeAYsV/eVIlDD73YkC/wdWnYwAvmQEOCqyKbdLhC6yCgZhKqQRNQ7Kf1i U99qujJm6Wqfz20KSSysJIpJFbLXvl2sexlefpwg/Gltl+3zfQOUNSSRNY/35w== 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=1772557870; 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=PRurn0Dt/OmCS3vmEkDP6Vg4hyFf45E9pyMcnYVe9pmoH/1F0Awkr0nwUz6+1mYggy9jeo V5FN9Rr1hB1xXT0fEsvaIZQ9+Qt0k2CdDC/kcwB3EsE6oxTcR6XQFmQUzewHL9J73AVA8+ zsPHYqFNwLPeqVFl3FXNXzFyfvMzjqf/X64cIr4tyK5gpJUTwRzUF0uJsEH38L++2CNUk9 bZRydLZxlW5PJjKZL40dgYMZyl3I6wzpdfsQAeH9t0U9iLY3TwW7P3Cs6KOJ/xXPtwYqoS rYu1zP1UyKKRNBbk3J6c/rWgIMFAuRJCDvb6bVKmYE6NNnhM1KeobZAFaO3rOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQMlL4W64z1SMH for ; Tue, 03 Mar 2026 17:11:10 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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)