[llvm] r197398 - Don't duplicate the DataLayout defaults for integer, floats and vectors.

[Rafael Espindola]

Author: rafael
Date: Mon Dec 16 11:41:15 2013
New Revision: 197398

URL: http://llvm.org/viewvc/llvm-project?rev=197398&view=rev
Log:
Don't duplicate the DataLayout defaults for integer, floats and vectors.

Modified:
    llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp
    llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp

Modified: llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp?rev=197398&r1=197397&r2=197398&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp Mon Dec 16 11:41:15 2013
@@ -69,9 +69,7 @@ static std::string computeDataLayout(con
   if (!ST.is64Bit())
     Ret += "-p:32:32:32";
 
-  Ret += "-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"
-         "f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-"
-         "n16:32:64";
+  Ret += "-i64:64:64-v16:16:16-v32:32:32-n16:32:64";
 
   return Ret;
 }

Modified: llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp?rev=197398&r1=197397&r2=197398&view=diff
==============================================================================
--- llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp Mon Dec 16 11:41:15 2013
@@ -51,16 +51,11 @@ SchedCustomRegistry("r600", "Run R600's
 
 static std::string computeDataLayout(const AMDGPUSubtarget &ST) {
   std::string DataLayout = std::string(
-   "e"
-   "-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32"
-   "-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128"
+   "e-i64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v96:128:128"
    "-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-v2048:2048:2048"
    "-n32:64"
   );
 
-  if (ST.hasHWFP64())
-    DataLayout.append("-f64:64:64");
-
   if (!ST.is64bit())
     DataLayout.append("-p:32:32:32");