Update llvm patches for r274286 and r275633 so all the tests will pass.

2 files changed, 679 insertions, 5 deletions

diff --git a/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff b/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
index 40dd5bd..e5baca0 100644
--- a/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
+++ b/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
@@ -1,3 +1,14 @@
+Pull in r200383 from upstream llvm trunk (by David Majnemer):
+
+  MC: Reorganize macro MC test along dialect lines
+
+  This commit seeks to do two things:
+  - Run the surfeit of tests under the Darwin dialect.  This ends up
+    affecting tests which assumed that spaces could deliminate arguments.
+  - The GAS dialect tests should limit their surface area to things that
+    could plausibly work under GAS. For example, Darwin style arguments
+    have no business being in such a test.
+
 Pull in r201784 from upstream llvm trunk (by Benjamin Kramer):
 
   AsmParser: Disable Darwin-style macro argument expansion on non-darwin targets.
@@ -53,3 +64,208 @@ Index: test/MC/AsmParser/exprs.s
  
  .macro check_expr
    .if ($0) != ($1)
+Index: test/MC/AsmParser/macros.s (deleted)
+===================================================================
+Index: test/MC/AsmParser/macros-darwin.s
+===================================================================
+--- test/MC/AsmParser/macros-darwin.s
++++ test/MC/AsmParser/macros-darwin.s
+@@ -1,9 +1,97 @@
+-// RUN: llvm-mc -triple i386-apple-darwin10 %s | FileCheck %s
++// RUN: not llvm-mc -triple i386-apple-darwin10 %s 2> %t.err | FileCheck %s
++// RUN: FileCheck --check-prefix=CHECK-ERRORS %s < %t.err
+ 
+-.macro test1
++.macro .test0
++.macrobody0
++.endmacro
++.macro .test1
++.test0
++.endmacro
++
++.test1
++// CHECK-ERRORS: <instantiation>:1:1: error: unknown directive
++// CHECK-ERRORS-NEXT: macrobody0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: <instantiation>:1:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: 11:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test1
++// CHECK-ERRORS-NEXT: ^
++
++.macro test2
++.byte $0
++.endmacro
++// CHECK: .byte 10
++test2 10
++
++.macro test3
+ .globl "$0 $1 $2 $$3 $n"
+ .endmacro
+ 
+ // CHECK: .globl "1 23  $3 2"
+-test1 1, 2 3
++test3 1, 2 3
+ 
++// CHECK: .globl	"1 (23)  $3 2"
++test3 1, (2 3)
++
++// CHECK: .globl "12  $3 1"
++test3 1 2
++
++.macro test4
++.globl "$0 -- $1"
++.endmacro
++
++// CHECK: .globl  "(ab)(,)) -- (cd)"
++test4 (a b)(,)),(cd)
++
++// CHECK: .globl  "(ab)(,)) -- (cd)"
++test4 (a b)(,)),(cd)
++
++.macro test5 _a
++.globl "\_a"
++.endm
++
++// CHECK: .globl zed1
++test5 zed1
++
++.macro test6 $a
++.globl "\$a"
++.endm
++
++// CHECK: .globl zed2
++test6 zed2
++
++.macro test7 .a
++.globl "\.a"
++.endm
++
++// CHECK: .globl zed3
++test7 zed3
++
++.macro test8 _a, _b, _c
++.globl "\_a,\_b,\_c"
++.endmacro
++
++.macro test9 _a _b _c
++.globl "\_a \_b \_c"
++.endmacro
++
++// CHECK: .globl  "a,b,c"
++test8 a, b, c
++// CHECK: .globl  "%1,%2,%3"
++test8 %1, %2, %3 #a comment
++// CHECK: .globl "x-y,z,1"
++test8 x - y, z, 1
++// CHECK: .globl  "1 2 3"
++test9 1, 2,3
++
++test8 1,2 3
++// CHECK-ERRORS: error: macro argument '_c' is missing
++// CHECK-ERRORS-NEXT: test8 1,2 3
++// CHECK-ERRORS-NEXT:           ^
++
++test8 1 2, 3
++// CHECK-ERRORS: error: macro argument '_c' is missing
++// CHECK-ERRORS-NEXT:test8 1 2, 3
++// CHECK-ERRORS-NEXT:           ^
+Index: test/MC/AsmParser/macros-gas.s
+===================================================================
+--- test/MC/AsmParser/macros-gas.s
++++ test/MC/AsmParser/macros-gas.s
+@@ -0,0 +1,93 @@
++// RUN: not llvm-mc -triple i386-linux-gnu %s 2> %t.err | FileCheck %s
++// RUN: FileCheck --check-prefix=CHECK-ERRORS %s < %t.err
++
++.macro .test0
++.macrobody0
++.endm
++.macro .test1
++.test0
++.endm
++
++.test1
++// CHECK-ERRORS: <instantiation>:1:1: error: unknown directive
++// CHECK-ERRORS-NEXT: macrobody0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: <instantiation>:1:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test0
++// CHECK-ERRORS-NEXT: ^
++// CHECK-ERRORS: 11:1: note: while in macro instantiation
++// CHECK-ERRORS-NEXT: .test1
++// CHECK-ERRORS-NEXT: ^
++
++.macro test2 _a
++.byte \_a
++.endm
++// CHECK: .byte 10
++test2 10
++
++.macro test3 _a _b _c
++.ascii "\_a \_b \_c \\_c"
++.endm
++
++// CHECK: .ascii "1 2 3 \003"
++test3 1, 2, 3
++
++// FIXME: test3 1, 2 3 should be treated like test 1, 2, 3
++
++// FIXME: remove the n argument from the remaining test3 examples
++// CHECK: .ascii "1 (23) n \n"
++test3 1, (2 3), n
++
++// CHECK: .ascii "1 (23) n \n"
++test3 1 (2 3) n
++
++// CHECK: .ascii "1 2 n \n"
++test3 1 2 n
++
++.macro test5 _a
++.globl \_a
++.endm
++
++// CHECK: .globl zed1
++test5 zed1
++
++.macro test6 $a
++.globl \$a
++.endm
++
++// CHECK: .globl zed2
++test6 zed2
++
++.macro test7 .a
++.globl \.a
++.endm
++
++// CHECK: .globl zed3
++test7 zed3
++
++.macro test8 _a, _b, _c
++.ascii "\_a,\_b,\_c"
++.endm
++
++.macro test9 _a _b _c
++.ascii "\_a \_b \_c"
++.endm
++
++// CHECK: .ascii "a,b,c"
++test8 a, b, c
++// CHECK: .ascii "%1,%2,%3"
++test8 %1 %2 %3 #a comment
++// CHECK: .ascii "x-y,z,1"
++test8 x - y z 1
++// CHECK: .ascii "1 2 3"
++test9 1, 2,3
++
++test8 1,2 3
++// CHECK-ERRORS: error: macro argument '_c' is missing
++// CHECK-ERRORS-NEXT: test8 1,2 3
++// CHECK-ERRORS-NEXT:           ^
++
++test8 1 2, 3
++// CHECK-ERRORS: error: expected ' ' for macro argument separator
++// CHECK-ERRORS-NEXT:test8 1 2, 3
++// CHECK-ERRORS-NEXT:         ^
diff --git a/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff b/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff
index f07d041..a0b4e1f 100644
--- a/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff
+++ b/contrib/llvm/patches/patch-r275633-llvm-r223171-fix-vectorizer.diff
@@ -1,3 +1,11 @@
+Pull in r223170 from upstream llvm trunk (by Michael Zolotukhin):
+
+  Apply loop-rotate to several vectorizer tests.
+
+  Such loops shouldn't be vectorized due to the loops form.
+  After applying loop-rotate (+simplifycfg) the tests again start to check
+  what they are intended to check.
+
 Pull in r223171 from upstream llvm trunk (by Michael Zolotukhin):
 
   PR21302. Vectorize only bottom-tested loops.
