Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Oct 2024 22:49:20 +0200
From:      Dimitry Andric <dim@FreeBSD.org>
To:        Cy Schubert <Cy.Schubert@cschubert.com>
Cc:        "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org>
Subject:   Re: git: 5deeebd8c6ca - main - Merge llvm-project release/19.x  llvmorg-19.1.2-0-g7ba7d8e2f7b6
Message-ID:  <607104A9-2521-4A8A-9253-AD31D6E09BCC@FreeBSD.org>
In-Reply-To: <20241023204507.9C34DB7@slippy.cwsent.com>
References:  <202410231832.49NIWcTJ078019@gitrepo.freebsd.org> <20241023194054.2CC0611B@slippy.cwsent.com> <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org> <20241023203535.D652666@slippy.cwsent.com> <20241023204507.9C34DB7@slippy.cwsent.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On 23 Oct 2024, at 22:45, Cy Schubert <Cy.Schubert@cschubert.com> wrote:
>=20
> In message <20241023203535.D652666@slippy.cwsent.com>, Cy Schubert =
writes:
>> In message <6C4EEA56-6F73-4A69-9838-0D62D1E575B0@FreeBSD.org>, =
Dimitry=20
>> Andric w
>> rites:
>>> On 23 Oct 2024, at 21:40, Cy Schubert <Cy.Schubert@cschubert.com> =
wrote:
>>>> =3D20
>>>> In message <202410231832.49NIWcTJ078019@gitrepo.freebsd.org>, =
Dimitry =3D
>>> Andric wr
>>>> ites:
>>>>> The branch main has been updated by dim:
>>>>> =3D20
>>>>> URL: =3D
>>> =
https://cgit.FreeBSD.org/src/commit/?id=3D3D5deeebd8c6ca991269e72902a7a62c=
ad=3D
>>>=20
>>>>> a57947f6
>>>>> =3D20
>>>>> commit 5deeebd8c6ca991269e72902a7a62cada57947f6
>>>>> Merge: 6e516c87b6d7 e6b732792813
>>>>> Author:     Dimitry Andric <dim@FreeBSD.org>
>>>>> AuthorDate: 2024-10-21 12:59:26 +0000
>>>>> Commit:     Dimitry Andric <dim@FreeBSD.org>
>>>>> CommitDate: 2024-10-23 18:27:38 +0000
>>>>> =3D20
>>>>>   Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6
>>>>> =3D20
>>>>>   This updates llvm, clang, compiler-rt, libc++, libunwind, lld, =3D=

