From nobody Thu Jun 22 21:11:01 2023 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 4QnChk3FsBz4gfQn; Thu, 22 Jun 2023 21:11:02 +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 4QnChj71hLz492H; Thu, 22 Jun 2023 21:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468262; 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=nog5EjSuIbnrTBfo9gcgX1cuqS782tBSYfOz5bodxW0=; b=j3v65GG1u/zF1OmVARJNl9yNEdzaMV8SdL87dj1JKPb6yWm9JY8J/WHxl3Yk7YToBBvnbk BNx4Z82LnpqhN8BVWxJmnQwrIGSJNPFKGN0MOWR8/xW5XHzUDEmbz/n8/TZGRNLUsEgzwT UVLxxgOo4QQUUCr/Pjqhjr9X6ueLGURolCj8fnpPpuZEGecagx6PNDKuPcdV2hKfzhyYTb 8MJwBWLEKmCgYl3mTwhuDg/XKsbxbt+ZoLldxk3NBELrM0+xL2x3M6QsTAd5/NH69ohmsA xvZIOKT1Wi86ZHt+bI8yq75MPfLh4WUX2Ow4GgjxToyuG9s4yC+JFfo20nhrNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687468262; 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=nog5EjSuIbnrTBfo9gcgX1cuqS782tBSYfOz5bodxW0=; b=AVk1KeksKIL1LkupIzmeiOVq4Qs8ev1QMKjBcg+JN23ozYrVlHZdfskGLhMzxb1mo8CBVY 5MYCbePkte19xJswNRK0n/4OuckLB6ZTBg6aHcSQCSrARZkwjlodceliFykiv8qp4CLzfy Ej4dh5tM3uuyTsnYvi8psRmo584fxHcuVuiAQ5q24qDfVIo+UbiBrR+thHS0vFolJ3+PHY pcHkBSKeFCvjyLoAjCJjTW/POVCXAuQUnvztTqGW7wbfjx2bEUVfY+y3XFKMTZzbhrnvof J6PaA+GmGLs1Adt5knMi9UZbS5gHy2rIwrYOph8jfF4b4CeYaDFFqA4MH7b0Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687468262; a=rsa-sha256; cv=none; b=TXDNeKt/vCUPQKppBCpF2pLV9tg5KmizD+wYYuo0WzlrGyWF7VKksurd1MadqPGsSzNev4 1buMowfY9HQHtGXgS67F2OQIOBY9q/0WBae3jIZgIhEdPdyxl52sARGjJyTQoE99zoU+Bh CcOhc4BfEwCM3bBKQqBvJJ9X7jI/N9Qbw9hnY4Z83V/07AaxLTKiy1tOcq6EOEbHFNj+cB HLdpSXwdFzF9c94lDsYylcZ2A+ahrzr15cQ69QMZ1p8dQL8TbwqITFRdO0Rweu/bz7CSGH tZwd2MAhol3KICMaH2iUWbCN3z1srL92Ca6ieMDJbPunmNwQpAdIGujQQgjbhg== 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 4QnChj4FPlzdpr; Thu, 22 Jun 2023 21:11:01 +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 35MLB1da066164; Thu, 22 Jun 2023 21:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MLB1tg066163; Thu, 22 Jun 2023 21:11:01 GMT (envelope-from git) Date: Thu, 22 Jun 2023 21:11:01 GMT Message-Id: <202306222111.35MLB1tg066163@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: 1ac57eed9509 - main - Merge commit db492316399a from llvm-project (by Dimitry Andric): 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: 1ac57eed95099f4d9da2ecab6000ad66d05c1018 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1ac57eed95099f4d9da2ecab6000ad66d05c1018 commit 1ac57eed95099f4d9da2ecab6000ad66d05c1018 Author: Dimitry Andric AuthorDate: 2023-04-20 19:22:59 +0000 Commit: Dimitry Andric CommitDate: 2023-06-22 18:22:26 +0000 Merge commit db492316399a from llvm-project (by Dimitry Andric): [clang][BFloat] Avoid redefining bfloat16_t in arm_neon.h As of https://reviews.llvm.org/D79708, clang-tblgen generates `arm_neon.h`, `arm_sve.h` and `arm_bf16.h`, and all those generated files will contain a typedef of `bfloat16_t`. However, `arm_neon.h` and `arm_sve.h` include `arm_bf16.h` immediately before their own typedef: #include typedef __bf16 bfloat16_t; With a recent version of clang (I used 16.0.1) this results in warnings: /usr/lib/clang/16/include/arm_neon.h:38:16: error: redefinition of typedef 'bfloat16_t' is a C11 feature [-Werror,-Wtypedef-redefinition] Since `arm_bf16.h` is very likely supposed to be the one true place where `bfloat16_t` is defined, I propose to delete the duplicate typedefs from the generated `arm_neon.h` and `arm_sve.h`. Reviewed By: sdesmalen, simonbutcher Differential Revision: https://reviews.llvm.org/D148822 PR: 271047 MFC after: 1 month --- contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp | 1 - contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp b/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp index 8f46b08b1366..08f2344f5d0a 100644 --- a/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp +++ b/contrib/llvm-project/clang/utils/TableGen/NeonEmitter.cpp @@ -2353,7 +2353,6 @@ void NeonEmitter::run(raw_ostream &OS) { OS << "#include \n\n"; OS << "#include \n"; - OS << "typedef __bf16 bfloat16_t;\n"; // Emit NEON-specific scalar typedefs. OS << "typedef float float32_t;\n"; diff --git a/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp b/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp index a577c10e3c64..bca61e703020 100644 --- a/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp +++ b/contrib/llvm-project/clang/utils/TableGen/SveEmitter.cpp @@ -1103,7 +1103,6 @@ void SVEEmitter::createHeader(raw_ostream &OS) { OS << "typedef __SVBFloat16_t svbfloat16_t;\n"; OS << "#include \n"; - OS << "typedef __bf16 bfloat16_t;\n"; OS << "typedef __SVFloat32_t svfloat32_t;\n"; OS << "typedef __SVFloat64_t svfloat64_t;\n";