Author: tstellar Date: Thu Jun 2 15:59:25 2016 New Revision: 271587 URL: http://llvm.org/viewvc/llvm-project?rev=271587&view=rev Log: Merging r258606:
------------------------------------------------------------------------ r258606 | Matthew.Arsenault | 2016-01-22 21:32:14 -0800 (Fri, 22 Jan 2016) | 5 lines AMDGPU: Remove Feature64BitPtr This is a leftover from AMDIL that doesn't do anything and doesn't belong here. ------------------------------------------------------------------------ Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.cpp llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td?rev=271587&r1=271586&r2=271587&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.td Thu Jun 2 15:59:25 2016 @@ -67,11 +67,6 @@ def FeatureFP32Denormals : SubtargetFeat "true", "Enable single precision denormal handling">; -def Feature64BitPtr : SubtargetFeature<"64BitPtr", - "Is64bit", - "true", - "Specify if 64-bit addressing should be used">; - def FeatureR600ALUInst : SubtargetFeature<"R600ALUInst", "R600ALUInst", "false", @@ -241,17 +236,17 @@ def FeatureNorthernIslands : SubtargetFe >; def FeatureSouthernIslands : SubtargetFeatureGeneration<"SOUTHERN_ISLANDS", - [Feature64BitPtr, FeatureFP64, FeatureLocalMemorySize32768, + [FeatureFP64, FeatureLocalMemorySize32768, FeatureWavefrontSize64, FeatureGCN, FeatureGCN1Encoding, FeatureLDSBankCount32]>; def FeatureSeaIslands : SubtargetFeatureGeneration<"SEA_ISLANDS", - [Feature64BitPtr, FeatureFP64, FeatureLocalMemorySize65536, + [FeatureFP64, FeatureLocalMemorySize65536, FeatureWavefrontSize64, FeatureGCN, FeatureFlatAddressSpace, FeatureGCN1Encoding, FeatureCIInsts]>; def FeatureVolcanicIslands : SubtargetFeatureGeneration<"VOLCANIC_ISLANDS", - [Feature64BitPtr, FeatureFP64, FeatureLocalMemorySize65536, + [FeatureFP64, FeatureLocalMemorySize65536, FeatureWavefrontSize64, FeatureFlatAddressSpace, FeatureGCN, FeatureGCN3Encoding, FeatureCIInsts]>; Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.cpp?rev=271587&r1=271586&r2=271587&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.cpp (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.cpp Thu Jun 2 15:59:25 2016 @@ -66,7 +66,7 @@ AMDGPUSubtarget::initializeSubtargetDepe AMDGPUSubtarget::AMDGPUSubtarget(const Triple &TT, StringRef GPU, StringRef FS, TargetMachine &TM) - : AMDGPUGenSubtargetInfo(TT, GPU, FS), DevName(GPU), Is64bit(false), + : AMDGPUGenSubtargetInfo(TT, GPU, FS), DevName(GPU), DumpCode(false), R600ALUInst(false), HasVertexCache(false), TexVTXClauseSize(0), Gen(AMDGPUSubtarget::R600), FP64(false), FP64Denormals(false), FP32Denormals(false), FastFMAF32(false), Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h?rev=271587&r1=271586&r2=271587&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUSubtarget.h Thu Jun 2 15:59:25 2016 @@ -59,7 +59,6 @@ public: private: std::string DevName; - bool Is64bit; bool DumpCode; bool R600ALUInst; bool HasVertexCache; @@ -123,10 +122,6 @@ public: void ParseSubtargetFeatures(StringRef CPU, StringRef FS); - bool is64bit() const { - return Is64bit; - } - bool hasVertexCache() const { return HasVertexCache; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits