From nobody Tue Sep 27 21:46:22 2022 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 4McY9B64JQz4d1ZG; Tue, 27 Sep 2022 21:46:22 +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 4McY9B59DGz4NVg; Tue, 27 Sep 2022 21:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664315182; 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=weKfe6b+CbehB/txyWTkthc309m8KC+WjgO74qmTF6c=; b=V3fzCJEe34lT9isoZMZIuzN4yYY6MapiiRC5nwZ68HIMtnr4VCDQUJVitUkXddaJbgvSaQ 5Iv8GZ6F6eYN76vhNCsiExTr7gkYWcHi4Sr/nFsamTEIEyFenpCE+dhx1PmcCtPcDCpcgH FNUTJg/gMwbC+OqnLfqF6y5u7vFYktyDtZf8eRtNPxinQ3GVuPFW0NkVfP0Zl0VG6t5BMP BAARCLXYdR8R9YDerl2uh4VXmtdsAo/P39oOkGEP9cx7oy2jtnPAdG+PDRJn6zlpauAGqP 41kydjNlKUKTLir7CzFGs+Dc/DJPjoppmu33GiPPQ6EgtV82WWAqsSzVtlTfeA== 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 4McY9B3z8gzGKt; Tue, 27 Sep 2022 21:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28RLkMoM098691; Tue, 27 Sep 2022 21:46:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28RLkMfT098690; Tue, 27 Sep 2022 21:46:22 GMT (envelope-from git) Date: Tue, 27 Sep 2022 21:46:22 GMT Message-Id: <202209272146.28RLkMfT098690@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: 91ec809f0a90 - main - Apply llvm fix for assertion/crash building math/vtk 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 91ec809f0a90798296697cfc9afdb1c50c6d4971 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664315182; 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=weKfe6b+CbehB/txyWTkthc309m8KC+WjgO74qmTF6c=; b=T/1ufBElE7gGJoghxkgTK3htlNR6RdE0b8255ecFLWqqwyT5oP5M4zo25ISU+4ZaMxVM7x v8dxziJrUmKer1dmPiEO+sKB8TcDIsVhb29d4D0jOkMe7SlXFX/95c6Z0OXuoSPj+u9Wbt 9Q2F0SDTZEvD8mFAj3PJcN6AS7zn488Ad7QsM9urbOxgGiNih2CTxIsmJ4GXW3wZHOkiaY o0FmknjVYplAfNyCuTxqjTEV/SpBrANXSghSJ4+W46/Quja+MKNsNsIRVqEWyCwbFcb1rB A3/FXK/g/3+SEPWkObMnHXhGs/Vk9kKpqkEoy7ljMmqwd7ILCpJUcY2EH2lEVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664315182; a=rsa-sha256; cv=none; b=txR+/NvP5AJinDp3d7GY89TjwL70JUxOWrsn7JgKFSeBeXAyQPiDV7tqobopkDdaoQaGyz 27mnfuOutbt0X5pWFNVIWDVnc3hqv7t9bdGaX0dQmgtuhvXLy67ExSazriCKNDNAZFjiQX QCOb8FWcUKkOEUuHuQS807oPATAGv3IA3Z3+Cc5SgStDpltM3LVWDFO3DYK/pILIszD4ur eKPHM9+4HTH0dEVKJVlx+p7iYjWo2Elt/0/8q693S+JGYOr8SKx/uc/+p6afy3rKSHwhVZ eG17MEsqewphTeHiIKYzm/TElc6Y5VJDdWvbGmQwLOGOmfXD0hhqK6RJc9DKmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=91ec809f0a90798296697cfc9afdb1c50c6d4971 commit 91ec809f0a90798296697cfc9afdb1c50c6d4971 Author: Dimitry Andric AuthorDate: 2022-09-27 21:45:56 +0000 Commit: Dimitry Andric CommitDate: 2022-09-27 21:45:56 +0000 Apply llvm fix for assertion/crash building math/vtk Merge commit 307ace7f20d5 from llvm git (by David Sherwood): [LoopVectorize] Ensure the VPReductionRecipe is placed after all it's inputs When vectorising ordered reductions we call a function LoopVectorizationPlanner::adjustRecipesForReductions to replace the existing VPWidenRecipe for the fadd instruction with a new VPReductionRecipe. We attempt to insert the new recipe in the same place, but this is wrong because createBlockInMask may have generated new recipes that VPReductionRecipe now depends upon. I have changed the insertion code to append the recipe to the VPBasicBlock instead. Added a new RUN with tail-folding enabled to the existing test: Transforms/LoopVectorize/AArch64/scalable-strict-fadd.ll Differential Revision: https://reviews.llvm.org/D129550 Reported by: yuri PR: 264834 MFC after: 3 days --- contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp index 0fdcb8be59ac..51d2c6237af1 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -9453,7 +9453,9 @@ void LoopVectorizationPlanner::adjustRecipesForReductions( WidenRecipe->getVPSingleValue()->replaceAllUsesWith(RedRecipe); Plan->removeVPValueFor(R); Plan->addVPValue(R, RedRecipe); - WidenRecipe->getParent()->insert(RedRecipe, WidenRecipe->getIterator()); + // Append the recipe to the end of the VPBasicBlock because we need to + // ensure that it comes after all of it's inputs, including CondOp. + WidenRecipe->getParent()->appendRecipe(RedRecipe); WidenRecipe->getVPSingleValue()->replaceAllUsesWith(RedRecipe); WidenRecipe->eraseFromParent();