From nobody Sun May 12 18:09:11 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 4VcrGv5YWWz5KS4Q; Sun, 12 May 2024 18:09:11 +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 4VcrGv3KNNz4d6d; Sun, 12 May 2024 18:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715537351; 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=C/qAVBWa4nuj1uAqm5Kcfs+XefH4ccb8XslZ2UvYwWs=; b=stAhZLYUBqUlRlIFdOtTJfTDFGSx1MBFgtvivdAAuaX1BWIJ+2BvnF5onZj5828M5/BlMq HKNw1YHO27XzxFzojQzVtK2Jh4pOaDFAiDmULbDOcLmFMBI7JhOyEbQKJvewjwUsY+35Xl x1fMghUKxAVBluq7pB5yC3kn8msW6MHqAvBA6nwtmeXCE6GmtdQAJpCGoITp9zTyDMOLyA +9w+Fen8E3mEqG527FOuHgD4jLiwfhFgeGavE5XeUY54MBt9k/dq4oT36ccpTuZwodvZJc DGHiEUYHsT0PsEpv1GKfF5uhtyfJ34w8LPaoJvsAz7EOgOFjY4QtySDF3BV0AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715537351; a=rsa-sha256; cv=none; b=k9qA+fUIZWSYl0hAecByKc6wB/JycalEEmoAHAnTb03YOC+AW5VvL7pnRXicOcx0Vz2DaD 5c6U/FEQoe9V8FEkTMecNNk/6Dr38nZOFWQW/fBd7FjUiiaqvgvWswMm4WLHaHXgMiw5XC M2lGdJKxQLW0hbVBi2t6HpBaKnV1GDhVsEacbhkooJX0oNbTejcZY7MxPbis64ta9Qp4AZ yF7quh/BQhPzBk0wCd8aRlTeZ94xAd9iPJUKLIy4mbe1Y5A458LCMA/GYYXaFFkCskHGna uuWVrX3LuquP1hEW/7j3K92KjOeQzuMksyB574QnrNMeKvjp/q35Yecow8H8Cw== 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=1715537351; 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=C/qAVBWa4nuj1uAqm5Kcfs+XefH4ccb8XslZ2UvYwWs=; b=WWINpfmx/rpIb4q0ehpWrJM61KJTu0zHS6cG48kOU6YufNykHM6tIU8KHJPcWT9hLyMFB1 4OUmiNgoH+taS+otE86oGlOKLfR5RXr87oWdpheM5orXAzE+8MGKQMRUdFQquBYQYngTmp etaCMSfGkBbuYhAhHemuACwXTVcLcyPuepu6CtctGvazVweyxeQe4WV90XjJHsCXfJ1vn7 CFeKw34UTz1Jb4nHgrrh17tLap9W2URhgxgqAfpJ2w6HVVwDs9+fgiA5yoiN79xzaLfjjM AEMPg0V34++N0xu/7XLZX5Hfx1ZENorr/gQ/k0x9MYRGsGNeP5/wrvPQmN8BsQ== 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 4VcrGv2wxBz1Cpq; Sun, 12 May 2024 18:09:11 +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 44CI9BTM028773; Sun, 12 May 2024 18:09:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44CI9Bot028770; Sun, 12 May 2024 18:09:11 GMT (envelope-from git) Date: Sun, 12 May 2024 18:09:11 GMT Message-Id: <202405121809.44CI9Bot028770@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: ba0bd7cea412 - releng/14.1 - 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: ba0bd7cea412c6dc51ebfebd4000a543e49013bd Auto-Submitted: auto-generated The branch releng/14.1 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ba0bd7cea412c6dc51ebfebd4000a543e49013bd commit ba0bd7cea412c6dc51ebfebd4000a543e49013bd Author: Dimitry Andric AuthorDate: 2024-05-08 18:44:28 +0000 Commit: Dimitry Andric CommitDate: 2024-05-12 18:08:46 +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 Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 22b3e7898ecdf90887a9536fab5b9a6f7a291723) (cherry picked from commit 91df7d335dd44fa3cf506b35987d791502613ed4) --- 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;