Apply LLVM upstream: r181801 - Fix ARM FastISel tests, as a first step to enabling ARM FastISel

ARM FastISel is currently only enabled for iOS non-Thumb1, and I'm working on
enabling it for other targets. As a first step I've fixed some of the tests.
Changes to ARM FastISel tests:
- Different triples don't generate the same relocations (especially
  movw/movt versus constant pool loads). Use a regex to allow either.
- Mangling is different. Use a regex to allow either.
- The reserved registers are sometimes different, so registers get
  allocated in a different order. Capture the names only where this
  occurs.
- Add -verify-machineinstrs to some tests where it works. It doesn't
  work everywhere it should yet.
- Add -fast-isel-abort to many tests that didn't have it before.
- Split out the VarArg test from fast-isel-call.ll into its own
  test. This simplifies test setup because of --check-prefix.

R=dschuff@chromium.org

Review URL: https://codereview.chromium.org/15737029

1 files changed, 8 insertions, 6 deletions

diff --git a/test/MC/ARM/data-in-code.ll b/test/MC/ARM/data-in-code.ll
index c2feec5303..a073e3cc37 100644
--- a/test/MC/ARM/data-in-code.ll
+++ b/test/MC/ARM/data-in-code.ll
@@ -1,7 +1,9 @@
-;; RUN: llc -O0 -mtriple=armv7-linux-gnueabi -filetype=obj %s -o - | \
+;; RUN: llc -O0 -verify-machineinstrs -fast-isel-abort \
+;; RUN:   -mtriple=armv7-linux-gnueabi -filetype=obj %s -o - | \
 ;; RUN:   elf-dump | FileCheck -check-prefix=ARM %s
 
-;; RUN: llc -O0 -mtriple=thumbv7-linux-gnueabi -filetype=obj %s -o - | \
+;; RUN: llc -O0 -verify-machineinstrs -fast-isel-abort \
+;; RUN:   -mtriple=thumbv7-linux-gnueabi -filetype=obj %s -o - | \
 ;; RUN:   elf-dump --dump-section-data | FileCheck -check-prefix=TMB %s
 
 ;; Ensure that if a jump table is generated that it has Mapping Symbols
@@ -119,7 +121,7 @@ exit:
 
 ;; ARM:         # Symbol 3
 ;; ARM-NEXT:    $a
-;; ARM-NEXT:   'st_value', 0x000000ac
+;; ARM-NEXT:   'st_value', 0x{{[0-9A-F]+}}
 ;; ARM-NEXT:   'st_size', 0x00000000
 ;; ARM-NEXT:   'st_bind', 0x0
 ;; ARM-NEXT:   'st_type', 0x0
@@ -135,7 +137,7 @@ exit:
 
 ;; ARM:         # Symbol 5
 ;; ARM-NEXT:    $d
-;; ARM-NEXT:   'st_value', 0x00000030
+;; ARM-NEXT:   'st_value', 0x{{[0-9A-F]+}}
 ;; ARM-NEXT:   'st_size', 0x00000000
 ;; ARM-NEXT:   'st_bind', 0x0
 ;; ARM-NEXT:   'st_type', 0x0
@@ -146,7 +148,7 @@ exit:
 
 ;; TMB:         # Symbol 3
 ;; TMB-NEXT:    $d
-;; TMB-NEXT:   'st_value', 0x00000016
+;; TMB-NEXT:   'st_value', 0x{{[0-9A-F]+}}
 ;; TMB-NEXT:   'st_size', 0x00000000
 ;; TMB-NEXT:   'st_bind', 0x0
 ;; TMB-NEXT:   'st_type', 0x0
@@ -164,7 +166,7 @@ exit:
 
 ;; TMB:         # Symbol 5
 ;; TMB-NEXT:    $t
-;; TMB-NEXT:   'st_value', 0x00000036
+;; TMB-NEXT:   'st_value', 0x{{[0-9A-F]+}}
 ;; TMB-NEXT:   'st_size', 0x00000000
 ;; TMB-NEXT:   'st_bind', 0x0
 ;; TMB-NEXT:   'st_type', 0x0