Index: include/llvm/IR/IntrinsicsSystemZ.td
===================================================================
--- include/llvm/IR/IntrinsicsSystemZ.td
+++ include/llvm/IR/IntrinsicsSystemZ.td
@@ -43,23 +43,25 @@
 class SystemZBinaryCC<LLVMType type>
   : SystemZBinaryConvCC<type, type>;
 
-class SystemZTernaryConv<string name, LLVMType result, LLVMType arg>
+class SystemZTernaryConv<string name, LLVMType result, LLVMType arg, list<IntrinsicProperty> intr_properties = []>
   : GCCBuiltin<"__builtin_s390_" ## name>,
-    Intrinsic<[result], [arg, arg, result], [IntrNoMem]>;
+    Intrinsic<[result], [arg, arg, result], !listconcat([IntrNoMem], intr_properties)>;
 
-class SystemZTernary<string name, LLVMType type>
-  : SystemZTernaryConv<name, type, type>;
+class SystemZTernary<string name, LLVMType type, list<IntrinsicProperty> intr_properties = []>
+  : SystemZTernaryConv<name, type, type, intr_properties>;
 
-class SystemZTernaryInt<string name, LLVMType type>
+class SystemZTernaryInt<string name, LLVMType type, list<IntrinsicProperty> intr_properties = []>
   : GCCBuiltin<"__builtin_s390_" ## name>,
-    Intrinsic<[type], [type, type, llvm_i32_ty], [IntrNoMem]>;
+    Intrinsic<[type], [type, type, llvm_i32_ty], !listconcat([IntrNoMem], intr_properties)>;
 
-class SystemZTernaryIntCC<LLVMType type>
-  : Intrinsic<[type, llvm_i32_ty], [type, type, llvm_i32_ty], [IntrNoMem]>;
+class SystemZTernaryIntCC<LLVMType type, list<IntrinsicProperty> intr_properties = []>
+  : Intrinsic<[type, llvm_i32_ty], [type, type, llvm_i32_ty], !listconcat([IntrNoMem], intr_properties)>;
 
-class SystemZQuaternaryInt<string name, LLVMType type>
+class SystemZQuaternaryInt<string name, LLVMType type,
+                           list<IntrinsicProperty> intr_properties = []>
   : GCCBuiltin<"__builtin_s390_" ## name>,
-    Intrinsic<[type], [type, type, type, llvm_i32_ty], [IntrNoMem]>;
+    Intrinsic<[type], [type, type, type, llvm_i32_ty],
+    !listconcat([IntrNoMem], intr_properties)>;
 
 class SystemZQuaternaryIntCC<LLVMType type>
   : Intrinsic<[type, llvm_i32_ty], [type, type, type, llvm_i32_ty],
@@ -161,10 +163,10 @@
   def f : SystemZTernary<name##"f", llvm_v4i32_ty>;
 }
 