>>> lldb and
>>>>>   openmp to llvm-project release/19.x =3D
>>> llvmorg-19.1.2-0-g7ba7d8e2f7b6,
>>>>>   a.k.a. 19.1.2 release.
>>>>> =3D20
>>>>>   PR:             280562
>>>>>   MFC after:      1 month
>>>>> =3D20
>>>>> .../clang/include/clang/Basic/TokenKinds.def       |   5 +-
>>>>> contrib/llvm-project/clang/lib/CodeGen/CGCall.cpp  |  31 ++--
>>>>> contrib/llvm-project/clang/lib/CodeGen/CGClass.cpp |   2 +-
>>>>> contrib/llvm-project/clang/lib/CodeGen/CGExpr.cpp  |  16 +-
>>>>> .../clang/lib/CodeGen/CodeGenModule.cpp            |  15 +-
>>>>> .../llvm-project/clang/lib/CodeGen/CodeGenModule.h |   5 +-
>>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.cpp |  13 +-
>>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTBAA.h   |   5 +-
>>>>> .../clang/lib/CodeGen/CodeGenTypes.cpp             |   7 +-
>>>>> .../llvm-project/clang/lib/CodeGen/CodeGenTypes.h  |   8 +-
>>>>> .../clang/lib/CodeGen/MicrosoftCXXABI.cpp          |   2 +-
>>>>> .../clang/lib/Format/TokenAnnotator.cpp            |  42 ++---
>>>>> .../clang/lib/Format/UnwrappedLineParser.cpp       |  17 +-
>>>>> contrib/llvm-project/clang/lib/Headers/intrin0.h   |   2 +-
>>>>> contrib/llvm-project/clang/lib/Headers/vecintrin.h |  28 +++-
>>>>> .../clang/lib/Lex/PPMacroExpansion.cpp             |  52 +++---
>>>>> contrib/llvm-project/clang/lib/Sema/SemaExpr.cpp   |   3 +-
>>>>> .../llvm-project/clang/lib/Sema/TreeTransform.h    |   2 +-
>>>>> .../compiler-rt/lib/fuzzer/FuzzerUtilWindows.cpp   |   5 +
>>>>> .../sanitizer_common_interceptors.inc              | 180 =3D
>>> -------------------
>>>>> --
>>>>> .../sanitizer_platform_interceptors.h              |   2 -
>>>>> contrib/llvm-project/libcxx/include/__config       |   2 +-
>>>>> contrib/llvm-project/libcxx/include/version        |   7 +-
>>>>> contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp      |  20 ++-
>>>>> .../llvm/include/llvm/CodeGen/FastISel.h           |   3 +
>>>>> .../llvm/lib/CodeGen/SelectionDAG/FastISel.cpp     |  12 +-
>>>>> .../llvm/lib/Target/X86/X86FastISel.cpp            |   4 +-
>>>>> .../llvm/lib/Target/X86/X86ISelLowering.cpp        |  13 +-
>>>>> .../Transforms/InstCombine/InstCombineAndOrXor.cpp |  18 ++-
>>>>> .../lib/Transforms/Vectorize/VectorCombine.cpp     |  59 +++----
>>>>> lib/clang/include/VCSVersion.inc                   |   6 +-
>>>>> lib/clang/include/clang/Basic/Version.inc          |   6 +-
>>>>> lib/clang/include/lld/Common/Version.inc           |   2 +-
>>>>> lib/clang/include/lldb/Version/Version.inc         |   6 +-
>>>>> lib/clang/include/llvm/Config/config.h             |   4 +-
>>>>> lib/clang/include/llvm/Config/llvm-config.h        |   4 +-
>>>>> lib/clang/include/llvm/Support/VCSRevision.h       |   2 +-
>>>>> 37 files changed, 260 insertions(+), 350 deletions(-)
>>>>> =3D20
>>>> =3D20
>>>> Hi,
>>>> =3D20
>>>> One of these commits fails to build.
>>>> =3D20
>>>> c++  -O2 -pipe -pipe -fno-common =3D
>>> =
-I/export/obj/opt/src/git-src/amd64.amd64/tmp/obj-tools/lib/clang/libllvm =
=3D
>>> -I/opt/src/git-src/sys/contrib/zstd/lib =3D
>>> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/Target/X86 =3D
>>> -I/opt/src/git-src/contrib/llvm-project/llvm/lib/ObjCopy -DBLA
>>>> KE3_USE_NEON=3D3D0 -I/opt/src/git-src/lib/clang/include =3D
>>> -I/opt/src/git-src/contrib/llvm-project/llvm/include =3D
>>> -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS =
-D__STDC_LIMIT_MACROS =3D
>>> -DHAVE_VCS_VERSION_INC -DNDEBUG =3D
>>> -DLLVM_DEFAULT_TARGET_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" -D
>>>> LLVM_HOST_TRIPLE=3D3D\"x86_64-unknown-freebsd15.0\" =3D
>>> -DDEFAULT_SYSROOT=3D3D\"/export/obj/opt/src/git-src/amd64.amd64/tmp\" =
=3D
>>> -DLLVM_TARGET_ENABLE_X86 =3D
>>> -DLLVM_NATIVE_ASMPARSER=3D3DLLVMInitializeX86AsmParser =3D
>>> -DLLVM_NATIVE_ASMPRINTER=3D3DLLVMInitializeX86AsmPrinter =3D
>>> -DLLVM_NATIVE_DISASSEMBLER
>>>> =3D3DLLVMInitializeX86Disassembler =3D
>>> -DLLVM_NATIVE_TARGET=3D3DLLVMInitializeX86Target =3D
>>> -DLLVM_NATIVE_TARGETINFO=3D3DLLVMInitializeX86TargetInfo =3D
>>> -DLLVM_NATIVE_TARGETMC=3D3DLLVMInitializeX86TargetMC =
-ffunction-sections =3D
>>> -fdata-sections -gline-tables-only -Wno-format-zero-length =
-Wdate-time=3D20=3D
>>>=20
>>>> -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable =3D
>>> -Wno-error=3D3Dunused-but-set-parameter -Wno-tautological-compare =3D
>>> -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function =3D
>>> -Wno-enum-conversion -Wno-unused-local-typedef =3D
>>> -Wno-address-of-packed-member -
>>>> Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter =3D
>>> -Wno-parentheses -Qunused-arguments =3D
>>> -I/export/obj/opt/src/git-src/amd64.amd64/tmp/legacy/usr/include  =3D
>>> -fno-exceptions -fno-rtti -gline-tables-only -std=3D3Dc++17    =3D
>>> -stdlib=3D3Dlibc++ -Wno-c++11-extensions    -c /opt/src/
>>>> =3D
>>> =
git-src/contrib/llvm-project/llvm/lib/CodeGen/ShadowStackGCLowering.cpp =
=3D
>>> -o CodeGen/ShadowStackGCLowering.o
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:921:13: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 921 |     CurDAG->VerifyDAGDivergence();
>>>>     |     ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:941:13: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 941 |     CurDAG->VerifyDAGDivergence();
>>>>     |     ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:963:13: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 963 |     CurDAG->VerifyDAGDivergence();
>>>>     |     ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:987:15: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 987 |       CurDAG->VerifyDAGDivergence();
>>>>     |       ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:1005:15: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 1005 |       CurDAG->VerifyDAGDivergence();
>>>>     |       ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:1021:15: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 1021 |       CurDAG->VerifyDAGDivergence();
>>>>     |       ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:1041:15: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 1041 |       CurDAG->VerifyDAGDivergence();
>>>>     |       ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:1061:13: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 1061 |     CurDAG->VerifyDAGDivergence();
>>>>     |     ~~~~~~  ^
>>>> =3D
>>> =
/opt/src/git-src/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/Select=
=3D
>>> ionDAGISel.cpp:1081:13: error: no member named 'VerifyDAGDivergence' =
in =3D
>>> 'llvm::SelectionDAG'
>>>> 1081 |     CurDAG->VerifyDAGDivergence();
>>>>     |     ~~~~~~  ^
>>>=20
>>> I haven't fully universe-tested each and every individual squashed =3D=

