From nobody Sun Jul 23 18:27:04 2023 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 4R8BbD6rFRz4p6DZ; Sun, 23 Jul 2023 18:27:04 +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 4R8BbD5WqFz3RKK; Sun, 23 Jul 2023 18:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136824; 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=NpgER2BwhfhunfYe42Ch3So1tntMc/2qUWpRmonIEao=; b=c+ne7Wi/z+7iduvFk+KzRO/XEWTQrQCn868qhS+NF62sSUE91LOtsfDxh7y5xXKkpDFaDP /Thvps7IHJA+ucWGthT/ka63dq2l+rJOdUvK3zj6B5mNdYaQPshqMBTxidSooRtEW2C80h ATdVISQtoTxXt/h/A/K0AxZixXmTB/Yccwunx07ZFJoa456zjU9oJI/MmuuKHbuvmSVO4/ QDMi1wvnOJzfgUSboRhGBH+vC31pHNyuUmT/o6uMe5IzrWMnbx/z6j3owXWONMXZii5+xb PDz3H233zlYvzoQi/r9md5AS7gXD0FxbKc2qy2Yv0FRWjT6CH0UViUZH4hCWeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136824; 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=NpgER2BwhfhunfYe42Ch3So1tntMc/2qUWpRmonIEao=; b=xn89M2jGtKEqiwWMHTL+Q66IpZD19gmCbVdP5XfqBLKn9dHyvJjNU7xsZFkEoTwYlzgG4G e9KRC13zBdgNju58hM43Di9J3husGpcRrGTWPu2RlKkXWJVDakhFiDZpJILpg8o6lLzSLJ wmTIr60jyhHiwXD8bZ61fnkV+5zh9eaRKEqhenTkCf+mMPjGgdcRv9myEwYbiw4HxkGC1F yWvoIvSgqcOXcPcIt5oXChDdkVh1JUSxO0ToRV9aUd5VmmCeLq/WpIhOFxhUozEo48vWFb aGiyqz83IZB7HcRZ1+F5Fpepnxhdl7Jig921OHQ2pm4ewdPZHB9jw6x7jkkpFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136824; a=rsa-sha256; cv=none; b=vOHMaCcSDz0uXcynWKjB5ZjbLryPh7gkKlVtxuvzyFtK7vMvG0lGs/wkNvd2HROnwSqCR6 tfpaPQRo00YapFk7o6w8m1V9dPB3A+HgXTRvfxxl8/GggFd54NM2nvOhvUCTrodSH+biD1 7qGcrkllI1WdmkqjG1Jm/G/avwNAKEGm6PYRBfg/hPVVV4kxlSc++0wIUM7DisotM2c5KU k3C6AtbM9z2XyNw84ei9cUsaDRwPEsZgq1id6lPFXnT5ElbKuOj4kPhGhphTw4WUA9BKV/ YoPGqu3ZiG5Ei75Ked9657L2E2WGIeDytKRl6xOw3+zZlrfaOpwPuAnH91Er/w== 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 4R8BbD3qDBzmfD; Sun, 23 Jul 2023 18:27:04 +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 36NIR4nd058686; Sun, 23 Jul 2023 18:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIR4EG058685; Sun, 23 Jul 2023 18:27:04 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:27:04 GMT Message-Id: <202307231827.36NIR4EG058685@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: 2da197f30da5 - stable/13 - Merge commit db492316399a from llvm-project (by Dimitry Andric): 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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: 2da197f30da59015be64f98a2901c4e0a16819f6 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2da197f30da59015be64f98a2901c4e0a16819f6 commit 2da197f30da59015be64f98a2901c4e0a16819f6 Author: Dimitry Andric AuthorDate: 2023-04-20 19:22:59 +0000 Commit: Dimitry Andric CommitDate: 2023-07-23 17:38:09 +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 (cherry picked from commit 1ac57eed95099f4d9da2ecab6000ad66d05c1018) --- 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";