-multiclass SystemZTernaryIntBHF<string name> {
-  def b : SystemZTernaryInt<name##"b", llvm_v16i8_ty>;
-  def h : SystemZTernaryInt<name##"h", llvm_v8i16_ty>;
-  def f : SystemZTernaryInt<name##"f", llvm_v4i32_ty>;
+multiclass SystemZTernaryIntBHF<string name, list<IntrinsicProperty> intr_properties = []> {
+  def b : SystemZTernaryInt<name##"b", llvm_v16i8_ty, intr_properties>;
+  def h : SystemZTernaryInt<name##"h", llvm_v8i16_ty, intr_properties>;
+  def f : SystemZTernaryInt<name##"f", llvm_v4i32_ty, intr_properties>;
 }
 
 multiclass SystemZTernaryIntCCBHF {
@@ -173,14 +175,16 @@
   def fs : SystemZTernaryIntCC<llvm_v4i32_ty>;
 }
 
-multiclass SystemZQuaternaryIntBHF<string name> {
-  def b : SystemZQuaternaryInt<name##"b", llvm_v16i8_ty>;
-  def h : SystemZQuaternaryInt<name##"h", llvm_v8i16_ty>;
-  def f : SystemZQuaternaryInt<name##"f", llvm_v4i32_ty>;
+multiclass SystemZQuaternaryIntBHF<string name, list<IntrinsicProperty> intr_properties = []> {
+  def b : SystemZQuaternaryInt<name##"b", llvm_v16i8_ty, intr_properties>;
+  def h : SystemZQuaternaryInt<name##"h", llvm_v8i16_ty, intr_properties>;
+  def f : SystemZQuaternaryInt<name##"f", llvm_v4i32_ty, intr_properties>;
 }
 
-multiclass SystemZQuaternaryIntBHFG<string name> : SystemZQuaternaryIntBHF<name> {
-  def g : SystemZQuaternaryInt<name##"g", llvm_v2i64_ty>;
+multiclass SystemZQuaternaryIntBHFG<string name,
+           list<IntrinsicProperty> intr_properties = []> :
+  SystemZQuaternaryIntBHF<name, intr_properties> {
+  def g : SystemZQuaternaryInt<name##"g", llvm_v2i64_ty, intr_properties>;
 }
 
 multiclass SystemZQuaternaryIntCCBHF {
@@ -231,11 +235,11 @@
 let TargetPrefix = "s390" in {
   def int_s390_lcbb : GCCBuiltin<"__builtin_s390_lcbb">,
                       Intrinsic<[llvm_i32_ty], [llvm_ptr_ty, llvm_i32_ty],
-                                [IntrNoMem]>;
+                                [IntrNoMem, ImmArg<1>]>;
 
   def int_s390_vlbb : GCCBuiltin<"__builtin_s390_vlbb">,
                       Intrinsic<[llvm_v16i8_ty], [llvm_ptr_ty, llvm_i32_ty],
-                                [IntrReadMem, IntrArgMemOnly]>;
+                                [IntrReadMem, IntrArgMemOnly, ImmArg<1>]>;
 
   def int_s390_vll : GCCBuiltin<"__builtin_s390_vll">,
                      Intrinsic<[llvm_v16i8_ty], [llvm_i32_ty, llvm_ptr_ty],
@@ -244,7 +248,7 @@
   def int_s390_vpdi : GCCBuiltin<"__builtin_s390_vpdi">,
                       Intrinsic<[llvm_v2i64_ty],
                                 [llvm_v2i64_ty, llvm_v2i64_ty, llvm_i32_ty],
-                                [IntrNoMem]>;
+                                [IntrNoMem, ImmArg<2>]>;
 
   def int_s390_vperm : GCCBuiltin<"__builtin_s390_vperm">,
                        Intrinsic<[llvm_v16i8_ty],
@@ -298,7 +302,7 @@
 
   defm int_s390_verllv : SystemZBinaryBHFG<"verllv">;
   defm int_s390_verll  : SystemZBinaryIntBHFG<"verll">;
-  defm int_s390_verim  : SystemZQuaternaryIntBHFG<"verim">;
+  defm int_s390_verim  : SystemZQuaternaryIntBHFG<"verim", [ImmArg<3>]>;
 
   def int_s390_vsl   : SystemZBinary<"vsl",   llvm_v16i8_ty>;
   def int_s390_vslb  : SystemZBinary<"vslb",  llvm_v16i8_ty>;
@@ -310,7 +314,7 @@
   def int_s390_vsldb : GCCBuiltin<"__builtin_s390_vsldb">,
                        Intrinsic<[llvm_v16i8_ty],
                                  [llvm_v16i8_ty, llvm_v16i8_ty, llvm_i32_ty],
-                                 [IntrNoMem]>;
+                                 [IntrNoMem, ImmArg<2>]>;
 
   defm int_s390_vscbi : SystemZBinaryBHFG<"vscbi">;
 
@@ -338,9 +342,9 @@
   defm int_s390_vch  : SystemZCompareBHFG<"vch">;
   defm int_s390_vchl : SystemZCompareBHFG<"vchl">;
 
-  defm int_s390_vfae  : SystemZTernaryIntBHF<"vfae">;
+  defm int_s390_vfae  : SystemZTernaryIntBHF<"vfae", [ImmArg<2>]>;
   defm int_s390_vfae  : SystemZTernaryIntCCBHF;
-  defm int_s390_vfaez : SystemZTernaryIntBHF<"vfaez">;
+  defm int_s390_vfaez : SystemZTernaryIntBHF<"vfaez", [ImmArg<2>]>;
   defm int_s390_vfaez : SystemZTernaryIntCCBHF;
 
   defm int_s390_vfee  : SystemZBinaryBHF<"vfee">;
@@ -356,9 +360,9 @@
   defm int_s390_vistr : SystemZUnaryBHF<"vistr">;
   defm int_s390_vistr : SystemZUnaryCCBHF;
 
-  defm int_s390_vstrc  : SystemZQuaternaryIntBHF<"vstrc">;
+  defm int_s390_vstrc  : SystemZQuaternaryIntBHF<"vstrc", [ImmArg<3>]>;
   defm int_s390_vstrc  : SystemZQuaternaryIntCCBHF;
-  defm int_s390_vstrcz : SystemZQuaternaryIntBHF<"vstrcz">;
+  defm int_s390_vstrcz : SystemZQuaternaryIntBHF<"vstrcz", [ImmArg<3>]>;
   defm int_s390_vstrcz : SystemZQuaternaryIntCCBHF;
 
   def int_s390_vfcedbs  : SystemZBinaryConvCC<llvm_v2i64_ty, llvm_v2f64_ty>;
@@ -378,7 +382,7 @@
   def int_s390_vmslg  : GCCBuiltin<"__builtin_s390_vmslg">,
                         Intrinsic<[llvm_v16i8_ty],
                                   [llvm_v2i64_ty, llvm_v2i64_ty, llvm_v16i8_ty,
-                                   llvm_i32_ty], [IntrNoMem]>;
+                                   llvm_i32_ty], [IntrNoMem, ImmArg<3>]>;
 
   def int_s390_vfmaxdb : Intrinsic<[llvm_v2f64_ty],
                                    [llvm_v2f64_ty, llvm_v2f64_ty, llvm_i32_ty],