>>> merge, so please use only the last one. If that one doesn't build, I =
=3D
>>> would be amazed, since it has gone through more than one universe =
build. =3D
>>> That said, some exotic configurations might not build. Do you have =
any =3D
>>> special make.conf or src.conf settings?
>>>=20
>>> -Dimitry
>>=20
>> I have nothing that would affect this.
>>=20
>> The following patch addresses the breakage.
>>=20
>> diff --git =
a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h=20
>> b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h
>> index 16ec65f2e7da..d2985d172711 100644
>> --- a/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h
>> +++ b/contrib/llvm-project/llvm/include/llvm/CodeGen/SelectionDAG.h
>> @@ -582,9 +582,7 @@ class SelectionDAG {
>>     return Root;
>>   }
>>=20
>> -#ifndef NDEBUG
>>   void VerifyDAGDivergence();
>> -#endif
>>=20
>>   /// This iterates over the nodes in the SelectionDAG, folding
>>   /// certain types of nodes together, or eliminating superfluous =
nodes. =20
>> The
>> --=20
>> 2.47.0
>>=20
>> But, NDEBUG is defined in bsd.lib.mk when MK_ASSERT_DEBUG =3D=3D =
"no". I do not=20
>> define MK_ASSERT_DEBUG anywhere.
>>=20
>>=20
>> --=20
>> Cheers,
>> Cy Schubert <Cy.Schubert@cschubert.com>
>> FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
>> NTP:           <cy@nwtime.org>    Web:  https://nwtime.org
>>=20
>> e^(i*pi)+1=3D0
>>=20
>=20
> Never mind. I have WITHOUT_LLVM_ASSERTIONS defined in src.conf.

Yeah I think that is it. I will test with that setting too, and probably =
import the upstream fix for it. I will keep you posted.

-Dimitry




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?607104A9-2521-4A8A-9253-AD31D6E09BCC>