From 58a2cbef4aac9ee7d530dfb690c78d6fc11a2371 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Wed, 2 Jan 2013 10:22:59 +0000 Subject: Resort the #include lines in include/... and lib/... with the utils/sort_includes.py script. Most of these are updating the new R600 target and fixing up a few regressions that have creeped in since the last time I sorted the includes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171362 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCELFStreamer.h | 1 - include/llvm/MC/MCInstrDesc.h | 4 ++-- include/llvm/MC/MCSectionELF.h | 2 +- include/llvm/Operator.h | 2 +- include/llvm/Option/ArgList.h | 3 +-- include/llvm/Option/Option.h | 2 +- lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 2 +- lib/Option/Arg.cpp | 1 - lib/Option/ArgList.cpp | 1 - lib/Option/OptTable.cpp | 3 +-- lib/Option/Option.cpp | 4 +--- lib/Support/Process.cpp | 2 +- lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp | 2 +- lib/Target/ARM/Thumb2SizeReduction.cpp | 2 +- lib/Target/Mips/Mips16FrameLowering.cpp | 2 +- lib/Target/R600/AMDGPUAsmPrinter.cpp | 2 +- lib/Target/R600/AMDGPUInstrInfo.h | 3 +-- lib/Target/R600/AMDGPUMCInstLower.cpp | 2 +- lib/Target/R600/AMDGPUStructurizeCFG.cpp | 4 ++-- lib/Target/R600/AMDILCFGStructurizer.cpp | 2 +- lib/Target/R600/AMDILEvergreenDevice.h | 2 +- lib/Target/R600/AMDILISelLowering.cpp | 2 +- lib/Target/R600/AMDILIntrinsicInfo.cpp | 2 +- lib/Target/R600/AMDILNIDevice.cpp | 2 +- lib/Target/R600/AMDILNIDevice.h | 2 +- lib/Target/R600/AMDILSIDevice.cpp | 2 +- lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp | 2 +- lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp | 3 +-- lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp | 2 +- lib/Target/R600/R600ExpandSpecialInstrs.cpp | 2 +- lib/Target/R600/R600ISelLowering.cpp | 2 +- lib/Target/R600/R600InstrInfo.cpp | 2 +- lib/Target/R600/R600InstrInfo.h | 3 +-- lib/Target/R600/R600RegisterInfo.h | 2 +- lib/Target/R600/SIAnnotateControlFlow.cpp | 7 +++---- lib/Target/R600/SIInstrInfo.cpp | 1 - lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp | 2 +- lib/Target/XCore/XCoreAsmPrinter.cpp | 2 +- lib/Transforms/Instrumentation/AddressSanitizer.cpp | 2 +- lib/Transforms/Scalar/ObjCARC.cpp | 2 +- lib/Transforms/Utils/Local.cpp | 2 +- 41 files changed, 41 insertions(+), 53 deletions(-) diff --git a/include/llvm/MC/MCELFStreamer.h b/include/llvm/MC/MCELFStreamer.h index 6608d96e4b..5e148c3b09 100644 --- a/include/llvm/MC/MCELFStreamer.h +++ b/include/llvm/MC/MCELFStreamer.h @@ -15,7 +15,6 @@ #include "llvm/MC/MCObjectStreamer.h" #include "llvm/MC/SectionKind.h" #include "llvm/Support/DataTypes.h" - #include namespace llvm { diff --git a/include/llvm/MC/MCInstrDesc.h b/include/llvm/MC/MCInstrDesc.h index cb87641daa..9b5415add2 100644 --- a/include/llvm/MC/MCInstrDesc.h +++ b/include/llvm/MC/MCInstrDesc.h @@ -15,9 +15,9 @@ #ifndef LLVM_MC_MCINSTRDESC_H #define LLVM_MC_MCINSTRDESC_H -#include "llvm/Support/DataTypes.h" -#include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCInst.h" +#include "llvm/MC/MCRegisterInfo.h" +#include "llvm/Support/DataTypes.h" namespace llvm { diff --git a/include/llvm/MC/MCSectionELF.h b/include/llvm/MC/MCSectionELF.h index 451a1623c1..4b8b849c79 100644 --- a/include/llvm/MC/MCSectionELF.h +++ b/include/llvm/MC/MCSectionELF.h @@ -16,9 +16,9 @@ #include "llvm/ADT/StringRef.h" #include "llvm/MC/MCSection.h" +#include "llvm/Support/Debug.h" #include "llvm/Support/ELF.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Debug.h" namespace llvm { diff --git a/include/llvm/Operator.h b/include/llvm/Operator.h index b2bb2e6b31..6fadc6fa7b 100644 --- a/include/llvm/Operator.h +++ b/include/llvm/Operator.h @@ -19,8 +19,8 @@ #include "llvm/DataLayout.h" #include "llvm/DerivedTypes.h" #include "llvm/Instruction.h" -#include "llvm/Type.h" #include "llvm/Support/GetElementPtrTypeIterator.h" +#include "llvm/Type.h" namespace llvm { diff --git a/include/llvm/Option/ArgList.h b/include/llvm/Option/ArgList.h index 7d09f8e6cc..378b58a87d 100644 --- a/include/llvm/Option/ArgList.h +++ b/include/llvm/Option/ArgList.h @@ -12,9 +12,8 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" -#include "llvm/Option/Option.h" #include "llvm/Option/OptSpecifier.h" - +#include "llvm/Option/Option.h" #include #include #include diff --git a/include/llvm/Option/Option.h b/include/llvm/Option/Option.h index d0e46112a3..ee5eec417d 100644 --- a/include/llvm/Option/Option.h +++ b/include/llvm/Option/Option.h @@ -10,8 +10,8 @@ #ifndef LLVM_SUPPORT_OPTION_H_ #define LLVM_SUPPORT_OPTION_H_ -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/SmallVector.h" +#include "llvm/ADT/StringRef.h" #include "llvm/Option/OptTable.h" #include "llvm/Support/ErrorHandling.h" diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index ea80acdd59..e9b3706612 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -41,7 +41,6 @@ #include "llvm/Support/MathExtras.h" #include "llvm/Support/Mutex.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/TargetTransformInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetIntrinsicInfo.h" #include "llvm/Target/TargetLowering.h" @@ -49,6 +48,7 @@ #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Target/TargetSelectionDAGInfo.h" +#include "llvm/TargetTransformInfo.h" #include #include using namespace llvm; diff --git a/lib/Option/Arg.cpp b/lib/Option/Arg.cpp index 9f547bd825..4c8da58f53 100644 --- a/lib/Option/Arg.cpp +++ b/lib/Option/Arg.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Option/Arg.h" - #include "llvm/ADT/SmallString.h" #include "llvm/ADT/Twine.h" #include "llvm/Option/ArgList.h" diff --git a/lib/Option/ArgList.cpp b/lib/Option/ArgList.cpp index 65cb51959e..39b22d776e 100644 --- a/lib/Option/ArgList.cpp +++ b/lib/Option/ArgList.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Option/ArgList.h" - #include "llvm/ADT/SmallString.h" #include "llvm/ADT/Twine.h" #include "llvm/Option/Arg.h" diff --git a/lib/Option/OptTable.cpp b/lib/Option/OptTable.cpp index 3b34bf3b3a..5c8a0eacd1 100644 --- a/lib/Option/OptTable.cpp +++ b/lib/Option/OptTable.cpp @@ -8,12 +8,11 @@ //===----------------------------------------------------------------------===// #include "llvm/Option/OptTable.h" - #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/Option.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/raw_ostream.h" #include #include diff --git a/lib/Option/Option.cpp b/lib/Option/Option.cpp index 003f07f037..0e2263475e 100644 --- a/lib/Option/Option.cpp +++ b/lib/Option/Option.cpp @@ -8,13 +8,11 @@ //===----------------------------------------------------------------------===// #include "llvm/Option/Option.h" - #include "llvm/ADT/Twine.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/ErrorHandling.h" - +#include "llvm/Support/raw_ostream.h" #include #include diff --git a/lib/Support/Process.cpp b/lib/Support/Process.cpp index 1e21d64e60..64a1fa237e 100644 --- a/lib/Support/Process.cpp +++ b/lib/Support/Process.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/Config/config.h" -#include "llvm/Support/Process.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/Process.h" using namespace llvm; using namespace sys; diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp index c781967692..f4958f3a38 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp @@ -12,9 +12,9 @@ //===----------------------------------------------------------------------===// #include "ARMMCTargetDesc.h" +#include "ARMBaseInfo.h" #include "ARMELFStreamer.h" #include "ARMMCAsmInfo.h" -#include "ARMBaseInfo.h" #include "InstPrinter/ARMInstPrinter.h" #include "llvm/MC/MCCodeGenInfo.h" #include "llvm/MC/MCInstrAnalysis.h" diff --git a/lib/Target/ARM/Thumb2SizeReduction.cpp b/lib/Target/ARM/Thumb2SizeReduction.cpp index 4a7eb4010b..e1490ba209 100644 --- a/lib/Target/ARM/Thumb2SizeReduction.cpp +++ b/lib/Target/ARM/Thumb2SizeReduction.cpp @@ -19,10 +19,10 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineInstrBuilder.h" +#include "llvm/Function.h" // To access Function attributes #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Function.h" // To access Function attributes using namespace llvm; STATISTIC(NumNarrows, "Number of 32-bit instrs reduced to 16-bit ones"); diff --git a/lib/Target/Mips/Mips16FrameLowering.cpp b/lib/Target/Mips/Mips16FrameLowering.cpp index 5c80a6c609..c2153676e5 100644 --- a/lib/Target/Mips/Mips16FrameLowering.cpp +++ b/lib/Target/Mips/Mips16FrameLowering.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "Mips16FrameLowering.h" -#include "Mips16InstrInfo.h" #include "MCTargetDesc/MipsBaseInfo.h" +#include "Mips16InstrInfo.h" #include "MipsInstrInfo.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineFunction.h" diff --git a/lib/Target/R600/AMDGPUAsmPrinter.cpp b/lib/Target/R600/AMDGPUAsmPrinter.cpp index 4553c4556c..754506c837 100644 --- a/lib/Target/R600/AMDGPUAsmPrinter.cpp +++ b/lib/Target/R600/AMDGPUAsmPrinter.cpp @@ -22,8 +22,8 @@ #include "SIMachineFunctionInfo.h" #include "SIRegisterInfo.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Support/TargetRegistry.h" +#include "llvm/Target/TargetLoweringObjectFile.h" using namespace llvm; diff --git a/lib/Target/R600/AMDGPUInstrInfo.h b/lib/Target/R600/AMDGPUInstrInfo.h index 32ac691fe0..cb97af9831 100644 --- a/lib/Target/R600/AMDGPUInstrInfo.h +++ b/lib/Target/R600/AMDGPUInstrInfo.h @@ -16,10 +16,9 @@ #ifndef AMDGPUINSTRUCTIONINFO_H #define AMDGPUINSTRUCTIONINFO_H -#include "AMDGPURegisterInfo.h" #include "AMDGPUInstrInfo.h" +#include "AMDGPURegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" - #include #define GET_INSTRINFO_HEADER diff --git a/lib/Target/R600/AMDGPUMCInstLower.cpp b/lib/Target/R600/AMDGPUMCInstLower.cpp index 32275a2b04..46a569f079 100644 --- a/lib/Target/R600/AMDGPUMCInstLower.cpp +++ b/lib/Target/R600/AMDGPUMCInstLower.cpp @@ -19,9 +19,9 @@ #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Constants.h" +#include "llvm/MC/MCExpr.h" #include "llvm/MC/MCInst.h" #include "llvm/MC/MCStreamer.h" -#include "llvm/MC/MCExpr.h" #include "llvm/Support/ErrorHandling.h" using namespace llvm; diff --git a/lib/Target/R600/AMDGPUStructurizeCFG.cpp b/lib/Target/R600/AMDGPUStructurizeCFG.cpp index 22338b5bf7..d14428fd2d 100644 --- a/lib/Target/R600/AMDGPUStructurizeCFG.cpp +++ b/lib/Target/R600/AMDGPUStructurizeCFG.cpp @@ -16,11 +16,11 @@ //===----------------------------------------------------------------------===// #include "AMDGPU.h" -#include "llvm/Module.h" #include "llvm/ADT/SCCIterator.h" -#include "llvm/Analysis/RegionIterator.h" #include "llvm/Analysis/RegionInfo.h" +#include "llvm/Analysis/RegionIterator.h" #include "llvm/Analysis/RegionPass.h" +#include "llvm/Module.h" #include "llvm/Transforms/Utils/SSAUpdater.h" using namespace llvm; diff --git a/lib/Target/R600/AMDILCFGStructurizer.cpp b/lib/Target/R600/AMDILCFGStructurizer.cpp index 9de97b6269..aa8ab6bd93 100644 --- a/lib/Target/R600/AMDILCFGStructurizer.cpp +++ b/lib/Target/R600/AMDILCFGStructurizer.cpp @@ -18,7 +18,6 @@ #include "llvm/ADT/Statistic.h" #include "llvm/Analysis/DominatorInternals.h" #include "llvm/Analysis/Dominators.h" -#include "llvm/CodeGen/MachinePostDominators.h" #include "llvm/CodeGen/MachineDominators.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineFunctionAnalysis.h" @@ -26,6 +25,7 @@ #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineJumpTableInfo.h" #include "llvm/CodeGen/MachineLoopInfo.h" +#include "llvm/CodeGen/MachinePostDominators.h" #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" diff --git a/lib/Target/R600/AMDILEvergreenDevice.h b/lib/Target/R600/AMDILEvergreenDevice.h index 6dc2deb9ed..ea90f774a8 100644 --- a/lib/Target/R600/AMDILEvergreenDevice.h +++ b/lib/Target/R600/AMDILEvergreenDevice.h @@ -16,8 +16,8 @@ //===----------------------------------------------------------------------===// #ifndef AMDILEVERGREENDEVICE_H #define AMDILEVERGREENDEVICE_H -#include "AMDILDevice.h" #include "AMDGPUSubtarget.h" +#include "AMDILDevice.h" namespace llvm { class AMDGPUSubtarget; diff --git a/lib/Target/R600/AMDILISelLowering.cpp b/lib/Target/R600/AMDILISelLowering.cpp index 8bfd30c6e3..9dda186872 100644 --- a/lib/Target/R600/AMDILISelLowering.cpp +++ b/lib/Target/R600/AMDILISelLowering.cpp @@ -14,9 +14,9 @@ #include "AMDGPUISelLowering.h" #include "AMDGPURegisterInfo.h" +#include "AMDGPUSubtarget.h" #include "AMDILDevices.h" #include "AMDILIntrinsicInfo.h" -#include "AMDGPUSubtarget.h" #include "llvm/CallingConv.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineRegisterInfo.h" diff --git a/lib/Target/R600/AMDILIntrinsicInfo.cpp b/lib/Target/R600/AMDILIntrinsicInfo.cpp index 70db4e6da2..d3125ab410 100644 --- a/lib/Target/R600/AMDILIntrinsicInfo.cpp +++ b/lib/Target/R600/AMDILIntrinsicInfo.cpp @@ -13,8 +13,8 @@ //===-----------------------------------------------------------------------===// #include "AMDILIntrinsicInfo.h" -#include "AMDIL.h" #include "AMDGPUSubtarget.h" +#include "AMDIL.h" #include "llvm/DerivedTypes.h" #include "llvm/Intrinsics.h" #include "llvm/Module.h" diff --git a/lib/Target/R600/AMDILNIDevice.cpp b/lib/Target/R600/AMDILNIDevice.cpp index b82da5908a..47c3f7f209 100644 --- a/lib/Target/R600/AMDILNIDevice.cpp +++ b/lib/Target/R600/AMDILNIDevice.cpp @@ -8,8 +8,8 @@ /// \file //==-----------------------------------------------------------------------===// #include "AMDILNIDevice.h" -#include "AMDILEvergreenDevice.h" #include "AMDGPUSubtarget.h" +#include "AMDILEvergreenDevice.h" using namespace llvm; diff --git a/lib/Target/R600/AMDILNIDevice.h b/lib/Target/R600/AMDILNIDevice.h index bc7df37b26..24a640845e 100644 --- a/lib/Target/R600/AMDILNIDevice.h +++ b/lib/Target/R600/AMDILNIDevice.h @@ -15,8 +15,8 @@ //===---------------------------------------------------------------------===// #ifndef AMDILNIDEVICE_H #define AMDILNIDEVICE_H -#include "AMDILEvergreenDevice.h" #include "AMDGPUSubtarget.h" +#include "AMDILEvergreenDevice.h" namespace llvm { diff --git a/lib/Target/R600/AMDILSIDevice.cpp b/lib/Target/R600/AMDILSIDevice.cpp index 7c2710f1b2..3096c22067 100644 --- a/lib/Target/R600/AMDILSIDevice.cpp +++ b/lib/Target/R600/AMDILSIDevice.cpp @@ -8,9 +8,9 @@ /// \file //==-----------------------------------------------------------------------===// #include "AMDILSIDevice.h" +#include "AMDGPUSubtarget.h" #include "AMDILEvergreenDevice.h" #include "AMDILNIDevice.h" -#include "AMDGPUSubtarget.h" using namespace llvm; diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp index 6a62856e10..072ee49b63 100644 --- a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp +++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp @@ -15,12 +15,12 @@ #include "AMDGPUMCTargetDesc.h" #include "AMDGPUMCAsmInfo.h" #include "InstPrinter/AMDGPUInstPrinter.h" -#include "llvm/MC/MachineLocation.h" #include "llvm/MC/MCCodeGenInfo.h" #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSubtargetInfo.h" +#include "llvm/MC/MachineLocation.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/TargetRegistry.h" diff --git a/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp b/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp index dc91924c73..36deae9c0a 100644 --- a/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp +++ b/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp @@ -19,8 +19,8 @@ //===----------------------------------------------------------------------===// #include "R600Defines.h" -#include "MCTargetDesc/AMDGPUMCTargetDesc.h" #include "MCTargetDesc/AMDGPUMCCodeEmitter.h" +#include "MCTargetDesc/AMDGPUMCTargetDesc.h" #include "llvm/MC/MCCodeEmitter.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCInst.h" @@ -28,7 +28,6 @@ #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCSubtargetInfo.h" #include "llvm/Support/raw_ostream.h" - #include #define SRC_BYTE_COUNT 11 diff --git a/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp b/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp index c47dc995c7..b4bdb25289 100644 --- a/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp +++ b/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp @@ -17,11 +17,11 @@ #include "MCTargetDesc/AMDGPUMCCodeEmitter.h" #include "llvm/MC/MCCodeEmitter.h" #include "llvm/MC/MCContext.h" +#include "llvm/MC/MCFixup.h" #include "llvm/MC/MCInst.h" #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCSubtargetInfo.h" -#include "llvm/MC/MCFixup.h" #include "llvm/Support/raw_ostream.h" #define VGPR_BIT(src_idx) (1ULL << (9 * src_idx - 1)) diff --git a/lib/Target/R600/R600ExpandSpecialInstrs.cpp b/lib/Target/R600/R600ExpandSpecialInstrs.cpp index b6e62b7cef..b903d4aedd 100644 --- a/lib/Target/R600/R600ExpandSpecialInstrs.cpp +++ b/lib/Target/R600/R600ExpandSpecialInstrs.cpp @@ -17,8 +17,8 @@ #include "AMDGPU.h" #include "R600Defines.h" #include "R600InstrInfo.h" -#include "R600RegisterInfo.h" #include "R600MachineFunctionInfo.h" +#include "R600RegisterInfo.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineRegisterInfo.h" diff --git a/lib/Target/R600/R600ISelLowering.cpp b/lib/Target/R600/R600ISelLowering.cpp index 19e6f9c057..da72c6d93e 100644 --- a/lib/Target/R600/R600ISelLowering.cpp +++ b/lib/Target/R600/R600ISelLowering.cpp @@ -17,10 +17,10 @@ #include "R600InstrInfo.h" #include "R600MachineFunctionInfo.h" #include "llvm/Argument.h" -#include "llvm/Function.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/CodeGen/SelectionDAG.h" +#include "llvm/Function.h" using namespace llvm; diff --git a/lib/Target/R600/R600InstrInfo.cpp b/lib/Target/R600/R600InstrInfo.cpp index 28637b890b..06b78d09cc 100644 --- a/lib/Target/R600/R600InstrInfo.cpp +++ b/lib/Target/R600/R600InstrInfo.cpp @@ -13,8 +13,8 @@ //===----------------------------------------------------------------------===// #include "R600InstrInfo.h" -#include "AMDGPUTargetMachine.h" #include "AMDGPUSubtarget.h" +#include "AMDGPUTargetMachine.h" #include "R600Defines.h" #include "R600RegisterInfo.h" #include "llvm/CodeGen/MachineInstrBuilder.h" diff --git a/lib/Target/R600/R600InstrInfo.h b/lib/Target/R600/R600InstrInfo.h index 6bb0ca92e4..11685af5b0 100644 --- a/lib/Target/R600/R600InstrInfo.h +++ b/lib/Target/R600/R600InstrInfo.h @@ -15,11 +15,10 @@ #ifndef R600INSTRUCTIONINFO_H_ #define R600INSTRUCTIONINFO_H_ -#include "AMDIL.h" #include "AMDGPUInstrInfo.h" +#include "AMDIL.h" #include "R600Defines.h" #include "R600RegisterInfo.h" - #include namespace llvm { diff --git a/lib/Target/R600/R600RegisterInfo.h b/lib/Target/R600/R600RegisterInfo.h index c170ccb378..f9ca918f24 100644 --- a/lib/Target/R600/R600RegisterInfo.h +++ b/lib/Target/R600/R600RegisterInfo.h @@ -15,8 +15,8 @@ #ifndef R600REGISTERINFO_H_ #define R600REGISTERINFO_H_ -#include "AMDGPUTargetMachine.h" #include "AMDGPURegisterInfo.h" +#include "AMDGPUTargetMachine.h" namespace llvm { diff --git a/lib/Target/R600/SIAnnotateControlFlow.cpp b/lib/Target/R600/SIAnnotateControlFlow.cpp index 92385b6878..1c1e0a613e 100644 --- a/lib/Target/R600/SIAnnotateControlFlow.cpp +++ b/lib/Target/R600/SIAnnotateControlFlow.cpp @@ -13,12 +13,11 @@ //===----------------------------------------------------------------------===// #include "AMDGPU.h" - -#include "llvm/Pass.h" -#include "llvm/Module.h" +#include "llvm/ADT/DepthFirstIterator.h" #include "llvm/Analysis/Dominators.h" +#include "llvm/Module.h" +#include "llvm/Pass.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "llvm/ADT/DepthFirstIterator.h" #include "llvm/Transforms/Utils/SSAUpdater.h" using namespace llvm; diff --git a/lib/Target/R600/SIInstrInfo.cpp b/lib/Target/R600/SIInstrInfo.cpp index adcffa8bbd..c6ad4d531d 100644 --- a/lib/Target/R600/SIInstrInfo.cpp +++ b/lib/Target/R600/SIInstrInfo.cpp @@ -18,7 +18,6 @@ #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/MC/MCInstrDesc.h" - #include using namespace llvm; diff --git a/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp b/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp index 048f9ebe05..b5b072dcbd 100644 --- a/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp +++ b/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "XCoreMCTargetDesc.h" -#include "XCoreMCAsmInfo.h" #include "InstPrinter/XCoreInstPrinter.h" +#include "XCoreMCAsmInfo.h" #include "llvm/MC/MCCodeGenInfo.h" #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCRegisterInfo.h" diff --git a/lib/Target/XCore/XCoreAsmPrinter.cpp b/lib/Target/XCore/XCoreAsmPrinter.cpp index 474d3aa215..14ffbe51a9 100644 --- a/lib/Target/XCore/XCoreAsmPrinter.cpp +++ b/lib/Target/XCore/XCoreAsmPrinter.cpp @@ -14,9 +14,9 @@ #define DEBUG_TYPE "asm-printer" #include "XCore.h" +#include "InstPrinter/XCoreInstPrinter.h" #include "XCoreInstrInfo.h" #include "XCoreMCInstLower.h" -#include "InstPrinter/XCoreInstPrinter.h" #include "XCoreSubtarget.h" #include "XCoreTargetMachine.h" #include "llvm/ADT/SmallString.h" diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp index 1c12391948..ab03bb58f1 100644 --- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -26,8 +26,8 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/Triple.h" -#include "llvm/DataLayout.h" #include "llvm/DIBuilder.h" +#include "llvm/DataLayout.h" #include "llvm/Function.h" #include "llvm/IRBuilder.h" #include "llvm/InlineAsm.h" diff --git a/lib/Transforms/Scalar/ObjCARC.cpp b/lib/Transforms/Scalar/ObjCARC.cpp index 3c4aea1330..8fa703893a 100644 --- a/lib/Transforms/Scalar/ObjCARC.cpp +++ b/lib/Transforms/Scalar/ObjCARC.cpp @@ -30,8 +30,8 @@ #define DEBUG_TYPE "objc-arc" #include "llvm/ADT/DenseMap.h" -#include "llvm/Support/Debug.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index 7c18a38829..f2783c304c 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/lib/Transforms/Utils/Local.cpp @@ -14,8 +14,8 @@ #include "llvm/Transforms/Utils/Local.h" #include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/SmallPtrSet.h" #include "llvm/Analysis/Dominators.h" #include "llvm/Analysis/InstructionSimplify.h" #include "llvm/Analysis/MemoryBuiltins.h" -- cgit v1.2.3