@@ -16,8 +24,8 @@ Introduced here: http://svnweb.freebsd.org/changeset/base/275633
 
 Index: lib/Transforms/Vectorize/LoopVectorize.cpp
 ===================================================================
---- lib/Transforms/Vectorize/LoopVectorize.cpp	(revision 21)
-+++ lib/Transforms/Vectorize/LoopVectorize.cpp	(revision 22)
+--- lib/Transforms/Vectorize/LoopVectorize.cpp
++++ lib/Transforms/Vectorize/LoopVectorize.cpp
 @@ -2864,6 +2864,14 @@ bool LoopVectorizationLegality::canVectorize() {
    if (!TheLoop->getExitingBlock())
      return false;
@@ -35,11 +43,11 @@ Index: lib/Transforms/Vectorize/LoopVectorize.cpp
          TheLoop->getHeader()->getName() << '\n');
 Index: test/Transforms/LoopVectorize/loop-form.ll
 ===================================================================
---- test/Transforms/LoopVectorize/loop-form.ll	(revision 0)
-+++ test/Transforms/LoopVectorize/loop-form.ll	(revision 22)
+--- test/Transforms/LoopVectorize/loop-form.ll
++++ test/Transforms/LoopVectorize/loop-form.ll
 @@ -0,0 +1,31 @@
 +; RUN: opt -S -loop-vectorize < %s | FileCheck %s
