From 9cfeba5b12b6bc721e4e52196d44088f5f1fff30 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Tue, 11 Apr 2023 00:05:24 +0900 Subject: [PATCH] Restore CodeGen/LowLevelType from `Support` This is rework of; - D30046 (LLT) Since I have introduced `llvm-min-tblgen` as D146352, `llvm-tblgen` may depend on `CodeGen`. `LowLevlType.h` originally belonged to `CodeGen`. Almost all userse are still under `CodeGen` or `Target`. I think `CodeGen` is the right place to put `LowLevelType.h`. `MachineValueType.h` may be moved as well. (later, D149024) I have made many modules depend on `CodeGen`. It is consistent but inefficient. It will be split out later, D148769 Besides, I had to isolate MVT and LLT in modmap, since `llvm::PredicateInfo` clashes between `TableGen/CodeGenSchedule.h` and `Transforms/Utils/PredicateInfo.h`. (I think better to introduce namespace llvm::TableGen) Depends on D145937, D146352, and D148768. Differential Revision: https://reviews.llvm.org/D148767 --- clang/lib/CodeGen/CMakeLists.txt | 1 + llvm/include/llvm/CodeGen/GlobalISel/CallLowering.h | 2 +- llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h | 2 +- .../include/llvm/CodeGen/GlobalISel/InstructionSelector.h | 2 +- .../include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h | 2 +- llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h | 2 +- llvm/include/llvm/CodeGen/GlobalISel/Utils.h | 2 +- .../LowLevelTypeImpl.h => CodeGen/LowLevelType.h} | 8 ++++---- llvm/include/llvm/CodeGen/LowLevelTypeUtils.h | 2 +- llvm/include/llvm/CodeGen/MachineMemOperand.h | 2 +- llvm/include/llvm/CodeGen/RegisterBankInfo.h | 2 +- llvm/include/llvm/module.modulemap | 8 ++++++++ llvm/lib/CodeGen/CMakeLists.txt | 1 + llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp | 2 +- llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp | 2 +- llvm/lib/{Support => CodeGen}/LowLevelType.cpp | 4 ++-- llvm/lib/CodeGen/MIRParser/MIParser.cpp | 2 +- llvm/lib/CodeGen/MIRPrinter.cpp | 2 +- llvm/lib/CodeGen/MachineInstr.cpp | 2 +- llvm/lib/CodeGen/MachineVerifier.cpp | 2 +- llvm/lib/Support/CMakeLists.txt | 1 - llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/AMDGPU/AMDGPUGlobalISelUtils.cpp | 2 +- llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt | 1 + llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt | 1 + llvm/lib/Target/ARC/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/ARM/ARMCallLowering.cpp | 2 +- llvm/lib/Target/ARM/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/ARM/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/AVR/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/AVR/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/Lanai/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/M68k/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/M68k/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp | 2 +- llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/RISCV/MCA/CMakeLists.txt | 1 + llvm/lib/Target/SPIRV/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/VE/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/VE/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/WebAssembly/AsmParser/CMakeLists.txt | 1 + llvm/lib/Target/WebAssembly/Disassembler/CMakeLists.txt | 1 + llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/X86/MCA/CMakeLists.txt | 1 + llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt | 1 + llvm/lib/Target/X86/X86CallLowering.cpp | 2 +- llvm/lib/Target/X86/X86InstructionSelector.cpp | 2 +- llvm/lib/Target/XCore/Disassembler/CMakeLists.txt | 1 + llvm/tools/llvm-dwarfutil/CMakeLists.txt | 1 + llvm/tools/llvm-exegesis/CMakeLists.txt | 1 + llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt | 1 + llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt | 1 + llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt | 1 + llvm/unittests/CodeGen/MachineOperandTest.cpp | 2 +- llvm/unittests/DebugInfo/DWARF/CMakeLists.txt | 1 + llvm/utils/TableGen/CMakeLists.txt | 8 +++++--- llvm/utils/TableGen/GlobalISel/CMakeLists.txt | 1 + llvm/utils/TableGen/GlobalISelEmitter.cpp | 2 +- utils/bazel/llvm-project-overlay/llvm/BUILD.bazel | 6 +++++- 70 files changed, 88 insertions(+), 33 deletions(-) rename llvm/include/llvm/{Support/LowLevelTypeImpl.h => CodeGen/LowLevelType.h} (98%) rename llvm/lib/{Support => CodeGen}/LowLevelType.cpp (95%) diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt index 7c7403f239c8..f687b8d29e55 100644 --- a/clang/lib/CodeGen/CMakeLists.txt +++ b/clang/lib/CodeGen/CMakeLists.txt @@ -3,6 +3,7 @@ set(LLVM_LINK_COMPONENTS Analysis BitReader BitWriter + CodeGen Core Coroutines Coverage diff --git a/llvm/include/llvm/CodeGen/GlobalISel/CallLowering.h b/llvm/include/llvm/CodeGen/GlobalISel/CallLowering.h index de2d6876e6b7..103cb0ee533f 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/CallLowering.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/CallLowering.h @@ -17,13 +17,13 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SmallVector.h" #include "llvm/CodeGen/CallingConvLower.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineOperand.h" #include "llvm/CodeGen/TargetCallingConv.h" #include "llvm/IR/CallingConv.h" #include "llvm/IR/Type.h" #include "llvm/IR/Value.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MachineValueType.h" #include #include diff --git a/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h b/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h index 1b268933618f..f6c0764a6426 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h @@ -19,8 +19,8 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/Register.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/IR/InstrTypes.h" #include diff --git a/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h b/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h index 8954d5cdcc37..fda84080636b 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/InstructionSelector.h @@ -18,9 +18,9 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/CodeGen/GlobalISel/Utils.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/IR/Function.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include #include #include diff --git a/llvm/include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h b/llvm/include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h index 3cacdc99dbf8..08233dba2041 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h @@ -16,8 +16,8 @@ #define LLVM_CODEGEN_GLOBALISEL_LEGACYLEGALIZERINFO_H #include "llvm/ADT/DenseMap.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/TargetOpcodes.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include namespace llvm { diff --git a/llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h b/llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h index 50b11a4920bb..569b86cca635 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h @@ -17,12 +17,12 @@ #include "llvm/ADT/SmallBitVector.h" #include "llvm/ADT/SmallVector.h" #include "llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineMemOperand.h" #include "llvm/CodeGen/TargetOpcodes.h" #include "llvm/MC/MCInstrDesc.h" #include "llvm/Support/AtomicOrdering.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include #include #include diff --git a/llvm/include/llvm/CodeGen/GlobalISel/Utils.h b/llvm/include/llvm/CodeGen/GlobalISel/Utils.h index c9941afc8013..d5c1fd8d0d51 100644 --- a/llvm/include/llvm/CodeGen/GlobalISel/Utils.h +++ b/llvm/include/llvm/CodeGen/GlobalISel/Utils.h @@ -17,11 +17,11 @@ #include "GISelWorkList.h" #include "llvm/ADT/APFloat.h" #include "llvm/ADT/StringRef.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/Register.h" #include "llvm/IR/DebugLoc.h" #include "llvm/Support/Alignment.h" #include "llvm/Support/Casting.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include namespace llvm { diff --git a/llvm/include/llvm/Support/LowLevelTypeImpl.h b/llvm/include/llvm/CodeGen/LowLevelType.h similarity index 98% rename from llvm/include/llvm/Support/LowLevelTypeImpl.h rename to llvm/include/llvm/CodeGen/LowLevelType.h index f33c1ecde039..436ceb00e591 100644 --- a/llvm/include/llvm/Support/LowLevelTypeImpl.h +++ b/llvm/include/llvm/CodeGen/LowLevelType.h @@ -1,4 +1,4 @@ -//== llvm/Support/LowLevelTypeImpl.h --------------------------- -*- C++ -*-==// +//== llvm/CodeGen/LowLevelType.h ------------------------------- -*- C++ -*-==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -23,8 +23,8 @@ /// //===----------------------------------------------------------------------===// -#ifndef LLVM_SUPPORT_LOWLEVELTYPEIMPL_H -#define LLVM_SUPPORT_LOWLEVELTYPEIMPL_H +#ifndef LLVM_CODEGEN_LOWLEVELTYPE_H +#define LLVM_CODEGEN_LOWLEVELTYPE_H #include "llvm/ADT/DenseMapInfo.h" #include "llvm/Support/Debug.h" @@ -428,4 +428,4 @@ template<> struct DenseMapInfo { } -#endif // LLVM_SUPPORT_LOWLEVELTYPEIMPL_H +#endif // LLVM_CODEGEN_LOWLEVELTYPE_H diff --git a/llvm/include/llvm/CodeGen/LowLevelTypeUtils.h b/llvm/include/llvm/CodeGen/LowLevelTypeUtils.h index 35117829d34a..5cd8e5412df2 100644 --- a/llvm/include/llvm/CodeGen/LowLevelTypeUtils.h +++ b/llvm/include/llvm/CodeGen/LowLevelTypeUtils.h @@ -16,8 +16,8 @@ #ifndef LLVM_CODEGEN_LOWLEVELTYPEUTILS_H #define LLVM_CODEGEN_LOWLEVELTYPEUTILS_H +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/ValueTypes.h" -#include "llvm/Support/LowLevelTypeImpl.h" namespace llvm { diff --git a/llvm/include/llvm/CodeGen/MachineMemOperand.h b/llvm/include/llvm/CodeGen/MachineMemOperand.h index fd5f7f7a115c..8410f5745aa4 100644 --- a/llvm/include/llvm/CodeGen/MachineMemOperand.h +++ b/llvm/include/llvm/CodeGen/MachineMemOperand.h @@ -17,12 +17,12 @@ #include "llvm/ADT/BitmaskEnum.h" #include "llvm/ADT/PointerUnion.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/PseudoSourceValue.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/IR/Value.h" // PointerLikeTypeTraits #include "llvm/Support/AtomicOrdering.h" #include "llvm/Support/DataTypes.h" -#include "llvm/Support/LowLevelTypeImpl.h" namespace llvm { diff --git a/llvm/include/llvm/CodeGen/RegisterBankInfo.h b/llvm/include/llvm/CodeGen/RegisterBankInfo.h index 2606b04a0206..03bb58fbf4f2 100644 --- a/llvm/include/llvm/CodeGen/RegisterBankInfo.h +++ b/llvm/include/llvm/CodeGen/RegisterBankInfo.h @@ -18,9 +18,9 @@ #include "llvm/ADT/Hashing.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/iterator_range.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/Register.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include #include #include diff --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap index d6dbc2b9cf48..ad5876f3a756 100644 --- a/llvm/include/llvm/module.modulemap +++ b/llvm/include/llvm/module.modulemap @@ -15,6 +15,14 @@ module LLVM_AsmParser { module * { export * } } +module LLVM_CodeGenTypes { + requires cplusplus + + module LLT { + header "CodeGen/LowLevelType.h" export * + } +} + // A module covering CodeGen/ and Target/. These are intertwined // and codependent, and thus notionally form a single module. module LLVM_Backend { diff --git a/llvm/lib/CodeGen/CMakeLists.txt b/llvm/lib/CodeGen/CMakeLists.txt index 989b79dff8fc..f264c45d2446 100644 --- a/llvm/lib/CodeGen/CMakeLists.txt +++ b/llvm/lib/CodeGen/CMakeLists.txt @@ -99,6 +99,7 @@ add_llvm_component_library(LLVMCodeGen LLVMTargetMachine.cpp LocalStackSlotAllocation.cpp LoopTraversal.cpp + LowLevelType.cpp LowLevelTypeUtils.cpp LowerEmuTLS.cpp MachineBasicBlock.cpp diff --git a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp index 4437bcacd0a6..94fd394da9ab 100644 --- a/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp +++ b/llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp @@ -28,6 +28,7 @@ #include "llvm/CodeGen/GlobalISel/GISelChangeObserver.h" #include "llvm/CodeGen/GlobalISel/InlineAsmLowering.h" #include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/LowLevelTypeUtils.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineFrameInfo.h" @@ -74,7 +75,6 @@ #include "llvm/Support/CodeGen.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetIntrinsicInfo.h" diff --git a/llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp b/llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp index 4b6c3a156709..1f2e481c63e0 100644 --- a/llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp +++ b/llvm/lib/CodeGen/GlobalISel/LegalizerInfo.cpp @@ -13,6 +13,7 @@ #include "llvm/CodeGen/GlobalISel/LegalizerInfo.h" #include "llvm/ADT/SmallBitVector.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineOperand.h" #include "llvm/CodeGen/MachineRegisterInfo.h" @@ -21,7 +22,6 @@ #include "llvm/MC/MCInstrInfo.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include using namespace llvm; diff --git a/llvm/lib/Support/LowLevelType.cpp b/llvm/lib/CodeGen/LowLevelType.cpp similarity index 95% rename from llvm/lib/Support/LowLevelType.cpp rename to llvm/lib/CodeGen/LowLevelType.cpp index e394f98fa62e..916ebe297449 100644 --- a/llvm/lib/Support/LowLevelType.cpp +++ b/llvm/lib/CodeGen/LowLevelType.cpp @@ -1,4 +1,4 @@ -//===-- llvm/Support/LowLevelType.cpp -------------------------------------===// +//===-- llvm/CodeGen/LowLevelType.cpp -------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/LowLevelTypeImpl.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; diff --git a/llvm/lib/CodeGen/MIRParser/MIParser.cpp b/llvm/lib/CodeGen/MIRParser/MIParser.cpp index d38e0ba36580..34fb64ea66ce 100644 --- a/llvm/lib/CodeGen/MIRParser/MIParser.cpp +++ b/llvm/lib/CodeGen/MIRParser/MIParser.cpp @@ -24,6 +24,7 @@ #include "llvm/Analysis/MemoryLocation.h" #include "llvm/AsmParser/Parser.h" #include "llvm/AsmParser/SlotMapping.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MIRFormatter.h" #include "llvm/CodeGen/MIRPrinter.h" #include "llvm/CodeGen/MachineBasicBlock.h" @@ -62,7 +63,6 @@ #include "llvm/Support/BranchProbability.h" #include "llvm/Support/Casting.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/SMLoc.h" #include "llvm/Support/SourceMgr.h" diff --git a/llvm/lib/CodeGen/MIRPrinter.cpp b/llvm/lib/CodeGen/MIRPrinter.cpp index e2031e12edbe..4b2fdfb356ca 100644 --- a/llvm/lib/CodeGen/MIRPrinter.cpp +++ b/llvm/lib/CodeGen/MIRPrinter.cpp @@ -18,6 +18,7 @@ #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MIRYamlMapping.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineConstantPool.h" @@ -47,7 +48,6 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Format.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/YAMLTraits.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetMachine.h" diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp index 5617cb0369e0..2a43ed0a7c2b 100644 --- a/llvm/lib/CodeGen/MachineInstr.cpp +++ b/llvm/lib/CodeGen/MachineInstr.cpp @@ -18,6 +18,7 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/MemoryLocation.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFunction.h" @@ -50,7 +51,6 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FormattedStream.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetMachine.h" #include diff --git a/llvm/lib/CodeGen/MachineVerifier.cpp b/llvm/lib/CodeGen/MachineVerifier.cpp index fb78c4ce1242..d6a323db250e 100644 --- a/llvm/lib/CodeGen/MachineVerifier.cpp +++ b/llvm/lib/CodeGen/MachineVerifier.cpp @@ -37,6 +37,7 @@ #include "llvm/CodeGen/LiveRangeCalc.h" #include "llvm/CodeGen/LiveStacks.h" #include "llvm/CodeGen/LiveVariables.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFunction.h" @@ -71,7 +72,6 @@ #include "llvm/Pass.h" #include "llvm/Support/Casting.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/ModRef.h" #include "llvm/Support/raw_ostream.h" diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index 2c19be4f1d87..b000c436670e 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -183,7 +183,6 @@ add_llvm_component_library(LLVMSupport LineIterator.cpp Locale.cpp LockFileManager.cpp - LowLevelType.cpp ManagedStatic.cpp MathExtras.cpp MemAlloc.cpp diff --git a/llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt b/llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt index deb5fca02f7f..9eda74718cfe 100644 --- a/llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt @@ -7,6 +7,7 @@ add_llvm_component_library(LLVMAArch64AsmParser AArch64Desc AArch64Info AArch64Utils + CodeGen MC MCParser Support diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt index b7a770580e8b..2eeb28bbe5b0 100644 --- a/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt @@ -16,6 +16,7 @@ add_llvm_component_library(LLVMAArch64Desc AArch64Info AArch64Utils BinaryFormat + CodeGen MC Support TargetParser diff --git a/llvm/lib/Target/AMDGPU/AMDGPUGlobalISelUtils.cpp b/llvm/lib/Target/AMDGPU/AMDGPUGlobalISelUtils.cpp index 2ffc8b2a3a7b..09930dc9612c 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUGlobalISelUtils.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUGlobalISelUtils.cpp @@ -10,8 +10,8 @@ #include "GCNSubtarget.h" #include "llvm/CodeGen/GlobalISel/GISelKnownBits.h" #include "llvm/CodeGen/GlobalISel/MIPatternMatch.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/IR/Constants.h" -#include "llvm/Support/LowLevelTypeImpl.h" using namespace llvm; using namespace MIPatternMatch; diff --git a/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt b/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt index 1b96c7571d7b..c351c9b11af8 100644 --- a/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt @@ -5,6 +5,7 @@ add_llvm_component_library(LLVMAMDGPUAsmParser AMDGPUDesc AMDGPUInfo AMDGPUUtils + CodeGen MC MCParser Support diff --git a/llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt b/llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt index 33591ec211fe..9157e95c5ec4 100644 --- a/llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt @@ -7,6 +7,7 @@ add_llvm_component_library(LLVMAMDGPUDisassembler AMDGPUDesc AMDGPUInfo AMDGPUUtils + CodeGen MC MCDisassembler Support diff --git a/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt b/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt index fcad1d4a3519..e548b58594f3 100644 --- a/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt +++ b/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt @@ -5,6 +5,7 @@ add_llvm_component_library(LLVMAMDGPUTargetMCA AMDGPUDesc AMDGPUInfo AMDGPUUtils + CodeGen MC MCA MCParser diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt index 7eb5008cfbfe..ae910a0667ba 100644 --- a/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt @@ -16,6 +16,7 @@ add_llvm_component_library(LLVMAMDGPUDesc AMDGPUInfo AMDGPUUtils BinaryFormat + CodeGen Core MC Support diff --git a/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt b/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt index 2d4a3f22e8c4..186c2864e8d8 100644 --- a/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt +++ b/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt @@ -8,6 +8,7 @@ add_llvm_component_library(LLVMAMDGPUUtils LINK_COMPONENTS Analysis BinaryFormat + CodeGen Core MC Support diff --git a/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt index 3e68a42f10e0..0fba497f1ecc 100644 --- a/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt @@ -3,6 +3,7 @@ add_llvm_component_library(LLVMARCDisassembler LINK_COMPONENTS ARCInfo + CodeGen MCDisassembler Support diff --git a/llvm/lib/Target/ARM/ARMCallLowering.cpp b/llvm/lib/Target/ARM/ARMCallLowering.cpp index e84346b82c34..bc94e785e426 100644 --- a/llvm/lib/Target/ARM/ARMCallLowering.cpp +++ b/llvm/lib/Target/ARM/ARMCallLowering.cpp @@ -22,6 +22,7 @@ #include "llvm/CodeGen/CallingConvLower.h" #include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h" #include "llvm/CodeGen/GlobalISel/Utils.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/LowLevelTypeUtils.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineFrameInfo.h" @@ -40,7 +41,6 @@ #include "llvm/IR/Type.h" #include "llvm/IR/Value.h" #include "llvm/Support/Casting.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MachineValueType.h" #include #include diff --git a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt index 424d8550aa09..c93a91067acc 100644 --- a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt @@ -5,6 +5,7 @@ add_llvm_component_library(LLVMARMAsmParser ARMDesc ARMInfo ARMUtils + CodeGen MC MCParser Support diff --git a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt index 5d20172bf36a..77d39075c9da 100644 --- a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt @@ -5,6 +5,7 @@ add_llvm_component_library(LLVMARMDisassembler ARMDesc ARMInfo ARMUtils + CodeGen MC MCDisassembler Support diff --git a/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt index d84dd962d8b5..d77098d9ba68 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt @@ -18,6 +18,7 @@ add_llvm_component_library(LLVMARMDesc ARMInfo ARMUtils BinaryFormat + CodeGen MC MCDisassembler Support diff --git a/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt b/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt index a72c2ad2a174..d723fc8f577f 100644 --- a/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt @@ -4,6 +4,7 @@ add_llvm_component_library(LLVMAVRAsmParser LINK_COMPONENTS AVRDesc AVRInfo + CodeGen MC MCParser Support diff --git a/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt b/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt index 37b35f317aa1..7e0fd5e6110a 100644 --- a/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt @@ -3,6 +3,7 @@ add_llvm_component_library(LLVMAVRDisassembler LINK_COMPONENTS AVRInfo + CodeGen MC MCDisassembler Support diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt index da134c4e056a..3fa30c5c59ee 100644 --- a/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/CSKY/MCTargetDesc/CMakeLists.txt @@ -11,6 +11,7 @@ add_llvm_component_library(LLVMCSKYDesc LINK_COMPONENTS CSKYInfo + CodeGen MC Support TargetParser diff --git a/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt b/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt index ed5acca9bfba..01e085046ea2 100644 --- a/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt @@ -4,6 +4,7 @@ add_llvm_component_library(LLVMLanaiAsmParser LanaiAsmParser.cpp LINK_COMPONENTS + CodeGen LanaiDesc LanaiInfo MC diff --git a/llvm/lib/Target/Lanai/Disassembler/CMakeLists.txt b/llvm/lib/Target/Lanai/Disassembler/CMakeLists.txt index cc5af1466ba4..adf022f0b16b 100644 --- a/llvm/lib/Target/Lanai/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/Lanai/Disassembler/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMLanaiDisassembler LanaiDisassembler.cpp LINK_COMPONENTS + CodeGen LanaiDesc LanaiInfo MC diff --git a/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt b/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt index a213dabcef14..7f809e1182de 100644 --- a/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/M68k/AsmParser/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMM68kAsmParser M68kAsmParser.cpp LINK_COMPONENTS + CodeGen M68kCodeGen M68kInfo MC diff --git a/llvm/lib/Target/M68k/Disassembler/CMakeLists.txt b/llvm/lib/Target/M68k/Disassembler/CMakeLists.txt index 2b8e676fee1b..020d0bce4934 100644 --- a/llvm/lib/Target/M68k/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/M68k/Disassembler/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMM68kDisassembler M68kDisassembler.cpp LINK_COMPONENTS + CodeGen M68kDesc M68kInfo MCDisassembler diff --git a/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt b/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt index 55f268718846..a136a14aa668 100644 --- a/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMMSP430AsmParser MSP430AsmParser.cpp LINK_COMPONENTS + CodeGen MC MCParser MSP430Desc diff --git a/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt index 89050e209c45..b0f8af837b88 100644 --- a/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt @@ -14,6 +14,7 @@ add_llvm_component_library(LLVMMipsDesc MipsTargetStreamer.cpp LINK_COMPONENTS + CodeGen MC MipsInfo Support diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp index 933077beb0c2..3e0d51ef887c 100644 --- a/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp +++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsABIInfo.cpp @@ -9,10 +9,10 @@ #include "MipsABIInfo.h" #include "MipsRegisterInfo.h" #include "llvm/ADT/StringRef.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineMemOperand.h" #include "llvm/MC/MCTargetOptions.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/LowLevelTypeImpl.h" using namespace llvm; diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt index 2fba5ab07d7c..f0051f340f99 100644 --- a/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt @@ -13,6 +13,7 @@ add_llvm_component_library(LLVMPowerPCDesc LINK_COMPONENTS BinaryFormat + CodeGen MC PowerPCInfo Support diff --git a/llvm/lib/Target/RISCV/MCA/CMakeLists.txt b/llvm/lib/Target/RISCV/MCA/CMakeLists.txt index 5740faaaa602..fb2009630e0d 100644 --- a/llvm/lib/Target/RISCV/MCA/CMakeLists.txt +++ b/llvm/lib/Target/RISCV/MCA/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMRISCVTargetMCA RISCVCustomBehaviour.cpp LINK_COMPONENTS + CodeGen MC MCA MCParser diff --git a/llvm/lib/Target/SPIRV/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SPIRV/MCTargetDesc/CMakeLists.txt index cf3e9011ac12..f1eb40c00efb 100644 --- a/llvm/lib/Target/SPIRV/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/SPIRV/MCTargetDesc/CMakeLists.txt @@ -9,6 +9,7 @@ add_llvm_component_library(LLVMSPIRVDesc SPIRVInstPrinter.cpp LINK_COMPONENTS + CodeGen MC SPIRVInfo Support diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt index ea6f5b7cb27d..5c1a323a8a0f 100644 --- a/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt @@ -7,6 +7,7 @@ add_llvm_component_library(LLVMSystemZDesc SystemZMCTargetDesc.cpp LINK_COMPONENTS + CodeGen MC Support SystemZInfo diff --git a/llvm/lib/Target/VE/AsmParser/CMakeLists.txt b/llvm/lib/Target/VE/AsmParser/CMakeLists.txt index 825c75c8e942..9e065504bccb 100644 --- a/llvm/lib/Target/VE/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/VE/AsmParser/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMVEAsmParser VEAsmParser.cpp LINK_COMPONENTS + CodeGen MC MCParser Support diff --git a/llvm/lib/Target/VE/Disassembler/CMakeLists.txt b/llvm/lib/Target/VE/Disassembler/CMakeLists.txt index 94580e19df26..6801de2ac5b6 100644 --- a/llvm/lib/Target/VE/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/VE/Disassembler/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMVEDisassembler VEDisassembler.cpp LINK_COMPONENTS + CodeGen MC MCDisassembler Support diff --git a/llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt index 314d8450b13c..2fbf1e8d0eaf 100644 --- a/llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt @@ -9,6 +9,7 @@ add_llvm_component_library(LLVMVEDesc VETargetStreamer.cpp LINK_COMPONENTS + CodeGen MC Support TargetParser diff --git a/llvm/lib/Target/WebAssembly/AsmParser/CMakeLists.txt b/llvm/lib/Target/WebAssembly/AsmParser/CMakeLists.txt index 52a64007c717..b9431be94a03 100644 --- a/llvm/lib/Target/WebAssembly/AsmParser/CMakeLists.txt +++ b/llvm/lib/Target/WebAssembly/AsmParser/CMakeLists.txt @@ -3,6 +3,7 @@ add_llvm_component_library(LLVMWebAssemblyAsmParser WebAssemblyAsmTypeCheck.cpp LINK_COMPONENTS + CodeGen MC MCParser Support diff --git a/llvm/lib/Target/WebAssembly/Disassembler/CMakeLists.txt b/llvm/lib/Target/WebAssembly/Disassembler/CMakeLists.txt index c7793ae3089d..ea2d3a560b68 100644 --- a/llvm/lib/Target/WebAssembly/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/WebAssembly/Disassembler/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMWebAssemblyDisassembler WebAssemblyDisassembler.cpp LINK_COMPONENTS + CodeGen MC MCDisassembler Support diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt index 1c83a1e9a7dd..fdf8e1dbd6fb 100644 --- a/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt @@ -9,6 +9,7 @@ add_llvm_component_library(LLVMWebAssemblyDesc WebAssemblyWasmObjectWriter.cpp LINK_COMPONENTS + CodeGen MC Support TargetParser diff --git a/llvm/lib/Target/X86/MCA/CMakeLists.txt b/llvm/lib/Target/X86/MCA/CMakeLists.txt index d03dabb1f27a..2153a6260b83 100644 --- a/llvm/lib/Target/X86/MCA/CMakeLists.txt +++ b/llvm/lib/Target/X86/MCA/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMX86TargetMCA X86CustomBehaviour.cpp LINK_COMPONENTS + CodeGen MC MCA MCParser diff --git a/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt index d021ff68371f..9df5ef9a1dd0 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt @@ -18,6 +18,7 @@ add_llvm_component_library(LLVMX86Desc LINK_COMPONENTS BinaryFormat + CodeGen MC MCDisassembler Support diff --git a/llvm/lib/Target/X86/X86CallLowering.cpp b/llvm/lib/Target/X86/X86CallLowering.cpp index 52c9a19d5062..2fb5b03170f6 100644 --- a/llvm/lib/Target/X86/X86CallLowering.cpp +++ b/llvm/lib/Target/X86/X86CallLowering.cpp @@ -25,6 +25,7 @@ #include "llvm/CodeGen/FunctionLoweringInfo.h" #include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h" #include "llvm/CodeGen/GlobalISel/Utils.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/LowLevelTypeUtils.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineFrameInfo.h" @@ -41,7 +42,6 @@ #include "llvm/IR/Function.h" #include "llvm/IR/Value.h" #include "llvm/MC/MCRegisterInfo.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MachineValueType.h" #include #include diff --git a/llvm/lib/Target/X86/X86InstructionSelector.cpp b/llvm/lib/Target/X86/X86InstructionSelector.cpp index 10637dc05d84..d7b2d0a61fbc 100644 --- a/llvm/lib/Target/X86/X86InstructionSelector.cpp +++ b/llvm/lib/Target/X86/X86InstructionSelector.cpp @@ -22,6 +22,7 @@ #include "llvm/CodeGen/GlobalISel/InstructionSelector.h" #include "llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h" #include "llvm/CodeGen/GlobalISel/Utils.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineFunction.h" @@ -40,7 +41,6 @@ #include "llvm/Support/CodeGen.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" #include diff --git a/llvm/lib/Target/XCore/Disassembler/CMakeLists.txt b/llvm/lib/Target/XCore/Disassembler/CMakeLists.txt index d35ff535e068..710167f9beda 100644 --- a/llvm/lib/Target/XCore/Disassembler/CMakeLists.txt +++ b/llvm/lib/Target/XCore/Disassembler/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_component_library(LLVMXCoreDisassembler XCoreDisassembler.cpp LINK_COMPONENTS + CodeGen MC MCDisassembler Support diff --git a/llvm/tools/llvm-dwarfutil/CMakeLists.txt b/llvm/tools/llvm-dwarfutil/CMakeLists.txt index 5be7056ce0d7..b03b2036d6a4 100644 --- a/llvm/tools/llvm-dwarfutil/CMakeLists.txt +++ b/llvm/tools/llvm-dwarfutil/CMakeLists.txt @@ -6,6 +6,7 @@ set(LLVM_LINK_COMPONENTS AllTargetsCodeGens AllTargetsDescs AllTargetsInfos + CodeGen DWARFLinker DebugInfoDWARF MC diff --git a/llvm/tools/llvm-exegesis/CMakeLists.txt b/llvm/tools/llvm-exegesis/CMakeLists.txt index 4ff1db9b430e..1d9d25ff75ea 100644 --- a/llvm/tools/llvm-exegesis/CMakeLists.txt +++ b/llvm/tools/llvm-exegesis/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS AllTargetsDescs AllTargetsDisassemblers AllTargetsInfos + CodeGen MC MCParser Support diff --git a/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt index 2dc948d50725..c2ca251d0279 100644 --- a/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt +++ b/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories( set(LLVM_LINK_COMPONENTS AArch64 + CodeGen Core Exegesis MC diff --git a/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt index 4661c21a6c86..26e97584d9d5 100644 --- a/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt +++ b/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ) set(LLVM_LINK_COMPONENTS + CodeGen Core Exegesis MC diff --git a/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt index 2766f7671965..272156b0d601 100644 --- a/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt +++ b/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ) set(LLVM_LINK_COMPONENTS + CodeGen Core Exegesis MC diff --git a/llvm/unittests/CodeGen/MachineOperandTest.cpp b/llvm/unittests/CodeGen/MachineOperandTest.cpp index 165e16829bca..31ab003cc62a 100644 --- a/llvm/unittests/CodeGen/MachineOperandTest.cpp +++ b/llvm/unittests/CodeGen/MachineOperandTest.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/MachineOperand.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/TargetFrameLowering.h" @@ -21,7 +22,6 @@ #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/TargetRegistry.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Target/TargetMachine.h" #include "gtest/gtest.h" diff --git a/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt b/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt index 21faae03c5c2..d63c2c72e41b 100644 --- a/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt +++ b/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt @@ -2,6 +2,7 @@ set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} AsmPrinter BinaryFormat + CodeGen DebugInfoDWARF MC Object diff --git a/llvm/utils/TableGen/CMakeLists.txt b/llvm/utils/TableGen/CMakeLists.txt index a470570d8835..7841d04a45ad 100644 --- a/llvm/utils/TableGen/CMakeLists.txt +++ b/llvm/utils/TableGen/CMakeLists.txt @@ -25,6 +25,11 @@ add_tablegen(llvm-min-tblgen LLVM_HEADERS ) set_target_properties(llvm-min-tblgen PROPERTIES FOLDER "Tablegenning") +set(LLVM_LINK_COMPONENTS + CodeGen + Support + ) + add_tablegen(llvm-tblgen LLVM DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" EXPORT LLVM @@ -81,9 +86,6 @@ add_tablegen(llvm-tblgen LLVM X86RecognizableInstr.cpp WebAssemblyDisassemblerEmitter.cpp $ - - DEPENDS - intrinsics_gen ) target_link_libraries(llvm-tblgen PRIVATE LLVMTableGenGlobalISel) set_target_properties(llvm-tblgen PROPERTIES FOLDER "Tablegenning") diff --git a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt index bce0ffc31486..c6cb680da2ec 100644 --- a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt +++ b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt @@ -1,4 +1,5 @@ set(LLVM_LINK_COMPONENTS + CodeGen Support TableGen ) diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp index fc32ebc2c0e4..7b06c1bf9cc0 100644 --- a/llvm/utils/TableGen/GlobalISelEmitter.cpp +++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp @@ -37,10 +37,10 @@ #include "InfoByHwMode.h" #include "SubtargetFeatureInfo.h" #include "llvm/ADT/Statistic.h" +#include "llvm/CodeGen/LowLevelType.h" #include "llvm/Support/CodeGenCoverage.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Error.h" -#include "llvm/Support/LowLevelTypeImpl.h" #include "llvm/Support/MachineValueType.h" #include "llvm/Support/SaveAndRestore.h" #include "llvm/Support/ScopedPrinter.h" diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel index 38b9f4028eba..fec1183dc6f9 100644 --- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel @@ -616,6 +616,7 @@ cc_library( features = ["-header_modules"], strip_include_prefix = "utils/TableGen", deps = [ + ":CodeGen", ":Support", ":TableGen", ":config", @@ -642,11 +643,11 @@ cc_binary( copts = llvm_copts, stamp = 0, deps = [ + ":CodeGen", ":Support", ":TableGen", ":TableGenGlobalISel", ":config", - ":intrinsic_enums_gen", ":llvm-tblgen-headers", ], ) @@ -2336,6 +2337,7 @@ gentbl( copts = llvm_copts, features = ["-layering_check"], deps = [ + ":CodeGen", ":MC", ":MCA", ":MCParser", @@ -3404,6 +3406,7 @@ cc_binary( deps = [ ":AllTargetsAsmParsers", ":AllTargetsCodeGens", + ":CodeGen", ":DWARFLinker", ":DebugInfoDWARF", ":DwarfutilOptionsTableGen", @@ -3444,6 +3447,7 @@ cc_binary( ":AllTargetsAsmParsers", ":AllTargetsCodeGens", ":AllTargetsDisassemblers", + ":CodeGen", ":Exegesis", ":MC", ":MCParser",