diff --git a/lib/Target/AVR/AVRISelLowering.cpp b/lib/Target/AVR/AVRISelLowering.cpp
index eb719415395..79c89c60a64 100644
--- a/lib/Target/AVR/AVRISelLowering.cpp
+++ b/lib/Target/AVR/AVRISelLowering.cpp
@@ -1915,43 +1915,65 @@ std::pair<unsigned, const TargetRegisterClass *>
 AVRTargetLowering::getRegForInlineAsmConstraint(const TargetRegisterInfo *TRI,
                                                 StringRef Constraint,
                                                 MVT VT) const {
-  // We only support i8 and i16.
-  //
-  //:FIXME: remove this assert for now since it gets sometimes executed
-  // assert((VT == MVT::i16 || VT == MVT::i8) && "Wrong operand type.");
-
   if (Constraint.size() == 1) {
     switch (Constraint[0]) {
     case 'a': // Simple upper registers r16..r23.
-      return std::make_pair(0U, &AVR::LD8loRegClass);
+      if (VT == MVT::i8)
+        return std::make_pair(0U, &AVR::LD8loRegClass);
+      else if (VT == MVT::i16)
+        return std::make_pair(0U, &AVR::DREGSLD8loRegClass);
+      break;
     case 'b': // Base pointer registers: y, z.
-      return std::make_pair(0U, &AVR::PTRDISPREGSRegClass);
+      if (VT == MVT::i8 || VT == MVT::i16)
+        return std::make_pair(0U, &AVR::PTRDISPREGSRegClass);
+      break;
     case 'd': // Upper registers r16..r31.
-      return std::make_pair(0U, &AVR::LD8RegClass);
+      if (VT == MVT::i8)
+        return std::make_pair(0U, &AVR::LD8RegClass);
+      else if (VT == MVT::i16)
+        return std::make_pair(0U, &AVR::DLDREGSRegClass);
+      break;
     case 'l': // Lower registers r0..r15.
-      return std::make_pair(0U, &AVR::GPR8loRegClass);
+      if (VT == MVT::i8)
+        return std::make_pair(0U, &AVR::GPR8loRegClass);
+      else if (VT == MVT::i16)
+        return std::make_pair(0U, &AVR::DREGSloRegClass);
+      break;
     case 'e': // Pointer register pairs: x, y, z.
-      return std::make_pair(0U, &AVR::PTRREGSRegClass);
+      if (VT == MVT::i8 || VT == MVT::i16)
+        return std::make_pair(0U, &AVR::PTRREGSRegClass);
+      break;
     case 'q': // Stack pointer register: SPH:SPL.
       return std::make_pair(0U, &AVR::GPRSPRegClass);
     case 'r': // Any register: r0..r31.
       if (VT == MVT::i8)
         return std::make_pair(0U, &AVR::GPR8RegClass);
-
-      return std::make_pair(0U, &AVR::DREGSRegClass);
+      else if (VT == MVT::i16)
+        return std::make_pair(0U, &AVR::DREGSRegClass);
+      break;
     case 't': // Temporary register: r0.
-      return std::make_pair(unsigned(AVR::R0), &AVR::GPR8RegClass);
+      if (VT == MVT::i8)
+        return std::make_pair(unsigned(AVR::R0), &AVR::GPR8RegClass);
+      break;
     case 'w': // Special upper register pairs: r24, r26, r28, r30.
-      return std::make_pair(0U, &AVR::IWREGSRegClass);
+      if (VT == MVT::i8 || VT == MVT::i16)
+        return std::make_pair(0U, &AVR::IWREGSRegClass);
+      break;
     case 'x': // Pointer register pair X: r27:r26.
     case 'X':
-      return std::make_pair(unsigned(AVR::R27R26), &AVR::PTRREGSRegClass);
+      if (VT == MVT::i8 || VT == MVT::i16)
+        return std::make_pair(unsigned(AVR::R27R26), &AVR::PTRREGSRegClass);
+      break;
     case 'y': // Pointer register pair Y: r29:r28.
     case 'Y':
-      return std::make_pair(unsigned(AVR::R29R28), &AVR::PTRREGSRegClass);
+      if (VT == MVT::i8 || VT == MVT::i16)
+        return std::make_pair(unsigned(AVR::R29R28), &AVR::PTRREGSRegClass);
+      break;
     case 'z': // Pointer register pair Z: r31:r30.
     case 'Z':
-      return std::make_pair(unsigned(AVR::R31R30), &AVR::PTRREGSRegClass);
+      if (VT == MVT::i8 || VT == MVT::i16)
+        return std::make_pair(unsigned(AVR::R31R30), &AVR::PTRREGSRegClass);
+      break;
     default:
       break;
     }
diff --git a/lib/Target/AVR/AVRRegisterInfo.td b/lib/Target/AVR/AVRRegisterInfo.td
index 6f3086d0b10..1948fcbaf75 100644
--- a/lib/Target/AVR/AVRRegisterInfo.td
+++ b/lib/Target/AVR/AVRRegisterInfo.td
@@ -171,6 +171,21 @@ def DREGS : RegisterClass<"AVR", [i16], 8,
     R14R13, R12R11, R10R9
   )>;
 
+// Lower 16-bit pair registers in R0..R15, only used in inline assembly.
+def DREGSlo : RegisterClass<"AVR", [i16], 8,
+  (
+    add R15R14, R13R12, R11R10, R9R8, R7R6, R5R4, R3R2, R1R0
+  )>;
+
+// Lower 16-bit pair registers in r16..r23, only used in inline assembly.
+def DREGSLD8lo : RegisterClass<"AVR", [i16], 8,
+  (
+    // Return value and arguments.
+    add R19R18, R21R20, R23R22,
+    // Callee saved registers.
+    R17R16
+  )>;
+
 // 16-bit pair register class for movw
 def DREGSMOVW : RegisterClass<"AVR", [i16], 8,
   (
diff --git a/test/CodeGen/AVR/inline-asm/inline-asm3.ll b/test/CodeGen/AVR/inline-asm/inline-asm3.ll
new file mode 100644
index 00000000000..c502cb9eb9f
--- /dev/null
+++ b/test/CodeGen/AVR/inline-asm/inline-asm3.ll
@@ -0,0 +1,388 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc < %s -mtriple=avr | FileCheck %s
+
+define void @add_r_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_r_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r24, r22
+; CHECK-NEXT:    add r24, r20
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=r,r,r"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+declare void @foo8(i8 signext, i8 signext, i8 signext)
+
+define void @add_r_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_r_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r21, r23
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r23, r25
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r24, r22
+; CHECK-NEXT:    mov r25, r23
+; CHECK-NEXT:    add r24, r20
+; CHECK-NEXT:    adc r25, r21
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=r,r,r"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}
+
+declare void @foo16(i16 signext, i16 signext, i16 signext)
+
+define void @add_a_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_a_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r23, r22
+; CHECK-NEXT:    add r23, r20
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r23
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=a,a,a"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_a_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_a_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r21, r23
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r23, r25
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r18, r22
+; CHECK-NEXT:    mov r19, r23
+; CHECK-NEXT:    add r18, r20
+; CHECK-NEXT:    adc r19, r21
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r18
+; CHECK-NEXT:    mov r25, r19
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=a,a,a"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}
+
+define void @add_d_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_d_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r24, r22
+; CHECK-NEXT:    add r24, r20
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=d,d,d"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_d_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_d_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r21, r23
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r23, r25
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r24, r22
+; CHECK-NEXT:    mov r25, r23
+; CHECK-NEXT:    add r24, r20
+; CHECK-NEXT:    adc r25, r21
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=d,d,d"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}
+
+define void @add_l_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_l_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    push r13
+; CHECK-NEXT:    push r14
+; CHECK-NEXT:    push r15
+; CHECK-NEXT:    mov r15, r22
+; CHECK-NEXT:    mov r14, r24
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r13, r14
+; CHECK-NEXT:    add r13, r15
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r13
+; CHECK-NEXT:    mov r22, r14
+; CHECK-NEXT:    mov r20, r15
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    pop r15
+; CHECK-NEXT:    pop r14
+; CHECK-NEXT:    pop r13
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=l,l,l"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_l_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_l_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    push r10
+; CHECK-NEXT:    push r11
+; CHECK-NEXT:    push r12
+; CHECK-NEXT:    push r13
+; CHECK-NEXT:    push r14
+; CHECK-NEXT:    push r15
+; CHECK-NEXT:    mov r14, r22
+; CHECK-NEXT:    mov r15, r23
+; CHECK-NEXT:    mov r12, r24
+; CHECK-NEXT:    mov r13, r25
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r10, r12
+; CHECK-NEXT:    mov r11, r13
+; CHECK-NEXT:    add r10, r14
+; CHECK-NEXT:    adc r11, r15
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r10
+; CHECK-NEXT:    mov r25, r11
+; CHECK-NEXT:    mov r22, r12
+; CHECK-NEXT:    mov r23, r13
+; CHECK-NEXT:    mov r20, r14
+; CHECK-NEXT:    mov r21, r15
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    pop r15
+; CHECK-NEXT:    pop r14
+; CHECK-NEXT:    pop r13
+; CHECK-NEXT:    pop r12
+; CHECK-NEXT:    pop r11
+; CHECK-NEXT:    pop r10
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=l,l,l"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}
+
+define void @add_b_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_b_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r30, r22
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r30, r30
+; CHECK-NEXT:    add r30, r20
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r30
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=b,b,r"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_b_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_b_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r21, r23
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r23, r25
+; CHECK-NEXT:    mov r30, r22
+; CHECK-NEXT:    mov r31, r23
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r30, r30
+; CHECK-NEXT:    mov r31, r31
+; CHECK-NEXT:    add r30, r20
+; CHECK-NEXT:    adc r31, r21
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r30
+; CHECK-NEXT:    mov r25, r31
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=b,b,r"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}
+
+define void @add_e_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_e_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r30, r22
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r26, r22
+; CHECK-NEXT:    mov r27, r23
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r26, r26
+; CHECK-NEXT:    add r26, r30
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r26
+; CHECK-NEXT:    ; kill: def $r22 killed $r22 killed $r23r22
+; CHECK-NEXT:    mov r20, r30
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=e,e,e"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_e_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_e_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r30, r22
+; CHECK-NEXT:    mov r31, r23
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r23, r25
+; CHECK-NEXT:    mov r26, r22
+; CHECK-NEXT:    mov r27, r23
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r26, r26
+; CHECK-NEXT:    mov r27, r27
+; CHECK-NEXT:    add r26, r30
+; CHECK-NEXT:    adc r27, r31
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r26
+; CHECK-NEXT:    mov r25, r27
+; CHECK-NEXT:    mov r20, r30
+; CHECK-NEXT:    mov r21, r31
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=e,e,e"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}
+
+define void @add_t_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_t_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r0, r22
+; CHECK-NEXT:    add r0, r20
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r0
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=t,r,r"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_w_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_w_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r26, r22
+; CHECK-NEXT:    mov r30, r24
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r24, r30
+; CHECK-NEXT:    add r24, r26
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    ; kill: def $r24 killed $r24 killed $r25r24
+; CHECK-NEXT:    mov r22, r30
+; CHECK-NEXT:    mov r20, r26
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=w,w,w"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_w_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_w_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    mov r26, r22
+; CHECK-NEXT:    mov r27, r23
+; CHECK-NEXT:    mov r30, r24
+; CHECK-NEXT:    mov r31, r25
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r24, r30
+; CHECK-NEXT:    mov r25, r31
+; CHECK-NEXT:    add r24, r26
+; CHECK-NEXT:    adc r25, r27
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r22, r30
+; CHECK-NEXT:    mov r23, r31
+; CHECK-NEXT:    mov r20, r26
+; CHECK-NEXT:    mov r21, r27
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=w,w,w"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}
+
+define void @add_xyz_i8(i8 signext %0, i8 signext %1) {
+; CHECK-LABEL: add_xyz_i8:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    push r28
+; CHECK-NEXT:    push r29
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r28, r22
+; CHECK-NEXT:    mov r29, r23
+; CHECK-NEXT:    mov r26, r20
+; CHECK-NEXT:    mov r27, r21
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r30, r28
+; CHECK-NEXT:    add r30, r26
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r30
+; CHECK-NEXT:    mov r25, r31
+; CHECK-NEXT:    ; kill: def $r24 killed $r24 killed $r25r24
+; CHECK-NEXT:    ; kill: def $r22 killed $r22 killed $r23r22
+; CHECK-NEXT:    ; kill: def $r20 killed $r20 killed $r21r20
+; CHECK-NEXT:    call foo8
+; CHECK-NEXT:    pop r29
+; CHECK-NEXT:    pop r28
+; CHECK-NEXT:    ret
+  %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=z,y,x"(i8 %0, i8 %1)
+  tail call void @foo8(i8 signext %3, i8 signext %0, i8 signext %1)
+  ret void
+}
+
+define void @add_xyz_i16(i16 signext %0, i16 signext %1) {
+; CHECK-LABEL: add_xyz_i16:
+; CHECK:       ; %bb.0:
+; CHECK-NEXT:    push r28
+; CHECK-NEXT:    push r29
+; CHECK-NEXT:    mov r20, r22
+; CHECK-NEXT:    mov r21, r23
+; CHECK-NEXT:    mov r22, r24
+; CHECK-NEXT:    mov r23, r25
+; CHECK-NEXT:    mov r28, r22
+; CHECK-NEXT:    mov r29, r23
+; CHECK-NEXT:    mov r26, r20
+; CHECK-NEXT:    mov r27, r21
+; CHECK-NEXT:    ;APP
+; CHECK-NEXT:    mov r30, r28
+; CHECK-NEXT:    mov r31, r29
+; CHECK-NEXT:    add r30, r26
+; CHECK-NEXT:    adc r31, r27
+; CHECK-NEXT:    ;NO_APP
+; CHECK-NEXT:    mov r24, r30
+; CHECK-NEXT:    mov r25, r31
+; CHECK-NEXT:    call foo16
+; CHECK-NEXT:    pop r29
+; CHECK-NEXT:    pop r28
+; CHECK-NEXT:    ret
+  %3 = tail call i16 asm sideeffect "mov ${0:A}, ${1:A}\0Amov ${0:B}, ${1:B}\0Aadd ${0:A}, ${2:A}\0Aadc ${0:B}, ${2:B}", "=z,y,x"(i16 %0, i16 %1)
+  tail call void @foo16(i16 signext %3, i16 signext %0, i16 signext %1)
+  ret void
+}