From nobody Sat May 11 08:56:50 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 4Vc0430qVsz5JRtT; Sat, 11 May 2024 08:56:51 +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 4Vc0425bH5z4NPS; Sat, 11 May 2024 08:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715417810; 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=HaGCoaJGbdv5X9u2VmsJycISZGCniLsI+bdOA0nrb7Q=; b=E45nq7fGT/KO3TpbaziaAcZ96IFpDpqD3rwojE4ph263JBqEYrZwrMMLG4/A4KW/19y2xU VS6z8bAqCA9j2l4leQOUeIeQE5jjlSiiFpNdCP36jw7sm3oYF+H8pVw+WmNBn4aakJB50H 5l/WSZsvH4SEZeWqK4V+arAYMFuuX68vVSfe0OOG3qSsisBYqBy/R/W1QxA4T7a27eeS+F EDDAxfj/pIcpHKSngWaJhrYl5mJM4RB6B4y5r+4Gd7DhgSAlEHMHES6pNxHi2jco+ZK4cv /JR/QMXRNucnhxymmVmMJQd447axXVuokBKlqm9ttRm68OgCbv8v6RRG6WPiqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715417810; a=rsa-sha256; cv=none; b=aAagJn5JyHAJnj29+nun8XaF/XryHUrfxN4BuISJc1peEk1esjeHC9GBd7HuqEnMHHrM01 kf8bosch+VaVvPjykHLx3yxOJ1NYb8Ht1tbiuKJC6fGW/VRjsLkAwBVnPj/TOCb0a9fegN OuevV5InGoE/66NIe30oH+HrkDw2010/4+g+/ikZ7oRdyBI++QlupEeLqarV2ftmfoLFVd j4V1gAMIj47YCPIqpvwCw1tEDXNro2UoO55DEnNZ9I7lvvd3N0ueeOedyNXct2ae2mcq2T eKKHwKNyKB4szxzDCxRg+w6TqeX3O8BU1xH5RWlp6bIEKbaGMV6JV7nzOBe3Ig== 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=1715417810; 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=HaGCoaJGbdv5X9u2VmsJycISZGCniLsI+bdOA0nrb7Q=; b=va498bpGtAZml9f7kteq7zOKf3BqNs/P2rKLATU6D1QWS40pwiUBfD80yq2kHxe1NYOG+F PXOomq7bOkSMGnyIpeciP2y1m0KHXaiFs642zK+Lt61pk+6ufcQ/tjcUMKjzJJ/Mdjfm2g PSg6s6sc1xEfM5Uzg9RD8eopI/O4BqWiiOrw535ZxNmpTsXVSj+jAfHsLTASBRXX0MPHXb ewzed9YzY4L8rd5aRtUSsbUBbL/yCxJFonnSQUuCNfIKROqSdYnY+VvU7ym9XmBYRtisxn QXHkhbfxwnHJ8Yvd+1rsWKwqlnIzxFg8OQ4d89zGKm7NJAoWUFKEiB3wmRg7BQ== 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 4Vc0425CZdzFT5; Sat, 11 May 2024 08:56:50 +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 44B8uoxY063715; Sat, 11 May 2024 08:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44B8uoJQ063712; Sat, 11 May 2024 08:56:50 GMT (envelope-from git) Date: Sat, 11 May 2024 08:56:50 GMT Message-Id: <202405110856.44B8uoJQ063712@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: 91df7d335dd4 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 91df7d335dd44fa3cf506b35987d791502613ed4 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=91df7d335dd44fa3cf506b35987d791502613ed4 commit 91df7d335dd44fa3cf506b35987d791502613ed4 Author: Dimitry Andric AuthorDate: 2024-05-08 18:44:28 +0000 Commit: Dimitry Andric CommitDate: 2024-05-11 08:56:28 +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;