-+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
++target datalayout = "e-i64:64-f80:128-n8:16:32:64-S128"
 +
 +; Check that we vectorize only bottom-tested loops.
 +; This is a reduced testcase from PR21302.
@@ -69,3 +77,453 @@ Index: test/Transforms/LoopVectorize/loop-form.ll
 +if.end:
 +  ret void
 +}
+Index: test/Transforms/LoopVectorize/runtime-check-address-space.ll
+===================================================================
+--- test/Transforms/LoopVectorize/runtime-check-address-space.ll
++++ test/Transforms/LoopVectorize/runtime-check-address-space.ll
+@@ -31,25 +31,23 @@ define void @foo(i32 addrspace(1)* %a, i32 addrspa
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -60,25 +58,23 @@ define void @bar0(i32* %a, i32 addrspace(1)* %b, i
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32* %a, i64 %idxprom1
+   store i32 %mul, i32* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -89,25 +85,23 @@ define void @bar1(i32 addrspace(1)* %a, i32* %b, i
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32* %b, i64 %idxprom
+   %0 = load i32* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -119,25 +113,23 @@ define void @bar2(i32* noalias %a, i32 addrspace(1
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32* %a, i64 %idxprom1
+   store i32 %mul, i32* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -149,25 +141,23 @@ define void @arst0(i32* %b, i32 %n) #0 {
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds i32* %b, i64 %idxprom
+   %0 = load i32* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds [1024 x i32] addrspace(1)* @g_as1, i64 0, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -180,25 +170,23 @@ define void @arst1(i32* %b, i32 %n) #0 {
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds [1024 x i32] addrspace(1)* @g_as1, i64 0, i64 %idxprom
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds i32* %b, i64 %idxprom1
+   store i32 %mul, i32* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+@@ -210,25 +198,23 @@ define void @aoeu(i32 %n) #0 {
+ ; CHECK: ret
+ 
+ entry:
+-  br label %for.cond
++  %cmp1 = icmp slt i32 0, %n
++  br i1 %cmp1, label %for.body, label %for.end
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp slt i32 %i.0, %n
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %idxprom = sext i32 %i.0 to i64
++for.body:                                         ; preds = %entry, %for.body
++  %i.02 = phi i32 [ %inc, %for.body ], [ 0, %entry ]
++  %idxprom = sext i32 %i.02 to i64
+   %arrayidx = getelementptr inbounds [1024 x i32] addrspace(2)* @q_as2, i64 0, i64 %idxprom
+   %0 = load i32 addrspace(2)* %arrayidx, align 4
+   %mul = mul nsw i32 %0, 3
+-  %idxprom1 = sext i32 %i.0 to i64
++  %idxprom1 = sext i32 %i.02 to i64
+   %arrayidx2 = getelementptr inbounds [1024 x i32] addrspace(1)* @g_as1, i64 0, i64 %idxprom1
+   store i32 %mul, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add nsw i32 %i.0, 1
+-  br label %for.cond
++  %inc = add nsw i32 %i.02, 1
++  %cmp = icmp slt i32 %inc, %n
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body, %entry
+   ret void
+ }
+ 
+Index: test/Transforms/LoopVectorize/runtime-check-readonly-address-space.ll
+===================================================================
+--- test/Transforms/LoopVectorize/runtime-check-readonly-address-space.ll
++++ test/Transforms/LoopVectorize/runtime-check-readonly-address-space.ll
+@@ -8,26 +8,24 @@ define void @add_ints_1_1_1(i32 addrspace(1)* %a,
+ ; CHECK-LABEL: @add_ints_1_1_1(
+ ; CHECK: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.01
+   %1 = load i32 addrspace(1)* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.01
+   store i32 %add, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -35,26 +33,24 @@ define void @add_ints_as_1_0_0(i32 addrspace(1)* %
+ ; CHECK-LABEL: @add_ints_as_1_0_0(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32* %b, i64 %i.01
+   %0 = load i32* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.01
+   %1 = load i32* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32 addrspace(1)* %a, i64 %i.01
+   store i32 %add, i32 addrspace(1)* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -62,26 +58,24 @@ define void @add_ints_as_0_1_0(i32* %a, i32 addrsp
+ ; CHECK-LABEL: @add_ints_as_0_1_0(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32* %c, i64 %i.01
+   %1 = load i32* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.01
+   store i32 %add, i32* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -89,26 +83,24 @@ define void @add_ints_as_0_1_1(i32* %a, i32 addrsp
+ ; CHECK-LABEL: @add_ints_as_0_1_1(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32 addrspace(1)* %c, i64 %i.01
+   %1 = load i32 addrspace(1)* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.01
+   store i32 %add, i32* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+ 
+@@ -116,26 +108,24 @@ define void @add_ints_as_0_1_2(i32* %a, i32 addrsp
+ ; CHECK-LABEL: @add_ints_as_0_1_2(
+ ; CHECK-NOT: <4 x i32>
+ ; CHECK: ret
++
+ entry:
+-  br label %for.cond
++  br label %for.body
+ 
+-for.cond:                                         ; preds = %for.body, %entry
+-  %i.0 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
+-  %cmp = icmp ult i64 %i.0, 200
+-  br i1 %cmp, label %for.body, label %for.end
+-
+-for.body:                                         ; preds = %for.cond
+-  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.0
++for.body:                                         ; preds = %entry, %for.body
++  %i.01 = phi i64 [ 0, %entry ], [ %inc, %for.body ]
++  %arrayidx = getelementptr inbounds i32 addrspace(1)* %b, i64 %i.01
+   %0 = load i32 addrspace(1)* %arrayidx, align 4
+-  %arrayidx1 = getelementptr inbounds i32 addrspace(2)* %c, i64 %i.0
++  %arrayidx1 = getelementptr inbounds i32 addrspace(2)* %c, i64 %i.01
+   %1 = load i32 addrspace(2)* %arrayidx1, align 4
+   %add = add nsw i32 %0, %1
+-  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.0
++  %arrayidx2 = getelementptr inbounds i32* %a, i64 %i.01
+   store i32 %add, i32* %arrayidx2, align 4
+-  %inc = add i64 %i.0, 1
+-  br label %for.cond
++  %inc = add i64 %i.01, 1
++  %cmp = icmp ult i64 %inc, 200
++  br i1 %cmp, label %for.body, label %for.end
+ 
+-for.end:                                          ; preds = %for.cond
++for.end:                                          ; preds = %for.body
+   ret void
+ }
+