Reverting r307326 because it breaks clang tests.

llvm-svn: 307334

3 files changed, 11 insertions, 32 deletions

diff --git a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
index 82634cf0298..0139646fc3f 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -400,7 +400,7 @@ void NVPTXAsmPrinter::printReturnValStr(const Function *F, raw_ostream &O) {
   O << " (";
 
   if (isABI) {
-    if (Ty->isFloatingPointTy() || (Ty->isIntegerTy() && !Ty->isIntegerTy(128))) {
+    if (Ty->isFloatingPointTy() || Ty->isIntegerTy()) {
       unsigned size = 0;
       if (auto *ITy = dyn_cast<IntegerType>(Ty)) {
         size = ITy->getBitWidth();
@@ -418,7 +418,7 @@ void NVPTXAsmPrinter::printReturnValStr(const Function *F, raw_ostream &O) {
     } else if (isa<PointerType>(Ty)) {
       O << ".param .b" << TLI->getPointerTy(DL).getSizeInBits()
         << " func_retval0";
-    } else if (Ty->isAggregateType() || Ty->isVectorTy() || Ty->isIntegerTy(128)) {
+    } else if (Ty->isAggregateType() || Ty->isVectorTy()) {
       unsigned totalsz = DL.getTypeAllocSize(Ty);
       unsigned retAlignment = 0;
       if (!getAlign(*F, 0, retAlignment))
@@ -1425,14 +1425,6 @@ void NVPTXAsmPrinter::emitPTXGlobalVariable(const GlobalVariable *GVar,
   else
     O << " .align " << GVar->getAlignment();
 
-  // Special case for i128
-  if (ETy->isIntegerTy(128)) {
-    O << " .b8 ";
-    getSymbol(GVar)->print(O, MAI);
-    O << "[16]";
-    return;
-  }
-
   if (ETy->isFloatingPointTy() || ETy->isIntegerTy() || ETy->isPointerTy()) {
     O << " .";
     O << getPTXFundamentalTypeStr(ETy);
@@ -1559,7 +1551,7 @@ void NVPTXAsmPrinter::emitFunctionParamList(const Function *F, raw_ostream &O) {
     }
 
     if (!PAL.hasParamAttribute(paramIndex, Attribute::ByVal)) {
-      if (Ty->isAggregateType() || Ty->isVectorTy() || Ty->isIntegerTy(128)) {
+      if (Ty->isAggregateType() || Ty->isVectorTy()) {
         // Just print .param .align <a> .b8 .param[size];
         // <a> = PAL.getparamalignment
         // size = typeallocsize of element type
diff --git a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp
index 9b48979ce43..54579d0267f 100644
--- a/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp
@@ -169,19 +169,6 @@ static void ComputePTXValueVTs(const TargetLowering &TLI, const DataLayout &DL,
   SmallVector<EVT, 16> TempVTs;

   SmallVector<uint64_t, 16> TempOffsets;

 

-  // Special case for i128 - decompose to (i64, i64)

-  if (Ty->isIntegerTy(128)) {

-    ValueVTs.push_back(EVT(MVT::i64));

-    ValueVTs.push_back(EVT(MVT::i64));

-

-    if (Offsets) {

-      Offsets->push_back(StartingOffset + 0);

-      Offsets->push_back(StartingOffset + 8);

-    }

-

-    return;

-  }

-

   ComputeValueVTs(TLI, DL, Ty, TempVTs, &TempOffsets, StartingOffset);

   for (unsigned i = 0, e = TempVTs.size(); i != e; ++i) {

     EVT VT = TempVTs[i];

@@ -1276,7 +1263,7 @@ std::string NVPTXTargetLowering::getPrototype(
     O << "()";

   } else {

     O << "(";

-    if (retTy->isFloatingPointTy() || (retTy->isIntegerTy() && !retTy->isIntegerTy(128))) {

+    if (retTy->isFloatingPointTy() || retTy->isIntegerTy()) {

       unsigned size = 0;

       if (auto *ITy = dyn_cast<IntegerType>(retTy)) {

         size = ITy->getBitWidth();

@@ -1294,7 +1281,7 @@ std::string NVPTXTargetLowering::getPrototype(
       O << ".param .b" << size << " _";

     } else if (isa<PointerType>(retTy)) {

       O << ".param .b" << PtrVT.getSizeInBits() << " _";

-    } else if (retTy->isAggregateType() || retTy->isVectorTy() || retTy->isIntegerTy(128)) {

+    } else if (retTy->isAggregateType() || retTy->isVectorTy()) {

       auto &DL = CS->getCalledFunction()->getParent()->getDataLayout();

       O << ".param .align " << retAlignment << " .b8 _["

         << DL.getTypeAllocSize(retTy) << "]";

@@ -1316,7 +1303,7 @@ std::string NVPTXTargetLowering::getPrototype(
     first = false;

 

     if (!Outs[OIdx].Flags.isByVal()) {

-      if (Ty->isAggregateType() || Ty->isVectorTy() || Ty->isIntegerTy(128)) {

+      if (Ty->isAggregateType() || Ty->isVectorTy()) {

         unsigned align = 0;

         const CallInst *CallI = cast<CallInst>(CS->getInstruction());

         // +1 because index 0 is reserved for return type alignment

@@ -1472,7 +1459,7 @@ SDValue NVPTXTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
       unsigned AllocSize = DL.getTypeAllocSize(Ty);

       SDVTList DeclareParamVTs = DAG.getVTList(MVT::Other, MVT::Glue);

       bool NeedAlign; // Does argument declaration specify alignment?

-      if (Ty->isAggregateType() || Ty->isVectorTy() || Ty->isIntegerTy(128)) {

+      if (Ty->isAggregateType() || Ty->isVectorTy()) {

         // declare .param .align <align> .b8 .param<n>[<size>];

         SDValue DeclareParamOps[] = {

             Chain, DAG.getConstant(ArgAlign, dl, MVT::i32),

@@ -1648,8 +1635,8 @@ SDValue NVPTXTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
     // these three types to match the logic in

     // NVPTXAsmPrinter::printReturnValStr and NVPTXTargetLowering::getPrototype.

     // Plus, this behavior is consistent with nvcc's.

-    if (RetTy->isFloatingPointTy() || RetTy->isPointerTy() ||

-        (RetTy->isIntegerTy() && !RetTy->isIntegerTy(128))) {

+    if (RetTy->isFloatingPointTy() || RetTy->isIntegerTy() ||

+        RetTy->isPointerTy()) {

       // Scalar needs to be at least 32bit wide

       if (resultsz < 32)

         resultsz = 32;

@@ -2380,7 +2367,7 @@ SDValue NVPTXTargetLowering::LowerFormalArguments(
 

     if (theArgs[i]->use_empty()) {

       // argument is dead

-      if (Ty->isAggregateType() || Ty->isIntegerTy(128)) {

+      if (Ty->isAggregateType()) {

         SmallVector<EVT, 16> vtparts;

 

         ComputePTXValueVTs(*this, DAG.getDataLayout(), Ty, vtparts);

diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
index ac21563ee9a..2b6ba8c85d4 100644
--- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -81,7 +81,7 @@ static std::string computeDataLayout(bool is64Bit) {
   if (!is64Bit)
     Ret += "-p:32:32";
 
-  Ret += "-i64:64-i128:128-v16:16-v32:32-n16:32:64";
+  Ret += "-i64:64-v16:16-v32:32-n16:32:64";
 
   return Ret;
 }