From nobody Wed Jan 5 14:41:02 2022 X-Original-To: dev-commits-ports-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 106471939E4A; Wed, 5 Jan 2022 14:41:03 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JTXGk4Fpcz3t5k; Wed, 5 Jan 2022 14:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 656C16223; Wed, 5 Jan 2022 14:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 205Ef2sY078088; Wed, 5 Jan 2022 14:41:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205Ef2lg078087; Wed, 5 Jan 2022 14:41:02 GMT (envelope-from git) Date: Wed, 5 Jan 2022 14:41:02 GMT Message-Id: <202201051441.205Ef2lg078087@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Luca Pizzamiglio Subject: git: 76adbd76453a - main - benchmarks/stress-ng: several improvements and fixes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pizzamig X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76adbd76453a0ef566ae11214b7e70b542f04506 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641393662; 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=kLTRsgy3G5HUv6A/nUJnSn/O4DggCXK80g0EyS6oX60=; b=fZ8tUCYSYmgMXPvsWDNntyTleDQy8TjFFjpA0bCI5r94qsdfFqhp2YpFKmISoYENz3r6Ve x05RYG34KElirIkdKy9dGHGDb9/aIoGIGdtIiB3lUvRm7v2iCRVs+qFV5P4B8j1wEI3Kui aXiSGwTHpMnzcFDzsULakXwEkvBukhbftwOlSb0SMP1zloyiGOlzudg4iwjoWHH5CFF8Pv qmp1p6EiFfeo0lz3h23+51Qilroe0+bLh/9qOpjoss2+4JhU9mDhUSIlitAyztsoGJjqdE 5jac/bk22qQJtwFMS6K8aFl/Gdk76NRyvo+GfTfTfz1pp7GHBFQBjqUm6t4faA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641393662; a=rsa-sha256; cv=none; b=Xe/Vy/Jaxw3Mvcy+2P+rJDHEa4eHWhalPSDw8j/eLMtQ+0gkS77QTqnXB8/kYm+T/d04dX FnTcDxzSl/SPoo8OD97byoRqfSVWqlRUFeHrWWtoBkFfS4DxxP5FFSDOhJM3k5an273I5X 6IKoXjgfqoJHnQdEGfi/olHaQjcBlIKJDkTj3h1k9LIQ0rHhvh4hND+UU5OE7w2hqw0LHj cs2vu1/J63GH9A0xKt0uulelN6pd92SBi/n22DpSEmrIvy+6SiuVzUA9kn0KG+2GH1w33m 153mM/FvjzLCpXVFz/gSpmFqeR8mff3LfcKepoZPLvGr9u9TKbdZrmIN8rl5bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pizzamig: URL: https://cgit.FreeBSD.org/ports/commit/?id=76adbd76453a0ef566ae11214b7e70b542f04506 commit 76adbd76453a0ef566ae11214b7e70b542f04506 Author: Luca Pizzamiglio AuthorDate: 2022-01-05 14:33:15 +0000 Commit: Luca Pizzamiglio CommitDate: 2022-01-05 14:33:15 +0000 benchmarks/stress-ng: several improvements and fixes Enable on aarch64 Connect a few libs Fix build on CURRENT PR: 260893 Reported by: Daniel Engberg --- benchmarks/stress-ng/Makefile | 31 +++++++++++++++------- .../stress-ng/files/patch-stress-tlb-shootdown.c | 14 ---------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile index 5d591fbe1c10..eb5f18e7de38 100644 --- a/benchmarks/stress-ng/Makefile +++ b/benchmarks/stress-ng/Makefile @@ -1,7 +1,7 @@ PORTNAME= stress-ng DISTVERSIONPREFIX= V DISTVERSION= 0.13.09 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org @@ -10,9 +10,7 @@ COMMENT= Stress test benchmarks LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= Fails to link: missing sbrk - -USES= compiler:c11 gmake tar:xz +USES= compiler:c11 gmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= ColinIanKing @@ -20,13 +18,26 @@ ALL_TARGET= # empty PLIST_FILES= bin/stress-ng man/man1/stress-ng.1.gz -OPTIONS_DEFINE= LIBINOTIFY -OPTIONS_DEFAULT= LIBINOTIFY -LIBINOTIFY_DESC= Install the kevent based libinotify to enable its stress +OPTIONS_DEFINE= JUDY LIBINOTIFY +OPTIONS_DEFINE_amd64= INTELIPSEC +OPTIONS_DEFAULT= JUDY LIBINOTIFY +OPTIONS_DEFAULT_amd64= INTELIPSEC + +INTELIPSEC_DESC= Enable support for Intel's IPsec library +JUDY_DESC= Enable support for (lib)Judy +LIBINOTIFY_DESC= Enable support for libinotify + +INTELIPSEC_LIB_DEPENDS= libIPSec_MB.so:security/intel-ipsec-mb +INTELIPSEC_MAKE_ARGS_OFF= HAVE_LIB_IPSEC_MB=0 + +JUDY_LIB_DEPENDS= libJudy.so:devel/judy +JUDY_MAKE_ARGS_OFF= HAVE_LIB_JUDY=0 + +LIBINOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify +LIBINOTIFY_LDFLAGS= -linotify +LIBINOTIFY_MAKE_ARGS_OFF= HAVE_SYS_INOTIFY_H=0 -LIBINOTIFY_CFLAGS += -I${LOCALBASE}/include -LIBINOTIFY_LDFLAGS += -L${LOCALBASE}/lib -linotify -LIBINOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify +MAKE_ARGS= VERBOSE=1 post-patch: ${REINPLACE_CMD} -e \ diff --git a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c deleted file mode 100644 index d54609e2fc7f..000000000000 --- a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c +++ /dev/null @@ -1,14 +0,0 @@ ---- stress-tlb-shootdown.c.orig 2021-12-19 20:49:35 UTC -+++ stress-tlb-shootdown.c -@@ -64,7 +64,11 @@ static int stress_tlb_shootdown(const stress_args_t *a - const int32_t max_cpus = stress_get_processors_configured(); - - CPU_ZERO(&proc_mask); -+#ifdef CPU_ALLOC - CPU_OR(&proc_mask, &proc_mask_initial, &proc_mask); -+#else -+ CPU_OR(&proc_mask, &proc_mask_initial); -+#endif - - tlb_procs = max_cpus; - if (tlb_procs > MAX_TLB_PROCS)