From nobody Wed May 08 18:47:34 2024 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 4VZPK312Wjz5JyPt; Wed, 08 May 2024 18:47: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 4VZPK30WCFz47cC; Wed, 8 May 2024 18:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715194055; 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=hVMsEoEhpHbreiuzW9zivgE5e9PLYnluQP4eVjNRtLQ=; b=JwcrR3AdCIzMYFHJuiZZoJlYd200HvNraJc2sGBYrbhhcDwbeCRUUwZ9oFzVc3R1lu+WWo 42Y473mkSH05RCCGGUiZbPjgGdI9g+9+9Aj5KbMTxecYaot4Nqka5LJVsVbwa8RExK/gHc rEPc8tno062jhrUXimuFT0gOr5QFfZx29T51gYVOmzFodQjWmhgD2LUfPl9skWVP5pDvly d4GP0T6jEg+cuLNyntAGQ8zmZni0EGzp+qTiEgIhmyLMf78okAlvFvp7nmvrCGwqtFCqRH f5x2myHYP43fguqVhXAiXEk5ZNekQOGlz9urAszkfLyKRq+MvJtbtMUqBJ94CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715194055; a=rsa-sha256; cv=none; b=COsYWNMnphAkZ4BKfQm67VCoFWwWoc73oHtVGiSsC/CmmgmkCyu3cGdsE+Dh+j4OCz4N5g 0WqeWxXXDhsfg0IExKpAaeIzR00XzYhT9+gMnlTioY+MzmHU6Q6hADOw2JeiLT35fUtqqi wP1no0KN6kL8PKAeCjpFYcmy8npUVd4Ur5/Nk0OLsVcd5uw14ngkl/Oo2Re+CA4CaZf/iQ x+6udb1eAOqLxpcim8y5B9NPPthJogMxp9iCQKEybk3wbRbB5c2P1iGOC2gBCsGbJ56x8l pPDrzD18AymtHZSdT6Cc7V1MPErDFX2JeoNsATa/LJx2DEeNYzOcNf5MVNizhQ== 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=1715194055; 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=hVMsEoEhpHbreiuzW9zivgE5e9PLYnluQP4eVjNRtLQ=; b=mg+CV6P7/AqimdC9sKnv/d7Xw6J1I019EJCaCwumFo3iGC6KvIn+huI90+R8DroQxo1PkW uBvMQXxsdeS/IBAV57yXnZ8a5KTsm5+//YlnD9UI2kswjmVBM1fUaJ44E2bZ2c4MLjZaRw f8rZeybxhDO9OhTSjTntGxFCbSI4b9RSgJJXUjuR3j5abfdlg4L9R/6RQf8tOYoSxXzAQA rn3aynuEIIShsqm8mSH+jU6yx3eqqSp3bz7ptRyUHTwnFPfdJ4UtTIERkgodiHgja68D+A sR/1aS7ATPfD46cW5V2ef+mDLVBLIR6im5x/Ykm3EG6f49feb7j5UAtrcu/sQA== 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 4VZPK306Mfzcf5; Wed, 8 May 2024 18:47:35 +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 448IlYKr054240; Wed, 8 May 2024 18:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448IlYuY054237; Wed, 8 May 2024 18:47:34 GMT (envelope-from git) Date: Wed, 8 May 2024 18:47:34 GMT Message-Id: <202405081847.448IlYuY054237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 22b3e7898ecd - main - Merge commit 73bb8d9d92f6 from llvm-project (by Jonathan Peyton): 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22b3e7898ecdf90887a9536fab5b9a6f7a291723 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=22b3e7898ecdf90887a9536fab5b9a6f7a291723 commit 22b3e7898ecdf90887a9536fab5b9a6f7a291723 Author: Dimitry Andric AuthorDate: 2024-05-08 18:44:28 +0000 Commit: Dimitry Andric CommitDate: 2024-05-08 18:45:45 +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 --- 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;