From nobody Fri May 10 20:05:19 2024 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 4Vbfxr0dd1z5KL6f; Fri, 10 May 2024 20:05:20 +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 4Vbfxq5dmMz4T7X; Fri, 10 May 2024 20:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715371519; 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=Y3aECCMOl1jG3J/8x6hlXoQHx3lvrG2R8koauPyft9E=; b=UQhNZRszE6lO07p7oe7OeEjGySNgLN/ezYKMZJKMHsPGdzIlyFNYGEl4PYrpsxK3XSl8Od 2giHroQWUCrSbY7xJ+C20y6Rc60g0GYTpQJDyIuInW0zCVuIe5bPLI2KK+oNLdVLbhpeS4 z+v1Xvqjxo5kK5jcpN/+PsPnt4XrCS+vXE9oI5qlJYddtLNnxqOb+mJdXca5J2z0ocg7NE 9Kw9pTCBTq+UqpVCVzQpcQnBadMAYCjFw3iZcl5SjGKFC99xRuMQr5k+yx+Qb34n/IiuBg 6JUXfH1t91BgbsxXE2YEmMVqjZURC+zB+enn6RA5FipaiC0vTQhjEmxnAZwsPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715371519; a=rsa-sha256; cv=none; b=djPqUh/GYMtnMQ1z45GCY38KNmi3nOtMiZTss6U9TPmbo1vDGfGtCWSMZJc5n5jB9qvJ3p w2eaUviqNEajw1P4alC8QT2OwKH3t9ua2ed4QHqhLWUpoanR/3TJc5o+IMoRjwLsuf3aU/ HSzCjmd2Km3XGb062EqwRU2fUrf8kxxREXb5IYJtyafTl64nXdX7YWtDLRfcEijUZJlNlD f/1pcSol25WHOAkJ2JrIR2oLiTEoxOonZn4Lavv7IRx/Po81Hq1r7yHm9UuceRcVj6gYEV lsce3qr6gNxHPM0UpGiMRutxC6YV6OJr9b76RTzEyxKJ32LXm0MhrpHloIk8Wg== 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=1715371519; 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=Y3aECCMOl1jG3J/8x6hlXoQHx3lvrG2R8koauPyft9E=; b=GNS3jSnm2AjyWkt9EjNzY+US2toS2Jzed02aOqs3IA5fo/J56OQCe+PFk9vPnABXXxOYFl WtBdOG1b9mU1k7JBbpyyz/ykBinjoc0twNKUh3Fe7EJDpGYdTKm689OmQUDDT6Tyq+70pb tDeS6az5T4TkKv8PMEMSShNAs28xJIYokvGv0ZXepMSgyzCSe6EllE9PqI9PvSn1VjJE6m MaKYtsbx0TUWg11On9kH+l5hv3RQ+TN5vvAWil/vsPxoPHcqF34BxBH6q1T32J+raLsYBY 72cl+p+dfcSrZgCXosjILITxq1ZPLH8q2HZ5tNf8BIfvBMswFfkWqRWgo80CfQ== 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 4Vbfxq5FNTzrpX; Fri, 10 May 2024 20:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44AK5JLN063625; Fri, 10 May 2024 20:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44AK5JGq063622; Fri, 10 May 2024 20:05:19 GMT (envelope-from git) Date: Fri, 10 May 2024 20:05:19 GMT Message-Id: <202405102005.44AK5JGq063622@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: db92b24a9b71 - main - devel/llvm16: openmp Fix child processes affinity 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db92b24a9b7176980dff1a05112d9afef2adda97 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=db92b24a9b7176980dff1a05112d9afef2adda97 commit db92b24a9b7176980dff1a05112d9afef2adda97 Author: Brooks Davis AuthorDate: 2024-05-10 17:20:47 +0000 Commit: Brooks Davis CommitDate: 2024-05-10 20:04:50 +0000 devel/llvm16: openmp Fix child processes affinity Backport upstream 73bb8d9d92f6: [OpenMP] Fix child processes to use affinity_none (#91391) PR: 278843 Submitted by: cbl@cbl.us --- devel/llvm16/Makefile | 2 +- devel/llvm16/files/patch-backport-73bb8d9d92f6 | 40 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index d8b29aa36f97..fa655ef715e1 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 16.0.6 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/ diff --git a/devel/llvm16/files/patch-backport-73bb8d9d92f6 b/devel/llvm16/files/patch-backport-73bb8d9d92f6 new file mode 100644 index 000000000000..d9de14e2deb0 --- /dev/null +++ b/devel/llvm16/files/patch-backport-73bb8d9d92f6 @@ -0,0 +1,40 @@ +commit 73bb8d9d92f689863c94d48517e89d35dae0ebcf +Author: Jonathan Peyton +Date: Wed May 8 09:23:50 2024 -0500 + + [OpenMP] Fix child processes to use affinity_none (#91391) + + When a child process is forked with OpenMP already initialized, the + child process resets its affinity mask and sets proc-bind-var to false + so that the entire original affinity mask is used. This patch corrects + an issue with the affinity initialization code setting affinity to + compact instead of none for this special case of forked children. + + The test trying to catch this only testing explicit setting of + KMP_AFFINITY=none. Add test run for no KMP_AFFINITY setting. + + Fixes: #91098 + +diff --git openmp/runtime/src/kmp_settings.cpp openmp/runtime/src/kmp_settings.cpp +index b9c8289b5c51..8b6092cb1085 100644 +--- openmp/runtime/src/kmp_settings.cpp ++++ openmp/runtime/src/kmp_settings.cpp +@@ -6420,6 +6420,8 @@ void __kmp_env_initialize(char const *string) { + } + if ((__kmp_nested_proc_bind.bind_types[0] != proc_bind_intel) && + (__kmp_nested_proc_bind.bind_types[0] != proc_bind_default)) { ++ if (__kmp_nested_proc_bind.bind_types[0] == proc_bind_false) ++ __kmp_affinity.type = affinity_none; + if (__kmp_affinity.type == affinity_default) { + __kmp_affinity.type = affinity_compact; + __kmp_affinity.flags.dups = FALSE; +diff --git openmp/runtime/test/affinity/redetect.c openmp/runtime/test/affinity/redetect.c +index dba83b72cc42..4b96d1bd92ee 100644 +--- openmp/runtime/test/affinity/redetect.c ++++ openmp/runtime/test/affinity/redetect.c +@@ -1,4 +1,5 @@ + // RUN: %libomp-compile ++// RUN: %libomp-run + // RUN: env KMP_AFFINITY=none %libomp-run + // REQUIRES: linux +