From nobody Wed Jul 31 07:36:59 2024 X-Original-To: dev-commits-src-branches@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 4WYkSW4sc2z5RP2v; Wed, 31 Jul 2024 07:36:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WYkSW4LYmz4pFn; Wed, 31 Jul 2024 07:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722411419; 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=QE0ebUp82Pfyfss2KBEHRV0OhBD0v3O1njCQwSvkXs8=; b=YMXKhtDUo2ymrBkxaqzKNqFN82DP46w+6nBdtNsSYA9JD5hdU0CkxfmWdAq8BQIYUznl9k cY+3Bm+qhDyIpdFgWRx9M1f4/rM5ytoxtE70JAJDqWTbGtYPX/Dp9oqWroOFZaNbn/ZRLl JCiW3EXLim/+ViU7a//nWJ2V9bTjYKULOUJol/CaFAIffZL0/D+azjwPmnus1ETy3+L83g HkBAJumgRAlnUHlKfudMfAmGSqezxgainYqUsIVFsN5XJgOUPJpXhw/83RSWcO/sF6rvph EC5rwqmu7Xcmy9NVvbQikisMYM9+Uyg2Q0076KfOO2kX6wHsrC8UZO7ukv0C/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722411419; a=rsa-sha256; cv=none; b=IdWt9hGQR3vzpES3Qm58c1wvOMgd9Jp5mT/yOiSstWMkcUfQI9+Hd56kwLd5rOsEekTbnG 0qFaoSDvi7tXKLTo6wtpWUbsDYEuikk5WbARMwMUPSi7bOQoj7l6jLusx/5lGZD+0g+6UM xlplBXj+FAIhsqodgmfF6D8hUCphxSZ7AT0nUIvW0LNqqSvfsQgStiWhYPzgkmmLCKOyGm JxvynEpSRQjJWQk3C5LYEZ2t1enpaJUfwNmwBwj4yWeD1CmfLG/rTtkSsY5Hgxeu/L1R8X uLYua36KrXs+2pMSj6fjBg0DOa1Id14ZPmhxur8+knW8ZLumaaXpd3Hr+mng/w== 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=1722411419; 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=QE0ebUp82Pfyfss2KBEHRV0OhBD0v3O1njCQwSvkXs8=; b=cZe3RwyuH8JjDbKVBFPiIoEHvds5DXBYOQ2DzXOxmg3K9ONUXJQrjPF45OcYKDEGNCiT9L aCQ2/aQK6ORDz2LI3KBPKJXyUNTLvBCWuVP5T7XkY/0I+yftAuuj3h3BNqkKJSXK9bn/qO QsAWqmWoa/6k/NSOGjFlLlzMJl/JdrENYfJpV2AmZAwUCocl7Zhgj99pOXfMQEa2rWOynI XkESu+ZcoJz+qnym+Bd6AchA/ufTiUZ/Vz+PonAIcH/q7KvHg3PVGkmsVGEPMaG/CnTxZz 0YXV0qsIttgY8EB0fUWU90MIkWt/q6ZUlG7/qx2fIEtZGWE7e9wgdTgMo2OXQA== 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 4WYkSW3xcGzsNY; Wed, 31 Jul 2024 07:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46V7axst073267; Wed, 31 Jul 2024 07:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46V7axQe073264; Wed, 31 Jul 2024 07:36:59 GMT (envelope-from git) Date: Wed, 31 Jul 2024 07:36:59 GMT Message-Id: <202407310736.46V7axQe073264@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: c8d0dca5e5f7 - stable/13 - Revert "Fix llvm register allocator for native/cross build differences" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: c8d0dca5e5f75b98c90ccfb60f8a65523072a8c7 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d0dca5e5f75b98c90ccfb60f8a65523072a8c7 commit c8d0dca5e5f75b98c90ccfb60f8a65523072a8c7 Author: Dimitry Andric AuthorDate: 2024-07-28 11:08:50 +0000 Commit: Dimitry Andric CommitDate: 2024-07-31 07:29:57 +0000 Revert "Fix llvm register allocator for native/cross build differences" In preparation for applying the fix that landed upstream, this reverts commit 397c2693fa66508cb5e6b173650a1f3bc6c4dd4f: Fix llvm register allocator for native/cross build differences Work around an issue in LLVM's register allocator, which can cause slightly different i386 object files, when produced by a native or cross build of clang. This adds another volatile qualifier to a float variable declaration in the weightCalcHelper() function, which otherwise produces slightly different float results on amd64 and i386 hosts. In turn, this can lead to different (but equivalent) register choices, and thus non-identical assembly code. See https://github.com/llvm/llvm-project/issues/99396 for more details. Note this is a temporary fix, meant to merge in time for 13.4. As soon as upstream has a permanent solution we will import that. PR: 276961 Reported by: cperciva MFC after: 3 days (cherry picked from commit 52552d7572a6d3d7d3ce0d6862de9a9d203c5d01) --- contrib/llvm-project/llvm/lib/CodeGen/CalcSpillWeights.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/CodeGen/CalcSpillWeights.cpp b/contrib/llvm-project/llvm/lib/CodeGen/CalcSpillWeights.cpp index afde8d001f88..f3cb7fa5af61 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/CalcSpillWeights.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/CalcSpillWeights.cpp @@ -256,12 +256,7 @@ float VirtRegAuxInfo::weightCalcHelper(LiveInterval &LI, SlotIndex *Start, return -1.0f; } - // FreeBSD customization: similar to the HWeight declaration below, add a - // volatile qualifier to avoid slightly different weight results on amd64 - // and i386 hosts, and possibly choosing different registers in the register - // allocator. See for - // more details. - volatile float Weight = 1.0f; + float Weight = 1.0f; if (IsSpillable) { // Get loop info for mi. if (MI->getParent() != MBB) {