Module: Mesa Branch: master Commit: 65917004d99ccb79f709e621f8f6cf66715ffdca URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65917004d99ccb79f709e621f8f6cf66715ffdca
Author: Tom Stellard <[email protected]> Date: Wed May 30 19:23:39 2012 -0400 radeon/llvm: Change prefix on tablegen files to AMDGPU --- src/gallium/drivers/radeon/{AMDIL.td => AMDGPU.td} | 0 src/gallium/drivers/radeon/AMDIL.h | 4 +- src/gallium/drivers/radeon/AMDILISelDAGToDAG.cpp | 2 +- src/gallium/drivers/radeon/AMDILISelLowering.cpp | 2 +- src/gallium/drivers/radeon/AMDILInstrInfo.cpp | 2 +- src/gallium/drivers/radeon/AMDILInstrInfo.h | 2 +- src/gallium/drivers/radeon/AMDILIntrinsicInfo.cpp | 10 +++--- src/gallium/drivers/radeon/AMDILIntrinsicInfo.h | 2 +- src/gallium/drivers/radeon/AMDILRegisterInfo.cpp | 2 +- src/gallium/drivers/radeon/AMDILRegisterInfo.h | 2 +- src/gallium/drivers/radeon/AMDILSubtarget.cpp | 2 +- src/gallium/drivers/radeon/AMDILSubtarget.h | 2 +- .../radeon/MCTargetDesc/AMDILMCTargetDesc.cpp | 6 ++-- .../radeon/MCTargetDesc/AMDILMCTargetDesc.h | 6 ++-- src/gallium/drivers/radeon/Makefile | 36 ++++++++++---------- src/gallium/drivers/radeon/Makefile.sources | 18 +++++----- src/gallium/drivers/radeon/R600CodeEmitter.cpp | 2 +- 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/gallium/drivers/radeon/AMDIL.td b/src/gallium/drivers/radeon/AMDGPU.td similarity index 100% rename from src/gallium/drivers/radeon/AMDIL.td rename to src/gallium/drivers/radeon/AMDGPU.td diff --git a/src/gallium/drivers/radeon/AMDIL.h b/src/gallium/drivers/radeon/AMDIL.h index 8bd024a..4029f27 100644 --- a/src/gallium/drivers/radeon/AMDIL.h +++ b/src/gallium/drivers/radeon/AMDIL.h @@ -105,9 +105,9 @@ extern Target TheAMDGPUTarget; } // end namespace llvm; #define GET_REGINFO_ENUM -#include "AMDILGenRegisterInfo.inc" +#include "AMDGPUGenRegisterInfo.inc" #define GET_INSTRINFO_ENUM -#include "AMDILGenInstrInfo.inc" +#include "AMDGPUGenInstrInfo.inc" /// Include device information enumerations #include "AMDILDeviceInfo.h" diff --git a/src/gallium/drivers/radeon/AMDILISelDAGToDAG.cpp b/src/gallium/drivers/radeon/AMDILISelDAGToDAG.cpp index 40b35fd..b14a360 100644 --- a/src/gallium/drivers/radeon/AMDILISelDAGToDAG.cpp +++ b/src/gallium/drivers/radeon/AMDILISelDAGToDAG.cpp @@ -71,7 +71,7 @@ private: bool SelectADDRReg(SDValue Addr, SDValue& Base, SDValue& Offset); // Include the pieces autogenerated from the target description. -#include "AMDILGenDAGISel.inc" +#include "AMDGPUGenDAGISel.inc" }; } // end anonymous namespace diff --git a/src/gallium/drivers/radeon/AMDILISelLowering.cpp b/src/gallium/drivers/radeon/AMDILISelLowering.cpp index a52c83e..afb9170 100644 --- a/src/gallium/drivers/radeon/AMDILISelLowering.cpp +++ b/src/gallium/drivers/radeon/AMDILISelLowering.cpp @@ -38,7 +38,7 @@ using namespace llvm; //===----------------------------------------------------------------------===// // Calling Convention Implementation //===----------------------------------------------------------------------===// -#include "AMDILGenCallingConv.inc" +#include "AMDGPUGenCallingConv.inc" //===----------------------------------------------------------------------===// // TargetLowering Implementation Help Functions Begin diff --git a/src/gallium/drivers/radeon/AMDILInstrInfo.cpp b/src/gallium/drivers/radeon/AMDILInstrInfo.cpp index 0ac56b5..5143f3f 100644 --- a/src/gallium/drivers/radeon/AMDILInstrInfo.cpp +++ b/src/gallium/drivers/radeon/AMDILInstrInfo.cpp @@ -22,7 +22,7 @@ #include "llvm/Instructions.h" #define GET_INSTRINFO_CTOR -#include "AMDILGenInstrInfo.inc" +#include "AMDGPUGenInstrInfo.inc" using namespace llvm; diff --git a/src/gallium/drivers/radeon/AMDILInstrInfo.h b/src/gallium/drivers/radeon/AMDILInstrInfo.h index 9de16ed..6aa03e7 100644 --- a/src/gallium/drivers/radeon/AMDILInstrInfo.h +++ b/src/gallium/drivers/radeon/AMDILInstrInfo.h @@ -18,7 +18,7 @@ #include "llvm/Target/TargetInstrInfo.h" #define GET_INSTRINFO_HEADER -#include "AMDILGenInstrInfo.inc" +#include "AMDGPUGenInstrInfo.inc" namespace llvm { // AMDIL - This namespace holds all of the target specific flags that diff --git a/src/gallium/drivers/radeon/AMDILIntrinsicInfo.cpp b/src/gallium/drivers/radeon/AMDILIntrinsicInfo.cpp index 651c054..678e32e 100644 --- a/src/gallium/drivers/radeon/AMDILIntrinsicInfo.cpp +++ b/src/gallium/drivers/radeon/AMDILIntrinsicInfo.cpp @@ -21,7 +21,7 @@ using namespace llvm; #define GET_LLVM_INTRINSIC_FOR_GCC_BUILTIN -#include "AMDILGenIntrinsics.inc" +#include "AMDGPUGenIntrinsics.inc" #undef GET_LLVM_INTRINSIC_FOR_GCC_BUILTIN AMDILIntrinsicInfo::AMDILIntrinsicInfo(TargetMachine *tm) @@ -35,7 +35,7 @@ AMDILIntrinsicInfo::getName(unsigned int IntrID, Type **Tys, { static const char* const names[] = { #define GET_INTRINSIC_NAME_TABLE -#include "AMDILGenIntrinsics.inc" +#include "AMDGPUGenIntrinsics.inc" #undef GET_INTRINSIC_NAME_TABLE }; @@ -107,7 +107,7 @@ unsigned int AMDILIntrinsicInfo::lookupName(const char *Name, unsigned int Len) const { #define GET_FUNCTION_RECOGNIZER -#include "AMDILGenIntrinsics.inc" +#include "AMDGPUGenIntrinsics.inc" #undef GET_FUNCTION_RECOGNIZER AMDGPUIntrinsic::ID IntrinsicID = (AMDGPUIntrinsic::ID)Intrinsic::not_intrinsic; @@ -132,13 +132,13 @@ AMDILIntrinsicInfo::isOverloaded(unsigned id) const { // Overload Table #define GET_INTRINSIC_OVERLOAD_TABLE -#include "AMDILGenIntrinsics.inc" +#include "AMDGPUGenIntrinsics.inc" #undef GET_INTRINSIC_OVERLOAD_TABLE } /// This defines the "getAttributes(ID id)" method. #define GET_INTRINSIC_ATTRIBUTES -#include "AMDILGenIntrinsics.inc" +#include "AMDGPUGenIntrinsics.inc" #undef GET_INTRINSIC_ATTRIBUTES Function* diff --git a/src/gallium/drivers/radeon/AMDILIntrinsicInfo.h b/src/gallium/drivers/radeon/AMDILIntrinsicInfo.h index bdd0366..072c265 100644 --- a/src/gallium/drivers/radeon/AMDILIntrinsicInfo.h +++ b/src/gallium/drivers/radeon/AMDILIntrinsicInfo.h @@ -22,7 +22,7 @@ namespace llvm { enum ID { last_non_AMDIL_intrinsic = Intrinsic::num_intrinsics - 1, #define GET_INTRINSIC_ENUM_VALUES -#include "AMDILGenIntrinsics.inc" +#include "AMDGPUGenIntrinsics.inc" #undef GET_INTRINSIC_ENUM_VALUES , num_AMDIL_intrinsics }; diff --git a/src/gallium/drivers/radeon/AMDILRegisterInfo.cpp b/src/gallium/drivers/radeon/AMDILRegisterInfo.cpp index 9d93b91..af2113b 100644 --- a/src/gallium/drivers/radeon/AMDILRegisterInfo.cpp +++ b/src/gallium/drivers/radeon/AMDILRegisterInfo.cpp @@ -198,5 +198,5 @@ AMDILRegisterInfo::getStackSize() const } #define GET_REGINFO_TARGET_DESC -#include "AMDILGenRegisterInfo.inc" +#include "AMDGPUGenRegisterInfo.inc" diff --git a/src/gallium/drivers/radeon/AMDILRegisterInfo.h b/src/gallium/drivers/radeon/AMDILRegisterInfo.h index 8dd4281..7627bde 100644 --- a/src/gallium/drivers/radeon/AMDILRegisterInfo.h +++ b/src/gallium/drivers/radeon/AMDILRegisterInfo.h @@ -17,7 +17,7 @@ #include "llvm/Target/TargetRegisterInfo.h" #define GET_REGINFO_HEADER -#include "AMDILGenRegisterInfo.inc" +#include "AMDGPUGenRegisterInfo.inc" // See header file for explanation namespace llvm diff --git a/src/gallium/drivers/radeon/AMDILSubtarget.cpp b/src/gallium/drivers/radeon/AMDILSubtarget.cpp index 249cb03..723037e 100644 --- a/src/gallium/drivers/radeon/AMDILSubtarget.cpp +++ b/src/gallium/drivers/radeon/AMDILSubtarget.cpp @@ -25,7 +25,7 @@ using namespace llvm; #define GET_SUBTARGETINFO_ENUM #define GET_SUBTARGETINFO_CTOR #define GET_SUBTARGETINFO_TARGET_DESC -#include "AMDILGenSubtargetInfo.inc" +#include "AMDGPUGenSubtargetInfo.inc" AMDILSubtarget::AMDILSubtarget(llvm::StringRef TT, llvm::StringRef CPU, llvm::StringRef FS) : AMDILGenSubtargetInfo( TT, CPU, FS ), mDumpCode(false) diff --git a/src/gallium/drivers/radeon/AMDILSubtarget.h b/src/gallium/drivers/radeon/AMDILSubtarget.h index 38fcb85..e3d8c81 100644 --- a/src/gallium/drivers/radeon/AMDILSubtarget.h +++ b/src/gallium/drivers/radeon/AMDILSubtarget.h @@ -22,7 +22,7 @@ #include <string> #define GET_SUBTARGETINFO_HEADER -#include "AMDILGenSubtargetInfo.inc" +#include "AMDGPUGenSubtargetInfo.inc" #define MAX_CB_SIZE (1 << 16) namespace llvm { diff --git a/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.cpp b/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.cpp index 3488d70..52c5faa 100644 --- a/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.cpp +++ b/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.cpp @@ -9,13 +9,13 @@ #include "llvm/Support/TargetRegistry.h" #define GET_INSTRINFO_MC_DESC -#include "AMDILGenInstrInfo.inc" +#include "AMDGPUGenInstrInfo.inc" #define GET_SUBTARGETINFO_MC_DESC -#include "AMDILGenSubtargetInfo.inc" +#include "AMDGPUGenSubtargetInfo.inc" #define GET_REGINFO_MC_DESC -#include "AMDILGenRegisterInfo.inc" +#include "AMDGPUGenRegisterInfo.inc" using namespace llvm; diff --git a/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.h b/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.h index 8951a4e..2eab136 100644 --- a/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.h +++ b/src/gallium/drivers/radeon/MCTargetDesc/AMDILMCTargetDesc.h @@ -24,12 +24,12 @@ extern Target TheAMDGPUTarget; } // End llvm namespace #define GET_REGINFO_ENUM -#include "AMDILGenRegisterInfo.inc" +#include "AMDGPUGenRegisterInfo.inc" #define GET_INSTRINFO_ENUM -#include "AMDILGenInstrInfo.inc" +#include "AMDGPUGenInstrInfo.inc" #define GET_SUBTARGETINFO_ENUM -#include "AMDILGenSubtargetInfo.inc" +#include "AMDGPUGenSubtargetInfo.inc" #endif // AMDILMCTARGETDESC_H diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile index 3f930cd..db5dbaa 100644 --- a/src/gallium/drivers/radeon/Makefile +++ b/src/gallium/drivers/radeon/Makefile @@ -38,32 +38,32 @@ endif R600RegisterInfo.td: R600GenRegisterInfo.pl $(PERL) $^ > $@ -AMDILGenRegisterInfo.inc: *.td - $(call tablegen, -gen-register-info, AMDIL.td, $@) +AMDGPUGenRegisterInfo.inc: *.td + $(call tablegen, -gen-register-info, AMDGPU.td, $@) -AMDILGenInstrInfo.inc: *.td - $(call tablegen, -gen-instr-info, AMDIL.td, $@) +AMDGPUGenInstrInfo.inc: *.td + $(call tablegen, -gen-instr-info, AMDGPU.td, $@) -AMDILGenAsmWriter.inc: *.td - $(call tablegen, -gen-asm-writer, AMDIL.td, $@) +AMDGPUGenAsmWriter.inc: *.td + $(call tablegen, -gen-asm-writer, AMDGPU.td, $@) -AMDILGenDAGISel.inc: *.td - $(call tablegen, -gen-dag-isel, AMDIL.td, $@) +AMDGPUGenDAGISel.inc: *.td + $(call tablegen, -gen-dag-isel, AMDGPU.td, $@) -AMDILGenCallingConv.inc: *.td - $(call tablegen, -gen-callingconv, AMDIL.td, $@) +AMDGPUGenCallingConv.inc: *.td + $(call tablegen, -gen-callingconv, AMDGPU.td, $@) -AMDILGenSubtargetInfo.inc: *.td - $(call tablegen, -gen-subtarget, AMDIL.td, $@) +AMDGPUGenSubtargetInfo.inc: *.td + $(call tablegen, -gen-subtarget, AMDGPU.td, $@) -AMDILGenEDInfo.inc: *.td - $(call tablegen, -gen-enhanced-disassembly-info, AMDIL.td, $@) +AMDGPUGenEDInfo.inc: *.td + $(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@) -AMDILGenIntrinsics.inc: *.td - $(call tablegen, -gen-tgt-intrinsic, AMDIL.td, $@) +AMDGPUGenIntrinsics.inc: *.td + $(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@) -AMDILGenCodeEmitter.inc: *.td - $(call tablegen, -gen-emitter, AMDIL.td, $@) +AMDGPUGenCodeEmitter.inc: *.td + $(call tablegen, -gen-emitter, AMDGPU.td, $@) LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser) loader: loader.o libradeon.a diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources index 51eb3ae..7ba0980 100644 --- a/src/gallium/drivers/radeon/Makefile.sources +++ b/src/gallium/drivers/radeon/Makefile.sources @@ -4,15 +4,15 @@ GENERATED_SOURCES := \ R600RegisterInfo.td \ SIRegisterInfo.td \ SIRegisterGetHWRegNum.inc \ - AMDILGenRegisterInfo.inc \ - AMDILGenInstrInfo.inc \ - AMDILGenAsmWriter.inc \ - AMDILGenDAGISel.inc \ - AMDILGenCallingConv.inc \ - AMDILGenSubtargetInfo.inc \ - AMDILGenEDInfo.inc \ - AMDILGenIntrinsics.inc \ - AMDILGenCodeEmitter.inc + AMDGPUGenRegisterInfo.inc \ + AMDGPUGenInstrInfo.inc \ + AMDGPUGenAsmWriter.inc \ + AMDGPUGenDAGISel.inc \ + AMDGPUGenCallingConv.inc \ + AMDGPUGenSubtargetInfo.inc \ + AMDGPUGenEDInfo.inc \ + AMDGPUGenIntrinsics.inc \ + AMDGPUGenCodeEmitter.inc CPP_SOURCES := \ AMDIL7XXDevice.cpp \ diff --git a/src/gallium/drivers/radeon/R600CodeEmitter.cpp b/src/gallium/drivers/radeon/R600CodeEmitter.cpp index e8d0efe..fdc79a6 100644 --- a/src/gallium/drivers/radeon/R600CodeEmitter.cpp +++ b/src/gallium/drivers/radeon/R600CodeEmitter.cpp @@ -654,5 +654,5 @@ uint64_t R600CodeEmitter::getMachineOpValue(const MachineInstr &MI, } } -#include "AMDILGenCodeEmitter.inc" +#include "AMDGPUGenCodeEmitter.inc" _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
