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

diff --git a/include/llvm/MC/MCELFStreamer.h b/include/llvm/MC/MCELFStreamer.h
index 6608d96e4b5824bf6976de76b79ac802618bf635..5e148c3b09c54c8036e80e591107e2d008aa5333 100644 (file)
--- 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 <vector>
 
 namespace llvm {

diff --git a/include/llvm/MC/MCInstrDesc.h b/include/llvm/MC/MCInstrDesc.h
index cb87641daad8ee03263b63b4ea166f50f29d80eb..9b5415add2413d1fe3783e051ee1841ce544e68d 100644 (file)
--- 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 451a1623c1f54c45f90e13801022f7a0607deeb8..4b8b849c79edf1ae74461dfb994149875d37a6d8 100644 (file)
--- 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 b2bb2e6b314da7aa88878b4939f3b2fdd9313ea1..6fadc6fa7b8a917867bd86a4c00912dfb81ac474 100644 (file)
--- 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 7d09f8e6cc8396eb10ff80376aeafcec712a4d92..378b58a87d2398b4aecf786fc81d41030347724a 100644 (file)
--- 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 <list>
 #include <string>
 #include <vector>

diff --git a/include/llvm/Option/Option.h b/include/llvm/Option/Option.h
index d0e46112a310d0d5fb7536d3c607a54937d0a84b..ee5eec417d08dc71a6821f711bf8117007f23ce8 100644 (file)
--- 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 ea80acdd5978644e44f6d7185676ba30e33f8f5a..e9b3706612ff8c9c01893ca6de6d4012c27f8f6c 100644 (file)
--- 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 <algorithm>
 #include <cmath>
 using namespace llvm;

diff --git a/lib/Option/Arg.cpp b/lib/Option/Arg.cpp
index 9f547bd825b0ec5a3e5608bfa39882c7c326f332..4c8da58f53689de0cc3347c04292ea54653097f2 100644 (file)
--- 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 65cb51959eb9d1c99bcf49c10c12e9dc34d9161f..39b22d776ed9cf93a8699857f128c6ea4ead2897 100644 (file)
--- 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 3b34bf3b3a819cca157ae31f19fb13faf400d199..5c8a0eacd1f412a4f9f464c004997e387fe90d0a 100644 (file)
--- 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 <algorithm>
 #include <map>
 

diff --git a/lib/Option/Option.cpp b/lib/Option/Option.cpp
index 003f07f0373aa4157e19183073e68a523107b2af..0e2263475e0cad1c84b21b56e71f97472f230830 100644 (file)
--- 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 <algorithm>
 #include <cassert>
 

diff --git a/lib/Support/Process.cpp b/lib/Support/Process.cpp
index 1e21d64e601f43cc85da8fa054faad2ef7d7a7b5..64a1fa237ee016c1e02a5df31858321a4ae91e05 100644 (file)
--- 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 c7819676927e64f1db8ffbaf85c814acdb36e795..f4958f3a380405138b3cb48620012902c08fbf3e 100644 (file)
--- 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 4a7eb4010b38079edb0dd83eed944d027cac2a20..e1490ba2096e14baa8baeb06ff4b2cbf3c2c5dd2 100644 (file)
--- 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 5c80a6c609f5609e307a1be754cb90f234a3ca59..c2153676e5fa7c23fe3ddaaffabb9ed38ea37cc7 100644 (file)
--- 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 4553c4556cf5cebd9e0c81521e0295a0268423fb..754506c837f8dde8ea0224b1486e3f63510227ac 100644 (file)
--- 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 32ac691fe030cb3e65d1d8d7d9689ecddc84709a..cb97af98317e45f7b05e8eb382867688053161da 100644 (file)
--- 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 <map>
 
 #define GET_INSTRINFO_HEADER

diff --git a/lib/Target/R600/AMDGPUMCInstLower.cpp b/lib/Target/R600/AMDGPUMCInstLower.cpp
index 32275a2b043df9a7efac83788aaf38353c269cb9..46a569f0793ed737ffb848bced77aceb476813f2 100644 (file)
--- 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 22338b5bf7833245159e2314944049fef3de7476..d14428fd2d71c7f0ce4eb5adf10ea9f28eb382dc 100644 (file)
--- 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 9de97b6269940c61e3be9a01cc477ae54a1e8b69..aa8ab6bd93f52ae94d3435401d702e3a7e630266 100644 (file)
--- 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 6dc2deb9ede2e18b5b6e76bcbb2d82f26cb39c15..ea90f774a856d1c4887f8d59a4d30e1d8c1b7da3 100644 (file)
--- 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 8bfd30c6e3ed0a95533eecc7b153818c3efff77c..9dda186872e0cfee652cc71af4ded2b1f40f63a7 100644 (file)
--- 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 70db4e6da2c16044ab5e5a812a210f3ec2189e17..d3125ab410da59a07bf5cbbc13cbf27f6c121fb6 100644 (file)
--- 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 b82da5908af044979fab04581444c43aa198e122..47c3f7f209d6185a1cb54dee4fabbc424a55ef6a 100644 (file)
--- 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 bc7df37b26faba24ea96832c7155c687dce816a0..24a640845eab49bbc769f5fd36fca7469136a2d6 100644 (file)
--- 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 7c2710f1b2855cb4fc76db511aca710d6c48ffe8..3096c22067014e33ec678257427e7b075181c7e5 100644 (file)
--- 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 6a62856e108b4a81dee24c14fc8fdf709f9e4891..072ee49b63117e61129d0f4263addbf6e956a73e 100644 (file)
--- 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 dc91924c73e43891a9d629bf1f19985424a1e7ea..36deae9c0aba84ef028455c9a63f94d1aed9b616 100644 (file)
--- 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 <stdio.h>
 
 #define SRC_BYTE_COUNT 11

diff --git a/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp b/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp
index c47dc995c771d77d7af32f1cc8cc979f3cba538d..b4bdb2528951377191177cf5914e58114aa35419 100644 (file)
--- 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 b6e62b7cef5e0df0bdb4bf8109c31d6aa540f6be..b903d4aedde9fc0b78e39b2650eb8f24c5f5c8d1 100644 (file)
--- 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 19e6f9c05799f4b04015f1c4763d3bedb5042bd5..da72c6d93e5f4724561fa864d58a2a76524155c0 100644 (file)
--- 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 28637b890bc5a7a8a6d96c089c50511ae5c35d0b..06b78d09cc7cc7dcafa041ee5a50df1d8634a230 100644 (file)
--- 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 6bb0ca92e428acfa3696b2dbc6d1c8865c83cee9..11685af5b027e0a70524a6d31162bd539f6f7841 100644 (file)
--- 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 <map>
 
 namespace llvm {

diff --git a/lib/Target/R600/R600RegisterInfo.h b/lib/Target/R600/R600RegisterInfo.h
index c170ccb378a27b72b2724688c8985dda4c8ac47c..f9ca918f246b7cafe546828f2e0652d5017142f9 100644 (file)
--- 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 92385b687842c1c3f034a9857cc39ecf84b3042a..1c1e0a613e0fcb7bf1642a924c38f347df8e71f9 100644 (file)
--- 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 adcffa8bbdb1268d5ce08ce9a84b13605fd3c974..c6ad4d531dc82fa40b5cbae3f8a6b8e4075c3829 100644 (file)
--- 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 <stdio.h>
 
 using namespace llvm;

diff --git a/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp b/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp
index 048f9ebe058765aece9510ed71d7e66edf1c6706..b5b072dcbda6fe203017f5905557e33d0082ef28 100644 (file)
--- 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 474d3aa215fbed469e8c1128c00e6b76babf594b..14ffbe51a9abe216d2c034fb2c4a11c3f6b19f6b 100644 (file)
--- 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 1c123919487312fe73a2d9a387468d47e703925b..ab03bb58f18ceed55b9f8cb2b65ca670fb39f97e 100644 (file)
--- 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 3c4aea13301e6e7a32a86825ba15715048a95f97..8fa703893ad3822141d75e3251e3df03c34a1a40 100644 (file)
--- 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 7c18a38829ad81286afe964e7401cac6cf8237c0..f2783c304cb0d59f9777b00c3b11fa3803164bed 100644 (file)
--- 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"