Revert "[X86][LLD] Update datelayout in LLD tests. NFCI"

[pengfei]

Summary

This reverts commit 9b43237128da0a7a3bc8a16f6f2c0897b9e842be

The reverted patch is a workaround to make buildbot happy.
This fixes the real problem in rG1bb0caf56168.

[dexonsmith]

Changes that are helping bots recover usually don't get a reviewed ahead of landing. Next time just push the revert to fix the bot! (LGTM)

[dexonsmith]

In D117270#3244517, @dexonsmith wrote:

Changes that are helping bots recover usually don't get a reviewed ahead of landing. Next time just push the revert to fix the bot! (LGTM)

Nevermind, looking closer, this isn't a simple revert. I'll resign as reviewer so someone can look at the autoupgrade changes.

If I were you, I'd revert the original commit and the incorrect testcase fix in lld (without review) and then post a review for relanding with autoupgrade working correctly.

[pengfei]

In D117270#3244523, @dexonsmith wrote:

In D117270#3244517, @dexonsmith wrote:

Changes that are helping bots recover usually don't get a reviewed ahead of landing. Next time just push the revert to fix the bot! (LGTM)

Nevermind, looking closer, this isn't a simple revert. I'll resign as reviewer so someone can look at the autoupgrade changes.

If I were you, I'd revert the original commit and the incorrect testcase fix in lld (without review) and then post a review for relanding with autoupgrade working correctly.

I was hesitating on it too. Reverted, thanks!

lld/test/COFF/libcall-archive.ll

 ; REQUIRES: x86
 ; RUN: rm -f %t.a
 ; RUN: llvm-as -o %t.obj %s
 ; RUN: llvm-as -o %t2.obj %S/Inputs/libcall-archive.ll
 ; RUN: llvm-mc -filetype=obj -triple=i686-unknown-windows -o %t3.obj %S/Inputs/libcall-archive.s
 ; RUN: llvm-ar rcs %t.a %t2.obj %t3.obj
 ; RUN: lld-link -out:%t.exe -subsystem:console -entry:start -safeseh:no -lldmap:- %t.obj %t.a | FileCheck %s
 
 ; CHECK-NOT: ___sync_val_compare_and_swap_8
 ; CHECK: _start
 ; CHECK: _memcpy
 
-target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32-a:0:32-S32"
+target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-unknown-windows"
 
 define void @start(i8* %a, i8* %b) {
 entry:
   call void @llvm.memcpy.p0i8.p0i8.i64(i8* %a, i8* %b, i64 1024, i1 false)
   ret void
 }
 
 declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i1)

lld/test/COFF/lto-lazy-reference.ll

 ; REQUIRES: x86
 ; RUN: llc -mtriple=i686-pc-windows-msvc -filetype=obj -o %T/lto-lazy-reference-quadruple.obj %S/Inputs/lto-lazy-reference-quadruple.ll
 ; RUN: llvm-as -o %T/lto-lazy-reference-dummy.bc %S/Inputs/lto-lazy-reference-dummy.ll
 ; RUN: rm -f %t.lib
 ; RUN: llvm-ar cru %t.lib %T/lto-lazy-reference-quadruple.obj %T/lto-lazy-reference-dummy.bc
 ; RUN: llvm-as -o %t.obj %s
 ; RUN: lld-link /out:%t.exe /entry:main /subsystem:console %t.obj %t.lib
 
-target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32-a:0:32-S32"
+target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-pc-windows-msvc18.0.0"
 
 ; Define fltused, since we don't link against the MS C runtime but are
 ; using floats.
 @_fltused = dllexport global i32 0, align 4
 
 define double @main(double %x) {
 entry:

lld/test/COFF/lto-reloc-model.ll

 ; REQUIRES: x86
 ; RUN: llvm-as -o %t %s
 ; RUN: lld-link /entry:main /subsystem:console /out:%t.exe %t
 ; RUN: llvm-objdump -d %t.exe | FileCheck %s
 
-target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32-a:0:32-S32"
+target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-pc-windows-msvc"
 
 @foo = thread_local global i8 0
 
 module asm "__tls_index = 1"
 module asm "__tls_array = 2"
 
 define i8* @main() {
   ; CHECK: movl 1, %eax
   ; CHECK: movl %fs:2, %ecx
   ; CHECK: movl (%ecx,%eax,4), %eax
   ; CHECK: leal (%eax), %eax
   ret i8* @foo
 }

llvm/lib/IR/AutoUpgrade.cpp

std::string llvm::UpgradeDataLayoutString(StringRef DL, StringRef TT) {
   Triple T(TT);
   // For AMDGPU we uprgrade older DataLayouts to include the default globals
   // address space of 1.
   if (T.isAMDGPU() && !DL.contains("-G") && !DL.startswith("G")) {
     return DL.empty() ? std::string("G1") : (DL + "-G1").str();
   }
 
   std::string Res = DL.str();
-  std::string AddrSpaces = "-p270:32:32-p271:32:32-p272:64:64";
-  // If X86, and the datalayout matches the expected format, add pointer size
-  // address spaces to the datalayout.
-  if (!T.isX86() || DL.contains(AddrSpaces))
+  if (!T.isX86())
     return Res;
 
+  // If the datalayout matches the expected format, add pointer size address
+  // spaces to the datalayout.
+  std::string AddrSpaces = "-p270:32:32-p271:32:32-p272:64:64";
+  if (!DL.contains(AddrSpaces)) {
     SmallVector<StringRef, 4> Groups;
     Regex R("(e-m:[a-z](-p:32:32)?)(-[if]64:.*$)");
     if (R.match(DL, &Groups))
       Res = (Groups[1] + AddrSpaces + Groups[3]).str();
+  }
 
   // For 32-bit MSVC targets, raise the alignment of f80 values to 16 bytes.
   // Raising the alignment is safe because Clang did not produce f80 values in
   // the MSVC environment before this upgrade was added.
   if (T.isWindowsMSVCEnvironment() && !T.isArch64Bit()) {
     StringRef Ref = Res;
     auto I = Ref.find("-f80:32-");
     if (I != StringRef::npos)

llvm/test/Bitcode/upgrade-datalayout4.ll

+; Test to make sure datalayout is automatically upgraded.
+;
+; RUN: llvm-as %s -o - | llvm-dis - | FileCheck %s
+
+target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32"
+target triple = "i686-pc-windows-msvc"
+
+; CHECK: target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32-a:0:32-S32"