From nobody Sun Mar 26 14:52:35 2023 X-Original-To: dev-commits-ports-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 4PkzSg6qdyz41vxJ; Sun, 26 Mar 2023 14:52:35 +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 4PkzSg6JhBz3GNb; Sun, 26 Mar 2023 14:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679842355; 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=Aiwria6rxc3HSzqps7A4tYQTd6zklYvpBagV0vrd+Cw=; b=H7dAEzj2TMLQybx2bDU5exXQvP1iiS0NIaZyllSZUqsNHpUrS4Pz3pAzkIl9IqbDwv+Wku Md/BhyLg7gWOYBKJdNQO9DjdqjwNFKBtFzLJ26l+0X7gMwSAA3vXF+c7qAsAJAjB7yY5qF +6RzJ8Md0JL28Y8nXI72F9mA4rKZVAG70F6eujRtyqhzxD7+1gnzGmd51KdcHHZPFJkYC3 /SCDdt1+6n8NgcSRWK3eaMHd98qbZB9BuSbc+M5u7x9xh93KY6cfajM0nwjbB2KTeO2/fR uzWKIbb/UbMRQKBMKQ5eQ3NTOYCT5h5U2OiN7ErnC/iPp+bDZQIJO+exZExu6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679842355; 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=Aiwria6rxc3HSzqps7A4tYQTd6zklYvpBagV0vrd+Cw=; b=Cht8gO3Bwao5+Zl2/rMxRWK4z8Lrc3y96DJb7q2I1v8UaH9VsdcAvGLAUKanwMEmGpiqmR Zp2pvPkmPRAt6kCsFOnSXEMD1QptFXtgZQ4FKgEU2rvcWsCr3l5tHHTERT6adkk7K0vLWz VPlOOZgETq2khXxPvyCoJbLv+5hJwLgXEKMy45VKPIZrVQ4N6uCHhq7Dri9D2yLfG4qj9q joWF/cdXFDlD6J1kRPt7M9kL/G3NECV7eVZO6N7HuqkCSsklj/1/PaGRKR77eVkw82b8x1 yz+Sk8XOrkAsXeok18q5/9Cgj5sQVVHpHRGz5Xy11nnyXebmqjNyKKygpi30Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679842355; a=rsa-sha256; cv=none; b=DxUQgtFxTa3+y6xTDiI+MdcuOYJ92t9SbT3ZV6NKQUcjUwkLxodpw8yol6exwtEZc17Qxk SwvHTGd6Pm4K34DgLzEdyq0CucJhXZ8EcxUdTdO+iPfVhuUzie5io/Kbu5Esfqeg3vk+Du /Lk3ezeWsU1ndpIdAlrlDbEqSj5IkB1L0Ja2lSVrm9W9dwQ/WJ5AgGcO7BJ2e6dsfE6aQo C8hz5SKozqaXv1MWq99y6Kkescul//8u3WWw9CHFkMDuV0O7ww+h1dBDux/JKEL2cQCP5C iGc0dlMNk1dx8mw5eQXK+EylvSms/s5rb1thL3kuWFgajZkHFuOIIr7WfEb5aA== 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 4PkzSg5JTyzktc; Sun, 26 Mar 2023 14:52:35 +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 32QEqZhF036348; Sun, 26 Mar 2023 14:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QEqZUp036347; Sun, 26 Mar 2023 14:52:35 GMT (envelope-from git) Date: Sun, 26 Mar 2023 14:52:35 GMT Message-Id: <202303261452.32QEqZUp036347@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: bb383ff0fbcb - main - benchmarks/unixbench: remove march optimization List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: bb383ff0fbcb0e4cc3f73da30b2f04266da14d30 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pizzamig: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb383ff0fbcb0e4cc3f73da30b2f04266da14d30 commit bb383ff0fbcb0e4cc3f73da30b2f04266da14d30 Author: Luca Pizzamiglio AuthorDate: 2023-03-26 14:51:28 +0000 Commit: Luca Pizzamiglio CommitDate: 2023-03-26 14:51:28 +0000 benchmarks/unixbench: remove march optimization Introducing OPTIMIZED_CFLAGS option to enable march. march is disable by default, as pkg shouldn't be build with this kind of low level optimization. --- benchmarks/unixbench/Makefile | 11 +++++++++++ benchmarks/unixbench/files/patch-Makefile | 32 ------------------------------- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile index 81d71c91c934..71b578e03425 100644 --- a/benchmarks/unixbench/Makefile +++ b/benchmarks/unixbench/Makefile @@ -2,6 +2,7 @@ PORTNAME= unixbench DISTVERSIONPREFIX= v DISTVERSION= 5.1.3-51 DISTVERSIONSUFFIX= -g6705203 +PORTREVISION= 1 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org @@ -22,9 +23,19 @@ USE_XORG= x11 xext CFLAGS+= -I${LOCALBASE}/include \ -L${LOCALBASE}/lib +OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_EXCLUDE_aarch64= OPTIMIZED_CFLAGS +MAKE_ENV= "UB_GCC_OPTIONS=-O3 -ffast-math -fomit-frame-pointer" +#march generates code that can be incompatibe with previous CPU generations +OPTIMIZED_CFLAGS_MAKE_ENV= "UB_GCC_OPTIONS=-O3 -ffast-math -fomit-frame-pointer -march=native" + SUB_FILES= unixbench SHEBANG_FILES= Run pgms/gfx-x11 +post-patch: + ${REINPLACE_CMD} -e 's/^CC=gcc/#CC=gcc/' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's/^# GRAPHIC_TESTS = defined/GRAPHIC_TESTS = defined/' ${WRKSRC}/Makefile + do-install: ${INSTALL_SCRIPT} ${WRKDIR}/unixbench ${STAGEDIR}${PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unixbench diff --git a/benchmarks/unixbench/files/patch-Makefile b/benchmarks/unixbench/files/patch-Makefile deleted file mode 100644 index 3c2539dc046d..000000000000 --- a/benchmarks/unixbench/files/patch-Makefile +++ /dev/null @@ -1,32 +0,0 @@ ---- Makefile.orig 2023-02-07 23:18:07.000000000 +0100 -+++ Makefile 2023-03-26 13:40:57.699042000 +0200 -@@ -46,7 +46,7 @@ - # X11 libraries on your system. (e.g. libX11-devel mesa-libGL-devel) - # - # Comment the line out to disable these tests. --# GRAPHIC_TESTS = defined -+GRAPHIC_TESTS = defined - - # Set "GL_LIBS" to the libraries needed to link a GL program. - GL_LIBS = -lGL -lXext -lX11 -@@ -55,7 +55,7 @@ - # COMPILER CONFIGURATION: Set "CC" to the name of the compiler to use - # to build the binary benchmarks. You should also set "$cCompiler" in the - # Run script to the name of the compiler you want to test. --CC=gcc -+#CC=gcc - - # OPTIMISATION SETTINGS: - # Use gcc option if defined UB_GCC_OPTIONS via "Environment variable" or "Command-line arguments". -@@ -113,6 +113,13 @@ - CFLAGS += -Wa,-q - endif - -+ ifeq ($(OSNAME),FreeBSD) -+ ifeq ($(ARCH),aarch64) -+ OPTON += -fomit-frame-pointer -+ else -+ OPTON += -march=native -mtune=native -fomit-frame-pointer -+ endif -+ endif - endif