From nobody Sat May 11 08:57:04 2024 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 4Vc04K0PCXz5JSPf; Sat, 11 May 2024 08:57:05 +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 4Vc04J5yftz4Npx; Sat, 11 May 2024 08:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715417824; 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=UKo96w/TbdVENlak1foYQ7MASbM2VDEVjWtlsSmRt4k=; b=hFh40BYVCCqW6MsyunZyxbPuBi6KVC9O/np/WoEKHRL+k+aUOrLM3QE61Ra5VmWpIJxD2O x3CBQ5xP4bAvURXF9Zyq4NlfxeiDQ6TUlT9GV/6F7hiugvq3QZvB60bS9EXjaOw4oFEkaE E/MwMZ36Ex5++ZUY5TY2EAaUDF3EzGi3Sy9YzWejZ2J6Py7Kd5lWVSGV78DHppqZnUP3CK kEgeT5bbOLXJkUhonk5BKcmuATifFscipfN1+ehsvW4A2MiJ5DW9hmFdaownho4f3IMcGu QYHOa5OSXyDOSRLmoreL5bJlFthMFlvJ/n1lonEVsNiA60TEfiWmGnxp0WyTkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715417824; a=rsa-sha256; cv=none; b=FAzYlWlJKMfPiq78vSFnyYNHNziwg85r7Yy8JNfFfbFUoDqvji0Ena0Nqn7zxfgnh2xw0n L/Ml4LVzjuchriin2bVKx14fQoA3uc5C9kYkP7o7ZscdvX2GEL7FBqFcFtk3ShIbZsmipW rk+IU/y9zu/KfvvBmRaPCKEE2eLOGiWkl8mGlDs/mtYg/RWaIfMdYrvP3IWmw2EDIhQXnX rKKRp1ntOKaAhN7XEp5CwSZFnH/oTFlObeMM45qdPv2ALhQtYqkxxe5oqrC/NbMKMMvdG2 OizSYUsMhBFG+ecC0XBBmqzEod6j8UiXM1iwbjMqXKODZAG39abxjSxNsJR3Ww== 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=1715417824; 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=UKo96w/TbdVENlak1foYQ7MASbM2VDEVjWtlsSmRt4k=; b=Mn+mCHyB+xxOpWCyhU1muQpn/Il8KSM/Ghpkre8wjIw9jdfiaoudi8mFxZnvRBKgSxisoK l9apI5d5/7XN4pgCvFFd633a8x9naIgjUuFtMMR3RUvSrSeawaUHsJ93OVMVIh0YPMkMJq 5ExrRagsenfpnqR0vMjjvve2WgLZNaJLu6s9VLOURKraxHOUmrSJ9+vw+Y5lAKg2WVizSe QmUV2QhZ6LNgBKCSaEbSYLVno9TtbN+NFoHOUpipinapLcty9lmBaAYyugUiwCWDaSOZTn vA7yvEqcbkUd6aJIiUaD+12/syh8rGyYU2tP8SSPuqoI9srmqFq2yDOUJghHLg== 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 4Vc04J5W3MzFT8; Sat, 11 May 2024 08:57:04 +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 44B8v4wF063962; Sat, 11 May 2024 08:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44B8v4vw063959; Sat, 11 May 2024 08:57:04 GMT (envelope-from git) Date: Sat, 11 May 2024 08:57:04 GMT Message-Id: <202405110857.44B8v4vw063959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e2de08bf70f4 - stable/13 - Merge commit 73bb8d9d92f6 from llvm-project (by Jonathan Peyton): 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e2de08bf70f4343ebcb455dedf1b77ac0d67f5ca Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e2de08bf70f4343ebcb455dedf1b77ac0d67f5ca commit e2de08bf70f4343ebcb455dedf1b77ac0d67f5ca Author: Dimitry Andric AuthorDate: 2024-05-08 18:44:28 +0000 Commit: Dimitry Andric CommitDate: 2024-05-11 08:56:35 +0000 Merge commit 73bb8d9d92f6 from llvm-project (by Jonathan Peyton): [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 This should fix OpenMP processes sometimes getting stuck on a single CPU core. PR: 278845 Reported by: Cassidy B. Larson MFC after: 3 days (cherry picked from commit 22b3e7898ecdf90887a9536fab5b9a6f7a291723) --- contrib/llvm-project/openmp/runtime/src/kmp_settings.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/llvm-project/openmp/runtime/src/kmp_settings.cpp b/contrib/llvm-project/openmp/runtime/src/kmp_settings.cpp index ec86ee07472c..58f19ea5b8ab 100644 --- a/contrib/llvm-project/openmp/runtime/src/kmp_settings.cpp +++ b/contrib/llvm-project/openmp/runtime/src/kmp_settings.cpp @@ -6426,6 +6426,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;