Fix incorrect LLVM_3_1svn tests.

1. For some time now, we provide the version without the 'svn'
2. We should be testing "not LLVM 3.0" in these cases, since they
   apply to LLVM 3.2 and beyond as well...

buildispc.bat

@@ -3,7 +3,7 @@
 REM If LLVM_INSTALL_DIR isn't set globally in your environment,
 REM it can be set here_
 set LLVM_INSTALL_DIR=c:\users\mmp\llvm-dev
-set LLVM_VERSION=3.1svn
+set LLVM_VERSION=3.2
 
 REM Both the LLVM binaries and python need to be in the path
 set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin

builtins/util.m4

@@ -2704,10 +2704,7 @@ define(`masked_store_blend_8_16_by_4', `
 define void @__masked_store_blend_i8(<4 x i8>* nocapture, <4 x i8>,
                                      <4 x i32>) nounwind alwaysinline {
   %old = load <4 x i8> * %0, align 1
-  ifelse(LLVM_VERSION,LLVM_3_1svn,`
+  ifelse(LLVM_VERSION,LLVM_3_0,`
-    %m = trunc <4 x i32> %2 to <4 x i1>
-    %resultvec = select <4 x i1> %m, <4 x i8> %1, <4 x i8> %old
-  ',`
     %old32 = bitcast <4 x i8> %old to i32
     %new32 = bitcast <4 x i8> %1 to i32
 
@@ -2720,6 +2717,9 @@ define void @__masked_store_blend_i8(<4 x i8>* nocapture, <4 x i8>,
     %result = or i32 %newmasked, %oldmasked
 
     %resultvec = bitcast i32 %result to <4 x i8>
+  ',`
+    %m = trunc <4 x i32> %2 to <4 x i1>
+    %resultvec = select <4 x i1> %m, <4 x i8> %1, <4 x i8> %old
   ')
   store <4 x i8> %resultvec, <4 x i8> * %0, align 1
   ret void
@@ -2728,10 +2728,7 @@ define void @__masked_store_blend_i8(<4 x i8>* nocapture, <4 x i8>,
 define void @__masked_store_blend_i16(<4 x i16>* nocapture, <4 x i16>,
                                       <4 x i32>) nounwind alwaysinline {
   %old = load <4 x i16> * %0, align 2
-  ifelse(LLVM_VERSION,LLVM_3_1svn,`
+  ifelse(LLVM_VERSION,LLVM_3_0,`
-    %m = trunc <4 x i32> %2 to <4 x i1>
-    %resultvec = select <4 x i1> %m, <4 x i16> %1, <4 x i16> %old
-  ',`
     %old64 = bitcast <4 x i16> %old to i64
     %new64 = bitcast <4 x i16> %1 to i64
 
@@ -2744,6 +2741,9 @@ define void @__masked_store_blend_i16(<4 x i16>* nocapture, <4 x i16>,
     %result = or i64 %newmasked, %oldmasked
 
     %resultvec = bitcast i64 %result to <4 x i16>
+  ',`
+    %m = trunc <4 x i32> %2 to <4 x i1>
+    %resultvec = select <4 x i1> %m, <4 x i16> %1, <4 x i16> %old
   ')
   store <4 x i16> %resultvec, <4 x i16> * %0, align 2
   ret void
@@ -2754,10 +2754,7 @@ define(`masked_store_blend_8_16_by_8', `
 define void @__masked_store_blend_i8(<8 x i8>* nocapture, <8 x i8>,
                                      <8 x i32>) nounwind alwaysinline {
   %old = load <8 x i8> * %0, align 1
-  ifelse(LLVM_VERSION,LLVM_3_1svn,`
+  ifelse(LLVM_VERSION,LLVM_3_0,`
-    %m = trunc <8 x i32> %2 to <8 x i1>
-    %resultvec = select <8 x i1> %m, <8 x i8> %1, <8 x i8> %old
-  ',`
     %old64 = bitcast <8 x i8> %old to i64
     %new64 = bitcast <8 x i8> %1 to i64
 
@@ -2770,6 +2767,9 @@ define void @__masked_store_blend_i8(<8 x i8>* nocapture, <8 x i8>,
     %result = or i64 %newmasked, %oldmasked
 
     %resultvec = bitcast i64 %result to <8 x i8>
+  ',`
+    %m = trunc <8 x i32> %2 to <8 x i1>
+    %resultvec = select <8 x i1> %m, <8 x i8> %1, <8 x i8> %old
   ')
   store <8 x i8> %resultvec, <8 x i8> * %0, align 1
   ret void
@@ -2778,10 +2778,7 @@ define void @__masked_store_blend_i8(<8 x i8>* nocapture, <8 x i8>,
 define void @__masked_store_blend_i16(<8 x i16>* nocapture, <8 x i16>,
                                       <8 x i32>) nounwind alwaysinline {
   %old = load <8 x i16> * %0, align 2
-  ifelse(LLVM_VERSION,LLVM_3_1svn,`
+  ifelse(LLVM_VERSION,LLVM_3_0,`
-    %m = trunc <8 x i32> %2 to <8 x i1>
-    %resultvec = select <8 x i1> %m, <8 x i16> %1, <8 x i16> %old
-  ',`
     %old128 = bitcast <8 x i16> %old to i128
     %new128 = bitcast <8 x i16> %1 to i128
 
@@ -2794,6 +2791,9 @@ define void @__masked_store_blend_i16(<8 x i16>* nocapture, <8 x i16>,
     %result = or i128 %newmasked, %oldmasked
 
     %resultvec = bitcast i128 %result to <8 x i16>
+  ',`
+    %m = trunc <8 x i32> %2 to <8 x i1>
+    %resultvec = select <8 x i1> %m, <8 x i16> %1, <8 x i16> %old
   ')
   store <8 x i16> %resultvec, <8 x i16> * %0, align 2
   ret void
@@ -2805,10 +2805,7 @@ define(`masked_store_blend_8_16_by_16', `
 define void @__masked_store_blend_i8(<16 x i8>* nocapture, <16 x i8>,
                                      <16 x i32>) nounwind alwaysinline {
   %old = load <16 x i8> * %0, align 1
-  ifelse(LLVM_VERSION,LLVM_3_1svn,`
+  ifelse(LLVM_VERSION,LLVM_3_0,`
-    %m = trunc <16 x i32> %2 to <16 x i1>
-    %resultvec = select <16 x i1> %m, <16 x i8> %1, <16 x i8> %old
-  ',`
     %old128 = bitcast <16 x i8> %old to i128
     %new128 = bitcast <16 x i8> %1 to i128
 
@@ -2821,6 +2818,9 @@ define void @__masked_store_blend_i8(<16 x i8>* nocapture, <16 x i8>,
     %result = or i128 %newmasked, %oldmasked
 
     %resultvec = bitcast i128 %result to <16 x i8>
+  ',`
+    %m = trunc <16 x i32> %2 to <16 x i1>
+    %resultvec = select <16 x i1> %m, <16 x i8> %1, <16 x i8> %old
   ')
   store <16 x i8> %resultvec, <16 x i8> * %0, align 1
   ret void
@@ -2829,10 +2829,7 @@ define void @__masked_store_blend_i8(<16 x i8>* nocapture, <16 x i8>,
 define void @__masked_store_blend_i16(<16 x i16>* nocapture, <16 x i16>,
                                       <16 x i32>) nounwind alwaysinline {
   %old = load <16 x i16> * %0, align 2
-  ifelse(LLVM_VERSION,LLVM_3_1svn,`
+  ifelse(LLVM_VERSION,LLVM_3_0,`
-    %m = trunc <16 x i32> %2 to <16 x i1>
-    %resultvec = select <16 x i1> %m, <16 x i16> %1, <16 x i16> %old
-  ',`
     %old256 = bitcast <16 x i16> %old to i256
     %new256 = bitcast <16 x i16> %1 to i256
 
@@ -2845,6 +2842,9 @@ define void @__masked_store_blend_i16(<16 x i16>* nocapture, <16 x i16>,
     %result = or i256 %newmasked, %oldmasked
 
     %resultvec = bitcast i256 %result to <16 x i16>
+  ',`
+    %m = trunc <16 x i32> %2 to <16 x i1>
+    %resultvec = select <16 x i1> %m, <16 x i16> %1, <16 x i16> %old
   ')
   store <16 x i16> %resultvec, <16 x i16> * %0, align 2
   ret void