Author: Dennis Wang Date: 2026-10-29T10:08:33+08:00 New Revision: 16b31a851f863dad2223e5146c238e33393ed239
URL: https://github.com/llvm/llvm-project/commit/16b31a851f863dad2223e5146c238e33393ed239 DIFF: https://github.com/llvm/llvm-project/commit/16b31a851f863dad2223e5146c238e33393ed239.diff LOG: [clang][NFC] Migrate old AVR builtins to TableGen (#235039) Added: clang/include/clang/Basic/BuiltinsAVR.td Modified: clang/include/clang/Basic/CMakeLists.txt clang/include/clang/Basic/TargetBuiltins.h clang/include/module.modulemap clang/lib/Basic/Targets/AVR.cpp Removed: clang/include/clang/Basic/BuiltinsAVR.def ################################################################################ diff --git a/clang/include/clang/Basic/BuiltinsAVR.def b/clang/include/clang/Basic/BuiltinsAVR.def deleted file mode 100644 index 78b8daefef9340..00000000000000 --- a/clang/include/clang/Basic/BuiltinsAVR.def +++ /dev/null @@ -1,47 +0,0 @@ -//===--- BuiltinsAVR.def - AVR Builtin function database --------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// This file defines the AVR-specific builtin function database. Users of -// this file must define the BUILTIN macro to make use of this information. -// -//===----------------------------------------------------------------------===// - -// Void instructions -BUILTIN(__builtin_avr_nop, "v", "n") -BUILTIN(__builtin_avr_sei, "v", "n") -BUILTIN(__builtin_avr_cli, "v", "n") -BUILTIN(__builtin_avr_sleep, "v", "n") -BUILTIN(__builtin_avr_wdr, "v", "n") - -// Swap nibbles -BUILTIN(__builtin_avr_swap, "UcUc", "nc") - -// TODO: -// Fractional multiply -// BUILTIN(__builtin_avr_fmul, "UiUcUc", "nc") -// BUILTIN(__builtin_avr_fmuls, "SiScSc", "nc") -// BUILTIN(__builtin_avr_fmulsu, "SiScUc", "nc") - -// Delay cycles -// BUILTIN(__builtin_avr_delay_cycles, "vULi", "n") - -// Emit N NOP instructions -// BUILTIN(__builtin_avr_nops, "vUi", "n") - -// Bit manipulation -// BUILTIN(__builtin_avr_insert_bits, "UcULiUcUc", "nc") - -// Flash segment query -// BUILTIN(__builtin_avr_flash_segment, "ScvC*", "nc") - -// __builtin_avr_mask1 -// __builtin_avr_strlen_flash -// __builtin_avr_strlen_flashx -// __builtin_avr_strlen_memx - -#undef BUILTIN diff --git a/clang/include/clang/Basic/BuiltinsAVR.td b/clang/include/clang/Basic/BuiltinsAVR.td new file mode 100644 index 00000000000000..2ad381993bfa39 --- /dev/null +++ b/clang/include/clang/Basic/BuiltinsAVR.td @@ -0,0 +1,68 @@ +//===--- BuiltinsAVR.td - AVR Builtin function database ---------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +include "clang/Basic/BuiltinsBase.td" + +def AVR_NOP : TargetBuiltin { + let Spellings = ["__builtin_avr_nop"]; + let Attributes = [NoThrow]; + let Prototype = "void()"; +} + +def AVR_SEI : TargetBuiltin { + let Spellings = ["__builtin_avr_sei"]; + let Attributes = [NoThrow]; + let Prototype = "void()"; +} + +def AVR_CLI : TargetBuiltin { + let Spellings = ["__builtin_avr_cli"]; + let Attributes = [NoThrow]; + let Prototype = "void()"; +} + +def AVR_SLEEP : TargetBuiltin { + let Spellings = ["__builtin_avr_sleep"]; + let Attributes = [NoThrow]; + let Prototype = "void()"; +} + +def AVR_WDR : TargetBuiltin { + let Spellings = ["__builtin_avr_wdr"]; + let Attributes = [NoThrow]; + let Prototype = "void()"; +} + +def AVR_SWAP : TargetBuiltin { + let Spellings = ["__builtin_avr_swap"]; + let Attributes = [NoThrow, Const]; + let Prototype = "unsigned char(unsigned char)"; +} + +// TODO: +// Fractional multiply +// BUILTIN(__builtin_avr_fmul, "UiUcUc", "nc") +// BUILTIN(__builtin_avr_fmuls, "SiScSc", "nc") +// BUILTIN(__builtin_avr_fmulsu, "SiScUc", "nc") + +// Delay cycles +// BUILTIN(__builtin_avr_delay_cycles, "vULi", "n") + +// Emit N NOP instructions +// BUILTIN(__builtin_avr_nops, "vUi", "n") + +// Bit manipulation +// BUILTIN(__builtin_avr_insert_bits, "UcULiUcUc", "nc") + +// Flash segment query +// BUILTIN(__builtin_avr_flash_segment, "ScvC*", "nc") + +// __builtin_avr_mask1 +// __builtin_avr_strlen_flash +// __builtin_avr_strlen_flashx +// __builtin_avr_strlen_memx diff --git a/clang/include/clang/Basic/CMakeLists.txt b/clang/include/clang/Basic/CMakeLists.txt index a328abf9279701..8cb474d044bef9 100644 --- a/clang/include/clang/Basic/CMakeLists.txt +++ b/clang/include/clang/Basic/CMakeLists.txt @@ -107,6 +107,10 @@ clang_tablegen(BuiltinsAMDGPU.inc -gen-clang-builtins SOURCE BuiltinsAMDGPU.td TARGET ClangBuiltinsAMDGPU) +clang_tablegen(BuiltinsAVR.inc -gen-clang-builtins + SOURCE BuiltinsAVR.td + TARGET ClangBuiltinsAVR) + clang_tablegen(BuiltinsBPF.inc -gen-clang-builtins SOURCE BuiltinsBPF.td TARGET ClangBuiltinsBPF) diff --git a/clang/include/clang/Basic/TargetBuiltins.h b/clang/include/clang/Basic/TargetBuiltins.h index f069b7e52d13a5..97e835ee1f5c13 100644 --- a/clang/include/clang/Basic/TargetBuiltins.h +++ b/clang/include/clang/Basic/TargetBuiltins.h @@ -486,8 +486,9 @@ namespace clang { namespace AVR { enum { LastTIBuiltin = clang::Builtin::FirstTSBuiltin - 1, -#define BUILTIN(ID, TYPE, ATTRS) BI##ID, -#include "clang/Basic/BuiltinsAVR.def" +#define GET_BUILTIN_ENUMERATORS +#include "clang/Basic/BuiltinsAVR.inc" +#undef GET_BUILTIN_ENUMERATORS LastTSBuiltin }; } // namespace AVR diff --git a/clang/include/module.modulemap b/clang/include/module.modulemap index 58a3a5b6282b9b..d9653c53d5e037 100644 --- a/clang/include/module.modulemap +++ b/clang/include/module.modulemap @@ -41,7 +41,6 @@ module Clang_Basic { textual header "clang/Basic/BuiltinHeaders.def" textual header "clang/Basic/BuiltinsAArch64NeonSVEBridge.def" textual header "clang/Basic/BuiltinsAArch64NeonSVEBridge_cg.def" - textual header "clang/Basic/BuiltinsAVR.def" textual header "clang/Basic/BuiltinsHexagonMapCustomDep.def" textual header "clang/Basic/BuiltinsLoongArchBase.def" textual header "clang/Basic/BuiltinsLoongArchLASX.def" diff --git a/clang/lib/Basic/Targets/AVR.cpp b/clang/lib/Basic/Targets/AVR.cpp index 18db0a7807b539..86eaa3ffbaa00a 100644 --- a/clang/lib/Basic/Targets/AVR.cpp +++ b/clang/lib/Basic/Targets/AVR.cpp @@ -21,17 +21,16 @@ using namespace clang::targets; static constexpr int NumBuiltins = AVR::LastTSBuiltin - Builtin::FirstTSBuiltin; -static constexpr llvm::StringTable BuiltinStrings = - CLANG_BUILTIN_STR_TABLE_START -#define BUILTIN CLANG_BUILTIN_STR_TABLE -#include "clang/Basic/BuiltinsAVR.def" - ; - -static constexpr auto BuiltinInfos = Builtin::MakeInfos<NumBuiltins>({ -#define BUILTIN CLANG_BUILTIN_ENTRY -#define LIBBUILTIN CLANG_LIBBUILTIN_ENTRY -#include "clang/Basic/BuiltinsAVR.def" -}); +#define GET_BUILTIN_STR_TABLE +#include "clang/Basic/BuiltinsAVR.inc" +#undef GET_BUILTIN_STR_TABLE + +static constexpr Builtin::Info BuiltinInfos[] = { +#define GET_BUILTIN_INFOS +#include "clang/Basic/BuiltinsAVR.inc" +#undef GET_BUILTIN_INFOS +}; +static_assert(std::size(BuiltinInfos) == NumBuiltins); namespace clang { namespace targets { _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
