diff --git a/llvm/lib/Target/Sparc/SparcISelLowering.h b/llvm/lib/Target/Sparc/SparcISelLowering.h
index 0d220f8c3d32e..3a6aaf929707d 100644
--- a/llvm/lib/Target/Sparc/SparcISelLowering.h
+++ b/llvm/lib/Target/Sparc/SparcISelLowering.h
@@ -28,6 +28,8 @@ namespace llvm {
 
     bool useSoftFloat() const override;
 
+    bool softPromoteHalfType() const override { return true; }
+
     /// computeKnownBitsForTargetNode - Determine which of the bits specified
     /// in Mask are known to be either zero or one and return them in the
     /// KnownZero/KnownOne bitsets.
diff --git a/llvm/test/CodeGen/Generic/half.ll b/llvm/test/CodeGen/Generic/half.ll
index f4ea5b5b30621..b27c968e1531d 100644
--- a/llvm/test/CodeGen/Generic/half.ll
+++ b/llvm/test/CodeGen/Generic/half.ll
@@ -35,8 +35,8 @@
 ; RUN: %if powerpc-registered-target     %{ llc %s -o - -mtriple=powerpc64le-unknown-linux-gnu   | FileCheck %s --check-prefixes=ALL,BAD   %}
 ; RUN: %if riscv-registered-target       %{ llc %s -o - -mtriple=riscv32-unknown-linux-gnu       | FileCheck %s --check-prefixes=ALL,CHECK %}
 ; RUN: %if riscv-registered-target       %{ llc %s -o - -mtriple=riscv64-unknown-linux-gnu       | FileCheck %s --check-prefixes=ALL,CHECK %}
-; RUN: %if sparc-registered-target       %{ llc %s -o - -mtriple=sparc-unknown-linux-gnu         | FileCheck %s --check-prefixes=ALL,BAD   %}
-; RUN: %if sparc-registered-target       %{ llc %s -o - -mtriple=sparc64-unknown-linux-gnu       | FileCheck %s --check-prefixes=ALL,BAD   %}
+; RUN: %if sparc-registered-target       %{ llc %s -o - -mtriple=sparc-unknown-linux-gnu         | FileCheck %s --check-prefixes=ALL,CHECK %}
+; RUN: %if sparc-registered-target       %{ llc %s -o - -mtriple=sparc64-unknown-linux-gnu       | FileCheck %s --check-prefixes=ALL,CHECK %}
 ; RUN: %if spirv-registered-target       %{ llc %s -o - -mtriple=spirv-unknown-unknown           | FileCheck %s --check-prefixes=NOCRASH   %}
 ; RUN: %if systemz-registered-target     %{ llc %s -o - -mtriple=s390x-unknown-linux-gnu         | FileCheck %s --check-prefixes=ALL,CHECK %}
 ; RUN: %if ve-registered-target          %{ llc %s -o - -mtriple=ve-unknown-unknown              | FileCheck %s --check-prefixes=ALL,BAD   %}
diff --git a/llvm/test/CodeGen/SPARC/fp16-promote.ll b/llvm/test/CodeGen/SPARC/fp16-promote.ll
index efe67b04e8fb3..64873b744de50 100644
--- a/llvm/test/CodeGen/SPARC/fp16-promote.ll
+++ b/llvm/test/CodeGen/SPARC/fp16-promote.ll
@@ -329,13 +329,14 @@ define void @test_fadd(ptr %p, ptr %q) nounwind {
 ; V8-OPT-LABEL: test_fadd:
 ; V8-OPT:       ! %bb.0:
 ; V8-OPT-NEXT:    save %sp, -104, %sp
+; V8-OPT-NEXT:    lduh [%i0], %i2
 ; V8-OPT-NEXT:    call __extendhfsf2
-; V8-OPT-NEXT:    lduh [%i0], %o0
+; V8-OPT-NEXT:    lduh [%i1], %o0
 ; V8-OPT-NEXT:    st %f0, [%fp+-8] ! 4-byte Folded Spill
 ; V8-OPT-NEXT:    call __extendhfsf2
-; V8-OPT-NEXT:    lduh [%i1], %o0
+; V8-OPT-NEXT:    mov %i2, %o0
 ; V8-OPT-NEXT:    ld [%fp+-8], %f1 ! 4-byte Folded Reload
-; V8-OPT-NEXT:    fadds %f1, %f0, %f0
+; V8-OPT-NEXT:    fadds %f0, %f1, %f0
 ; V8-OPT-NEXT:    st %f0, [%fp+-4]
 ; V8-OPT-NEXT:    call __truncsfhf2
 ; V8-OPT-NEXT:    ld [%fp+-4], %o0
@@ -346,13 +347,14 @@ define void @test_fadd(ptr %p, ptr %q) nounwind {
 ; V8-UNOPT-LABEL: test_fadd:
 ; V8-UNOPT:       ! %bb.0:
 ; V8-UNOPT-NEXT:    save %sp, -104, %sp
-; V8-UNOPT-NEXT:    call __extendhfsf2
-; V8-UNOPT-NEXT:    lduh [%i0], %o0
-; V8-UNOPT-NEXT:    st %f0, [%fp+-8] ! 4-byte Folded Spill
+; V8-UNOPT-NEXT:    lduh [%i0], %i2
+; V8-UNOPT-NEXT:    st %i2, [%fp+-12] ! 4-byte Folded Spill
 ; V8-UNOPT-NEXT:    call __extendhfsf2
 ; V8-UNOPT-NEXT:    lduh [%i1], %o0
-; V8-UNOPT-NEXT:    fmovs %f0, %f1
-; V8-UNOPT-NEXT:    ld [%fp+-8], %f0 ! 4-byte Folded Reload
+; V8-UNOPT-NEXT:    ld [%fp+-12], %o0 ! 4-byte Folded Reload
+; V8-UNOPT-NEXT:    call __extendhfsf2
+; V8-UNOPT-NEXT:    st %f0, [%fp+-8]
+; V8-UNOPT-NEXT:    ld [%fp+-8], %f1 ! 4-byte Folded Reload
 ; V8-UNOPT-NEXT:    fadds %f0, %f1, %f0
 ; V8-UNOPT-NEXT:    st %f0, [%fp+-4]
 ; V8-UNOPT-NEXT:    call __truncsfhf2
@@ -364,13 +366,14 @@ define void @test_fadd(ptr %p, ptr %q) nounwind {
 ; V9-LABEL: test_fadd:
 ; V9:       ! %bb.0:
 ; V9-NEXT:    save %sp, -104, %sp
+; V9-NEXT:    lduh [%i0], %i2
 ; V9-NEXT:    call __extendhfsf2
-; V9-NEXT:    lduh [%i0], %o0
+; V9-NEXT:    lduh [%i1], %o0
 ; V9-NEXT:    st %f0, [%fp+-8] ! 4-byte Folded Spill
 ; V9-NEXT:    call __extendhfsf2
-; V9-NEXT:    lduh [%i1], %o0
+; V9-NEXT:    mov %i2, %o0
 ; V9-NEXT:    ld [%fp+-8], %f1 ! 4-byte Folded Reload
-; V9-NEXT:    fadds %f1, %f0, %f0
+; V9-NEXT:    fadds %f0, %f1, %f0
 ; V9-NEXT:    st %f0, [%fp+-4]
 ; V9-NEXT:    call __truncsfhf2
 ; V9-NEXT:    ld [%fp+-4], %o0
@@ -381,14 +384,15 @@ define void @test_fadd(ptr %p, ptr %q) nounwind {
 ; SPARC64-LABEL: test_fadd:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -192, %sp
+; SPARC64-NEXT:    lduh [%i0], %i2
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    lduh [%i0], %o0
+; SPARC64-NEXT:    lduh [%i1], %o0
 ; SPARC64-NEXT:    st %f0, [%fp+2043] ! 4-byte Folded Spill
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    lduh [%i1], %o0
+; SPARC64-NEXT:    mov %i2, %o0
 ; SPARC64-NEXT:    ld [%fp+2043], %f1 ! 4-byte Folded Reload
 ; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    fadds %f1, %f0, %f1
+; SPARC64-NEXT:    fadds %f0, %f1, %f1
 ; SPARC64-NEXT:    sth %o0, [%i0]
 ; SPARC64-NEXT:    ret
 ; SPARC64-NEXT:    restore
@@ -403,13 +407,14 @@ define void @test_fmul(ptr %p, ptr %q) nounwind {
 ; V8-OPT-LABEL: test_fmul:
 ; V8-OPT:       ! %bb.0:
 ; V8-OPT-NEXT:    save %sp, -104, %sp
+; V8-OPT-NEXT:    lduh [%i0], %i2
 ; V8-OPT-NEXT:    call __extendhfsf2
-; V8-OPT-NEXT:    lduh [%i0], %o0
+; V8-OPT-NEXT:    lduh [%i1], %o0
 ; V8-OPT-NEXT:    st %f0, [%fp+-8] ! 4-byte Folded Spill
 ; V8-OPT-NEXT:    call __extendhfsf2
-; V8-OPT-NEXT:    lduh [%i1], %o0
+; V8-OPT-NEXT:    mov %i2, %o0
 ; V8-OPT-NEXT:    ld [%fp+-8], %f1 ! 4-byte Folded Reload
-; V8-OPT-NEXT:    fmuls %f1, %f0, %f0
+; V8-OPT-NEXT:    fmuls %f0, %f1, %f0
 ; V8-OPT-NEXT:    st %f0, [%fp+-4]
 ; V8-OPT-NEXT:    call __truncsfhf2
 ; V8-OPT-NEXT:    ld [%fp+-4], %o0
@@ -420,13 +425,14 @@ define void @test_fmul(ptr %p, ptr %q) nounwind {
 ; V8-UNOPT-LABEL: test_fmul:
 ; V8-UNOPT:       ! %bb.0:
 ; V8-UNOPT-NEXT:    save %sp, -104, %sp
-; V8-UNOPT-NEXT:    call __extendhfsf2
-; V8-UNOPT-NEXT:    lduh [%i0], %o0
-; V8-UNOPT-NEXT:    st %f0, [%fp+-8] ! 4-byte Folded Spill
+; V8-UNOPT-NEXT:    lduh [%i0], %i2
+; V8-UNOPT-NEXT:    st %i2, [%fp+-12] ! 4-byte Folded Spill
 ; V8-UNOPT-NEXT:    call __extendhfsf2
 ; V8-UNOPT-NEXT:    lduh [%i1], %o0
-; V8-UNOPT-NEXT:    fmovs %f0, %f1
-; V8-UNOPT-NEXT:    ld [%fp+-8], %f0 ! 4-byte Folded Reload
+; V8-UNOPT-NEXT:    ld [%fp+-12], %o0 ! 4-byte Folded Reload
+; V8-UNOPT-NEXT:    call __extendhfsf2
+; V8-UNOPT-NEXT:    st %f0, [%fp+-8]
+; V8-UNOPT-NEXT:    ld [%fp+-8], %f1 ! 4-byte Folded Reload
 ; V8-UNOPT-NEXT:    fmuls %f0, %f1, %f0
 ; V8-UNOPT-NEXT:    st %f0, [%fp+-4]
 ; V8-UNOPT-NEXT:    call __truncsfhf2
@@ -438,13 +444,14 @@ define void @test_fmul(ptr %p, ptr %q) nounwind {
 ; V9-LABEL: test_fmul:
 ; V9:       ! %bb.0:
 ; V9-NEXT:    save %sp, -104, %sp
+; V9-NEXT:    lduh [%i0], %i2
 ; V9-NEXT:    call __extendhfsf2
-; V9-NEXT:    lduh [%i0], %o0
+; V9-NEXT:    lduh [%i1], %o0
 ; V9-NEXT:    st %f0, [%fp+-8] ! 4-byte Folded Spill
 ; V9-NEXT:    call __extendhfsf2
-; V9-NEXT:    lduh [%i1], %o0
+; V9-NEXT:    mov %i2, %o0
 ; V9-NEXT:    ld [%fp+-8], %f1 ! 4-byte Folded Reload
-; V9-NEXT:    fmuls %f1, %f0, %f0
+; V9-NEXT:    fmuls %f0, %f1, %f0
 ; V9-NEXT:    st %f0, [%fp+-4]
 ; V9-NEXT:    call __truncsfhf2
 ; V9-NEXT:    ld [%fp+-4], %o0
@@ -455,14 +462,15 @@ define void @test_fmul(ptr %p, ptr %q) nounwind {
 ; SPARC64-LABEL: test_fmul:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -192, %sp
+; SPARC64-NEXT:    lduh [%i0], %i2
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    lduh [%i0], %o0
+; SPARC64-NEXT:    lduh [%i1], %o0
 ; SPARC64-NEXT:    st %f0, [%fp+2043] ! 4-byte Folded Spill
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    lduh [%i1], %o0
+; SPARC64-NEXT:    mov %i2, %o0
 ; SPARC64-NEXT:    ld [%fp+2043], %f1 ! 4-byte Folded Reload
 ; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    fmuls %f1, %f0, %f1
+; SPARC64-NEXT:    fmuls %f0, %f1, %f1
 ; SPARC64-NEXT:    sth %o0, [%i0]
 ; SPARC64-NEXT:    ret
 ; SPARC64-NEXT:    restore
diff --git a/llvm/test/CodeGen/SPARC/half.ll b/llvm/test/CodeGen/SPARC/half.ll
index 34e2ceee28fc7..565160149e715 100644
--- a/llvm/test/CodeGen/SPARC/half.ll
+++ b/llvm/test/CodeGen/SPARC/half.ll
@@ -9,43 +9,19 @@
 ; copied from test/CodeGen/X86/half.ll.
 
 define void @store(half %x, ptr %p) nounwind {
-; SPARC32-LABEL: store:
-; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -96, %sp
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    sth %o0, [%i1]
-; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
-;
-; SPARC64-LABEL: store:
-; SPARC64:       ! %bb.0:
-; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    sth %o0, [%i1]
-; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; CHECK-LABEL: store:
+; CHECK:       ! %bb.0:
+; CHECK-NEXT:    retl
+; CHECK-NEXT:    sth %o0, [%o1]
   store half %x, ptr %p
   ret void
 }
 
 define half @return(ptr %p) nounwind {
-; SPARC32-LABEL: return:
-; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -96, %sp
-; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    lduh [%i0], %o0
-; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
-;
-; SPARC64-LABEL: return:
-; SPARC64:       ! %bb.0:
-; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    lduh [%i0], %o0
-; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; CHECK-LABEL: return:
+; CHECK:       ! %bb.0:
+; CHECK-NEXT:    retl
+; CHECK-NEXT:    lduh [%o0], %o0
   %r = load half, ptr %p
   ret half %r
 }
@@ -185,46 +161,19 @@ define void @test_bitcast_to_half(ptr %addr, i16 %in) nounwind {
 }
 
 define half @from_bits(i16 %x) nounwind {
-; SPARC32-LABEL: from_bits:
-; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -96, %sp
-; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
-;
-; SPARC64-LABEL: from_bits:
-; SPARC64:       ! %bb.0:
-; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    srl %i0, 0, %o0
-; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; CHECK-LABEL: from_bits:
+; CHECK:       ! %bb.0:
+; CHECK-NEXT:    retl
+; CHECK-NEXT:    nop
   %res = bitcast i16 %x to half
   ret half %res
 }
 
 define i16 @to_bits(half %x) nounwind {
-; SPARC32-LABEL: to_bits:
-; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -96, %sp
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    sethi 4194240, %i0
-; SPARC32-NEXT:    andn %o0, %i0, %i0
-; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
-;
-; SPARC64-LABEL: to_bits:
-; SPARC64:       ! %bb.0:
-; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    sethi 63, %i0
-; SPARC64-NEXT:    or %i0, 1023, %i0
-; SPARC64-NEXT:    and %o0, %i0, %i0
-; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; CHECK-LABEL: to_bits:
+; CHECK:       ! %bb.0:
+; CHECK-NEXT:    retl
+; CHECK-NEXT:    nop
     %res = bitcast half %x to i16
     ret i16 %res
 }
@@ -694,37 +643,47 @@ define void @test_trunc64_vec4(<4 x double> %a, ptr %p) nounwind {
 define float @test_sitofp_fadd_i32(i32 %a, ptr %b) nounwind {
 ; SPARC32-LABEL: test_sitofp_fadd_i32:
 ; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -104, %sp
-; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    lduh [%i1], %o0
+; SPARC32-NEXT:    save %sp, -112, %sp
+; SPARC32-NEXT:    lduh [%i1], %i1
 ; SPARC32-NEXT:    st %i0, [%fp+-4]
-; SPARC32-NEXT:    ld [%fp+-4], %f1
-; SPARC32-NEXT:    st %f0, [%fp+-12] ! 4-byte Folded Spill
-; SPARC32-NEXT:    fitos %f1, %f0
+; SPARC32-NEXT:    ld [%fp+-4], %f0
+; SPARC32-NEXT:    fitos %f0, %f0
 ; SPARC32-NEXT:    st %f0, [%fp+-8]
 ; SPARC32-NEXT:    call __truncsfhf2
 ; SPARC32-NEXT:    ld [%fp+-8], %o0
 ; SPARC32-NEXT:    call __extendhfsf2
 ; SPARC32-NEXT:    nop
-; SPARC32-NEXT:    ld [%fp+-12], %f1 ! 4-byte Folded Reload
-; SPARC32-NEXT:    fadds %f1, %f0, %f0
+; SPARC32-NEXT:    st %f0, [%fp+-16] ! 4-byte Folded Spill
+; SPARC32-NEXT:    call __extendhfsf2
+; SPARC32-NEXT:    mov %i1, %o0
+; SPARC32-NEXT:    ld [%fp+-16], %f1 ! 4-byte Folded Reload
+; SPARC32-NEXT:    fadds %f0, %f1, %f0
+; SPARC32-NEXT:    st %f0, [%fp+-12]
+; SPARC32-NEXT:    call __truncsfhf2
+; SPARC32-NEXT:    ld [%fp+-12], %o0
+; SPARC32-NEXT:    call __extendhfsf2
+; SPARC32-NEXT:    nop
 ; SPARC32-NEXT:    ret
 ; SPARC32-NEXT:    restore
 ;
 ; SPARC64-LABEL: test_sitofp_fadd_i32:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -192, %sp
-; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    lduh [%i1], %o0
-; SPARC64-NEXT:    st %f0, [%fp+2039] ! 4-byte Folded Spill
+; SPARC64-NEXT:    lduh [%i1], %i1
 ; SPARC64-NEXT:    st %i0, [%fp+2043]
 ; SPARC64-NEXT:    ld [%fp+2043], %f0
 ; SPARC64-NEXT:    call __truncsfhf2
 ; SPARC64-NEXT:    fitos %f0, %f1
 ; SPARC64-NEXT:    call __extendhfsf2
 ; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    st %f0, [%fp+2039] ! 4-byte Folded Spill
+; SPARC64-NEXT:    call __extendhfsf2
+; SPARC64-NEXT:    mov %i1, %o0
 ; SPARC64-NEXT:    ld [%fp+2039], %f1 ! 4-byte Folded Reload
-; SPARC64-NEXT:    fadds %f1, %f0, %f0
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    fadds %f0, %f1, %f1
+; SPARC64-NEXT:    call __extendhfsf2
+; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    ret
 ; SPARC64-NEXT:    restore
   %tmp0 = load half, ptr %b
@@ -738,10 +697,8 @@ define half @PR40273(half) nounwind {
 ; V8-LABEL: PR40273:
 ; V8:       ! %bb.0:
 ; V8-NEXT:    save %sp, -96, %sp
-; V8-NEXT:    call __truncsfhf2
-; V8-NEXT:    mov %i0, %o0
 ; V8-NEXT:    call __extendhfsf2
-; V8-NEXT:    nop
+; V8-NEXT:    mov %i0, %o0
 ; V8-NEXT:    sethi %hi(.LCPI24_0), %i0
 ; V8-NEXT:    ld [%i0+%lo(.LCPI24_0)], %f1
 ; V8-NEXT:    fcmps %f0, %f1
@@ -749,54 +706,40 @@ define half @PR40273(half) nounwind {
 ; V8-NEXT:    fbne .LBB24_2
 ; V8-NEXT:    nop
 ; V8-NEXT:  ! %bb.1:
-; V8-NEXT:    ba .LBB24_3
-; V8-NEXT:    mov %g0, %i0
+; V8-NEXT:    ret
+; V8-NEXT:    restore %g0, %g0, %o0
 ; V8-NEXT:  .LBB24_2:
-; V8-NEXT:    mov 4, %i0
-; V8-NEXT:  .LBB24_3:
-; V8-NEXT:    sethi %hi(.LCPI24_1), %i1
-; V8-NEXT:    add %i1, %lo(.LCPI24_1), %i1
-; V8-NEXT:    ld [%i1+%i0], %f0
+; V8-NEXT:    sethi 15, %i0
 ; V8-NEXT:    ret
 ; V8-NEXT:    restore
 ;
 ; V9-LABEL: PR40273:
 ; V9:       ! %bb.0:
 ; V9-NEXT:    save %sp, -96, %sp
-; V9-NEXT:    call __truncsfhf2
-; V9-NEXT:    mov %i0, %o0
 ; V9-NEXT:    call __extendhfsf2
-; V9-NEXT:    nop
+; V9-NEXT:    mov %i0, %o0
 ; V9-NEXT:    sethi %hi(.LCPI24_0), %i0
 ; V9-NEXT:    ld [%i0+%lo(.LCPI24_0)], %f1
 ; V9-NEXT:    mov %g0, %i0
+; V9-NEXT:    sethi 15, %i1
 ; V9-NEXT:    fcmps %fcc0, %f0, %f1
-; V9-NEXT:    movne %fcc0, 4, %i0
-; V9-NEXT:    sethi %hi(.LCPI24_1), %i1
-; V9-NEXT:    add %i1, %lo(.LCPI24_1), %i1
-; V9-NEXT:    ld [%i1+%i0], %f0
+; V9-NEXT:    movne %fcc0, %i1, %i0
 ; V9-NEXT:    ret
 ; V9-NEXT:    restore
 ;
 ; SPARC64-LABEL: PR40273:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    srl %i0, 0, %o0
 ; SPARC64-NEXT:    sethi %h44(.LCPI24_0), %i0
 ; SPARC64-NEXT:    add %i0, %m44(.LCPI24_0), %i0
 ; SPARC64-NEXT:    sllx %i0, 12, %i0
 ; SPARC64-NEXT:    ld [%i0+%l44(.LCPI24_0)], %f1
 ; SPARC64-NEXT:    mov %g0, %i0
+; SPARC64-NEXT:    sethi 15, %i1
 ; SPARC64-NEXT:    fcmps %fcc0, %f0, %f1
-; SPARC64-NEXT:    movne %fcc0, 4, %i0
-; SPARC64-NEXT:    sethi %h44(.LCPI24_1), %i1
-; SPARC64-NEXT:    add %i1, %m44(.LCPI24_1), %i1
-; SPARC64-NEXT:    sllx %i1, 12, %i1
-; SPARC64-NEXT:    add %i1, %l44(.LCPI24_1), %i1
-; SPARC64-NEXT:    ld [%i1+%i0], %f0
+; SPARC64-NEXT:    movne %fcc0, %i1, %i0
 ; SPARC64-NEXT:    ret
 ; SPARC64-NEXT:    restore
   %2 = fcmp une half %0, 0xH0000
@@ -807,82 +750,28 @@ define half @PR40273(half) nounwind {
 define half @fabs(half %x) nounwind {
 ; SPARC32-LABEL: fabs:
 ; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -96, %sp
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    nop
-; SPARC32-NEXT:    fabss %f0, %f0
-; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
+; SPARC32-NEXT:    sethi 4194272, %o1
+; SPARC32-NEXT:    retl
+; SPARC32-NEXT:    andn %o0, %o1, %o0
 ;
 ; SPARC64-LABEL: fabs:
 ; SPARC64:       ! %bb.0:
-; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    fabss %f0, %f0
-; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; SPARC64-NEXT:    sethi 31, %o1
+; SPARC64-NEXT:    or %o1, 1023, %o1
+; SPARC64-NEXT:    retl
+; SPARC64-NEXT:    and %o0, %o1, %o0
   %a = call half @llvm.fabs.f16(half %x)
   ret half %a
 }
 
 define half @fcopysign(half %x, half %y) nounwind {
-; V8-LABEL: fcopysign:
-; V8:       ! %bb.0:
-; V8-NEXT:    save %sp, -96, %sp
-; V8-NEXT:    call __truncsfhf2
-; V8-NEXT:    mov %i0, %o0
-; V8-NEXT:    call __extendhfsf2
-; V8-NEXT:    nop
-; V8-NEXT:    sethi 2097152, %i0
-; V8-NEXT:    and %i1, %i0, %i0
-; V8-NEXT:    cmp %i0, 0
-; V8-NEXT:    be .LBB26_2
-; V8-NEXT:    fabss %f0, %f0
-; V8-NEXT:  ! %bb.1:
-; V8-NEXT:    fnegs %f0, %f0
-; V8-NEXT:  .LBB26_2:
-; V8-NEXT:    ret
-; V8-NEXT:    restore
-;
-; V9-LABEL: fcopysign:
-; V9:       ! %bb.0:
-; V9-NEXT:    save %sp, -96, %sp
-; V9-NEXT:    call __truncsfhf2
-; V9-NEXT:    mov %i0, %o0
-; V9-NEXT:    call __extendhfsf2
-; V9-NEXT:    nop
-; V9-NEXT:    sethi 2097152, %i0
-; V9-NEXT:    and %i1, %i0, %i0
-; V9-NEXT:    fabss %f0, %f0
-; V9-NEXT:    fnegs %f0, %f1
-; V9-NEXT:    cmp %i0, 0
-; V9-NEXT:    fmovsne %icc, %f1, %f0
-; V9-NEXT:    ret
-; V9-NEXT:    restore
-;
-; SPARC64-LABEL: fcopysign:
-; SPARC64:       ! %bb.0:
-; SPARC64-NEXT:    save %sp, -192, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    st %f3, [%fp+2039]
-; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    ld [%fp+2039], %f1 ! 4-byte Folded Reload
-; SPARC64-NEXT:    st %f1, [%fp+2043]
-; SPARC64-NEXT:    ld [%fp+2043], %i0
-; SPARC64-NEXT:    sethi 2097152, %i1
-; SPARC64-NEXT:    and %i0, %i1, %i0
-; SPARC64-NEXT:    fabss %f0, %f0
-; SPARC64-NEXT:    fnegs %f0, %f1
-; SPARC64-NEXT:    cmp %i0, 0
-; SPARC64-NEXT:    fmovsne %icc, %f1, %f0
-; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; CHECK-LABEL: fcopysign:
+; CHECK:       ! %bb.0:
+; CHECK-NEXT:    sethi 4194272, %o2
+; CHECK-NEXT:    and %o1, %o2, %o1
+; CHECK-NEXT:    andn %o0, %o2, %o0
+; CHECK-NEXT:    retl
+; CHECK-NEXT:    or %o0, %o1, %o0
   %a = call half @llvm.copysign.f16(half %x, half %y)
   ret half %a
 }
diff --git a/llvm/test/CodeGen/SPARC/llvm.sincos.ll b/llvm/test/CodeGen/SPARC/llvm.sincos.ll
index 87b9c8e7ba47b..8d0d50f67e3f5 100644
--- a/llvm/test/CodeGen/SPARC/llvm.sincos.ll
+++ b/llvm/test/CodeGen/SPARC/llvm.sincos.ll
@@ -10,74 +10,84 @@ define { half, half } @test_sincos_f16(half %a) #0 {
 ; SPARC32-LABEL: test_sincos_f16:
 ; SPARC32:       ! %bb.0:
 ; SPARC32-NEXT:    save %sp, -104, %sp
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i0, %o0
 ; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    nop
-; SPARC32-NEXT:    st %f0, [%fp+-4]
-; SPARC32-NEXT:    ld [%fp+-4], %i0
+; SPARC32-NEXT:    mov %i0, %o0
+; SPARC32-NEXT:    st %f0, [%fp+-12]
+; SPARC32-NEXT:    ld [%fp+-12], %i0
 ; SPARC32-NEXT:    call sinf
 ; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    st %f0, [%fp+-8] ! 4-byte Folded Spill
+; SPARC32-NEXT:    st %f0, [%fp+-8]
 ; SPARC32-NEXT:    call cosf
 ; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    fmovs %f0, %f1
-; SPARC32-NEXT:    ld [%fp+-8], %f0 ! 4-byte Folded Reload
+; SPARC32-NEXT:    st %f0, [%fp+-4]
+; SPARC32-NEXT:    call __truncsfhf2
+; SPARC32-NEXT:    ld [%fp+-8], %o0
+; SPARC32-NEXT:    mov %o0, %i0
+; SPARC32-NEXT:    call __truncsfhf2
+; SPARC32-NEXT:    ld [%fp+-4], %o0
 ; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
+; SPARC32-NEXT:    restore %g0, %o0, %o1
 ;
 ; SPARC64-LABEL: test_sincos_f16:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -192, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    st %f0, [%fp+2039] ! 4-byte Folded Spill
+; SPARC64-NEXT:    srl %i0, 0, %o0
+; SPARC64-NEXT:    st %f0, [%fp+2043] ! 4-byte Folded Spill
 ; SPARC64-NEXT:    fmovs %f0, %f1
 ; SPARC64-NEXT:    call sinf
 ; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    st %f0, [%fp+2043] ! 4-byte Folded Spill
+; SPARC64-NEXT:    fmovs %f0, %f1
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    mov %o0, %i0
 ; SPARC64-NEXT:    call cosf
-; SPARC64-NEXT:    ld [%fp+2039], %f1
+; SPARC64-NEXT:    ld [%fp+2043], %f1
 ; SPARC64-NEXT:    fmovs %f0, %f1
-; SPARC64-NEXT:    ld [%fp+2043], %f0 ! 4-byte Folded Reload
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; SPARC64-NEXT:    restore %g0, %o0, %o1
 ;
 ; GNU32-LABEL: test_sincos_f16:
 ; GNU32:       ! %bb.0:
-; GNU32-NEXT:    save %sp, -104, %sp
-; GNU32-NEXT:    call __truncsfhf2
-; GNU32-NEXT:    mov %i0, %o0
+; GNU32-NEXT:    save %sp, -112, %sp
 ; GNU32-NEXT:    call __extendhfsf2
-; GNU32-NEXT:    nop
+; GNU32-NEXT:    mov %i0, %o0
 ; GNU32-NEXT:    st %f0, [%fp+-12]
 ; GNU32-NEXT:    ld [%fp+-12], %o0
 ; GNU32-NEXT:    add %fp, -4, %o1
 ; GNU32-NEXT:    call sincosf
 ; GNU32-NEXT:    add %fp, -8, %o2
 ; GNU32-NEXT:    ld [%fp+-4], %f0
-; GNU32-NEXT:    ld [%fp+-8], %f1
+; GNU32-NEXT:    st %f0, [%fp+-20]
+; GNU32-NEXT:    ld [%fp+-8], %f0
+; GNU32-NEXT:    st %f0, [%fp+-16]
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-20], %o0
+; GNU32-NEXT:    mov %o0, %i0
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-16], %o0
 ; GNU32-NEXT:    ret
-; GNU32-NEXT:    restore
+; GNU32-NEXT:    restore %g0, %o0, %o1
 ;
 ; GNU64-LABEL: test_sincos_f16:
 ; GNU64:       ! %bb.0:
 ; GNU64-NEXT:    save %sp, -192, %sp
-; GNU64-NEXT:    call __truncsfhf2
-; GNU64-NEXT:    nop
 ; GNU64-NEXT:    call __extendhfsf2
-; GNU64-NEXT:    nop
+; GNU64-NEXT:    srl %i0, 0, %o0
 ; GNU64-NEXT:    add %fp, 2043, %o1
 ; GNU64-NEXT:    add %fp, 2039, %o2
 ; GNU64-NEXT:    fmovs %f0, %f1
 ; GNU64-NEXT:    call sincosf
 ; GNU64-NEXT:    nop
-; GNU64-NEXT:    ld [%fp+2043], %f0
+; GNU64-NEXT:    call __truncsfhf2
+; GNU64-NEXT:    ld [%fp+2043], %f1
+; GNU64-NEXT:    mov %o0, %i0
+; GNU64-NEXT:    call __truncsfhf2
 ; GNU64-NEXT:    ld [%fp+2039], %f1
 ; GNU64-NEXT:    ret
-; GNU64-NEXT:    restore
+; GNU64-NEXT:    restore %g0, %o0, %o1
   %result = call { half, half } @llvm.sincos.f16(half %a)
   ret { half, half } %result
 }
@@ -85,61 +95,63 @@ define { half, half } @test_sincos_f16(half %a) #0 {
 define half @test_sincos_f16_only_use_sin(half %a) #0 {
 ; SPARC32-LABEL: test_sincos_f16_only_use_sin:
 ; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -96, %sp
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i0, %o0
+; SPARC32-NEXT:    save %sp, -104, %sp
 ; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    nop
-; SPARC32-NEXT:    st %f0, [%fp+-4]
+; SPARC32-NEXT:    mov %i0, %o0
+; SPARC32-NEXT:    st %f0, [%fp+-8]
 ; SPARC32-NEXT:    call sinf
+; SPARC32-NEXT:    ld [%fp+-8], %o0
+; SPARC32-NEXT:    st %f0, [%fp+-4]
+; SPARC32-NEXT:    call __truncsfhf2
 ; SPARC32-NEXT:    ld [%fp+-4], %o0
 ; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
+; SPARC32-NEXT:    restore %g0, %o0, %o0
 ;
 ; SPARC64-LABEL: test_sincos_f16_only_use_sin:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    srl %i0, 0, %o0
 ; SPARC64-NEXT:    fmovs %f0, %f1
 ; SPARC64-NEXT:    call sinf
 ; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    fmovs %f0, %f1
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; SPARC64-NEXT:    restore %g0, %o0, %o0
 ;
 ; GNU32-LABEL: test_sincos_f16_only_use_sin:
 ; GNU32:       ! %bb.0:
-; GNU32-NEXT:    save %sp, -104, %sp
-; GNU32-NEXT:    call __truncsfhf2
-; GNU32-NEXT:    mov %i0, %o0
+; GNU32-NEXT:    save %sp, -112, %sp
 ; GNU32-NEXT:    call __extendhfsf2
-; GNU32-NEXT:    nop
+; GNU32-NEXT:    mov %i0, %o0
 ; GNU32-NEXT:    st %f0, [%fp+-12]
 ; GNU32-NEXT:    ld [%fp+-12], %o0
 ; GNU32-NEXT:    add %fp, -4, %o1
 ; GNU32-NEXT:    call sincosf
 ; GNU32-NEXT:    add %fp, -8, %o2
 ; GNU32-NEXT:    ld [%fp+-4], %f0
+; GNU32-NEXT:    st %f0, [%fp+-16]
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-16], %o0
 ; GNU32-NEXT:    ret
-; GNU32-NEXT:    restore
+; GNU32-NEXT:    restore %g0, %o0, %o0
 ;
 ; GNU64-LABEL: test_sincos_f16_only_use_sin:
 ; GNU64:       ! %bb.0:
 ; GNU64-NEXT:    save %sp, -192, %sp
-; GNU64-NEXT:    call __truncsfhf2
-; GNU64-NEXT:    nop
 ; GNU64-NEXT:    call __extendhfsf2
-; GNU64-NEXT:    nop
+; GNU64-NEXT:    srl %i0, 0, %o0
 ; GNU64-NEXT:    add %fp, 2043, %o1
 ; GNU64-NEXT:    add %fp, 2039, %o2
 ; GNU64-NEXT:    fmovs %f0, %f1
 ; GNU64-NEXT:    call sincosf
 ; GNU64-NEXT:    nop
-; GNU64-NEXT:    ld [%fp+2043], %f0
+; GNU64-NEXT:    call __truncsfhf2
+; GNU64-NEXT:    ld [%fp+2043], %f1
 ; GNU64-NEXT:    ret
-; GNU64-NEXT:    restore
+; GNU64-NEXT:    restore %g0, %o0, %o0
   %result = call { half, half } @llvm.sincos.f16(half %a)
   %result.0 = extractvalue { half, half } %result, 0
   ret half %result.0
@@ -148,61 +160,63 @@ define half @test_sincos_f16_only_use_sin(half %a) #0 {
 define half @test_sincos_f16_only_use_cos(half %a) #0 {
 ; SPARC32-LABEL: test_sincos_f16_only_use_cos:
 ; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -96, %sp
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i0, %o0
+; SPARC32-NEXT:    save %sp, -104, %sp
 ; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    nop
-; SPARC32-NEXT:    st %f0, [%fp+-4]
+; SPARC32-NEXT:    mov %i0, %o0
+; SPARC32-NEXT:    st %f0, [%fp+-8]
 ; SPARC32-NEXT:    call cosf
+; SPARC32-NEXT:    ld [%fp+-8], %o0
+; SPARC32-NEXT:    st %f0, [%fp+-4]
+; SPARC32-NEXT:    call __truncsfhf2
 ; SPARC32-NEXT:    ld [%fp+-4], %o0
 ; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
+; SPARC32-NEXT:    restore %g0, %o0, %o0
 ;
 ; SPARC64-LABEL: test_sincos_f16_only_use_cos:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -176, %sp
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    srl %i0, 0, %o0
 ; SPARC64-NEXT:    fmovs %f0, %f1
 ; SPARC64-NEXT:    call cosf
 ; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    fmovs %f0, %f1
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; SPARC64-NEXT:    restore %g0, %o0, %o0
 ;
 ; GNU32-LABEL: test_sincos_f16_only_use_cos:
 ; GNU32:       ! %bb.0:
-; GNU32-NEXT:    save %sp, -104, %sp
-; GNU32-NEXT:    call __truncsfhf2
-; GNU32-NEXT:    mov %i0, %o0
+; GNU32-NEXT:    save %sp, -112, %sp
 ; GNU32-NEXT:    call __extendhfsf2
-; GNU32-NEXT:    nop
+; GNU32-NEXT:    mov %i0, %o0
 ; GNU32-NEXT:    st %f0, [%fp+-12]
 ; GNU32-NEXT:    ld [%fp+-12], %o0
 ; GNU32-NEXT:    add %fp, -4, %o1
 ; GNU32-NEXT:    call sincosf
 ; GNU32-NEXT:    add %fp, -8, %o2
 ; GNU32-NEXT:    ld [%fp+-8], %f0
+; GNU32-NEXT:    st %f0, [%fp+-16]
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-16], %o0
 ; GNU32-NEXT:    ret
-; GNU32-NEXT:    restore
+; GNU32-NEXT:    restore %g0, %o0, %o0
 ;
 ; GNU64-LABEL: test_sincos_f16_only_use_cos:
 ; GNU64:       ! %bb.0:
 ; GNU64-NEXT:    save %sp, -192, %sp
-; GNU64-NEXT:    call __truncsfhf2
-; GNU64-NEXT:    nop
 ; GNU64-NEXT:    call __extendhfsf2
-; GNU64-NEXT:    nop
+; GNU64-NEXT:    srl %i0, 0, %o0
 ; GNU64-NEXT:    add %fp, 2043, %o1
 ; GNU64-NEXT:    add %fp, 2039, %o2
 ; GNU64-NEXT:    fmovs %f0, %f1
 ; GNU64-NEXT:    call sincosf
 ; GNU64-NEXT:    nop
-; GNU64-NEXT:    ld [%fp+2039], %f0
+; GNU64-NEXT:    call __truncsfhf2
+; GNU64-NEXT:    ld [%fp+2039], %f1
 ; GNU64-NEXT:    ret
-; GNU64-NEXT:    restore
+; GNU64-NEXT:    restore %g0, %o0, %o0
   %result = call { half, half } @llvm.sincos.f16(half %a)
   %result.1 = extractvalue { half, half } %result, 1
   ret half %result.1
@@ -211,132 +225,157 @@ define half @test_sincos_f16_only_use_cos(half %a) #0 {
 define { <2 x half>, <2 x half> } @test_sincos_v2f16(<2 x half> %a) #0 {
 ; SPARC32-LABEL: test_sincos_v2f16:
 ; SPARC32:       ! %bb.0:
-; SPARC32-NEXT:    save %sp, -112, %sp
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i1, %o0
+; SPARC32-NEXT:    save %sp, -128, %sp
 ; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    nop
-; SPARC32-NEXT:    st %f0, [%fp+-12] ! 4-byte Folded Spill
-; SPARC32-NEXT:    call __truncsfhf2
-; SPARC32-NEXT:    mov %i0, %o0
+; SPARC32-NEXT:    mov %i1, %o0
+; SPARC32-NEXT:    st %f0, [%fp+-28]
 ; SPARC32-NEXT:    call __extendhfsf2
-; SPARC32-NEXT:    nop
-; SPARC32-NEXT:    st %f0, [%fp+-8]
-; SPARC32-NEXT:    ld [%fp+-12], %f0 ! 4-byte Folded Reload
-; SPARC32-NEXT:    st %f0, [%fp+-4]
-; SPARC32-NEXT:    ld [%fp+-8], %i0
-; SPARC32-NEXT:    call sinf
 ; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    st %f0, [%fp+-12] ! 4-byte Folded Spill
-; SPARC32-NEXT:    ld [%fp+-4], %i1
-; SPARC32-NEXT:    call sinf
-; SPARC32-NEXT:    mov %i1, %o0
-; SPARC32-NEXT:    st %f0, [%fp+-16] ! 4-byte Folded Spill
+; SPARC32-NEXT:    st %f0, [%fp+-32]
+; SPARC32-NEXT:    ld [%fp+-28], %i0
 ; SPARC32-NEXT:    call cosf
 ; SPARC32-NEXT:    mov %i0, %o0
-; SPARC32-NEXT:    st %f0, [%fp+-20] ! 4-byte Folded Spill
+; SPARC32-NEXT:    st %f0, [%fp+-20]
+; SPARC32-NEXT:    ld [%fp+-32], %i1
 ; SPARC32-NEXT:    call cosf
 ; SPARC32-NEXT:    mov %i1, %o0
-; SPARC32-NEXT:    fmovs %f0, %f3
-; SPARC32-NEXT:    ld [%fp+-12], %f0 ! 4-byte Folded Reload
-; SPARC32-NEXT:    ld [%fp+-16], %f1 ! 4-byte Folded Reload
-; SPARC32-NEXT:    ld [%fp+-20], %f2 ! 4-byte Folded Reload
+; SPARC32-NEXT:    st %f0, [%fp+-12]
+; SPARC32-NEXT:    call sinf
+; SPARC32-NEXT:    mov %i0, %o0
+; SPARC32-NEXT:    st %f0, [%fp+-24]
+; SPARC32-NEXT:    call sinf
+; SPARC32-NEXT:    mov %i1, %o0
+; SPARC32-NEXT:    st %f0, [%fp+-16]
+; SPARC32-NEXT:    call __truncsfhf2
+; SPARC32-NEXT:    ld [%fp+-20], %o0
+; SPARC32-NEXT:    sethi 63, %i0
+; SPARC32-NEXT:    or %i0, 1023, %i0
+; SPARC32-NEXT:    and %o0, %i0, %i4
+; SPARC32-NEXT:    call __truncsfhf2
+; SPARC32-NEXT:    ld [%fp+-12], %o0
+; SPARC32-NEXT:    and %o0, %i0, %i2
+; SPARC32-NEXT:    call __truncsfhf2
+; SPARC32-NEXT:    ld [%fp+-24], %o0
+; SPARC32-NEXT:    and %o0, %i0, %i1
+; SPARC32-NEXT:    call __truncsfhf2
+; SPARC32-NEXT:    ld [%fp+-16], %o0
+; SPARC32-NEXT:    and %o0, %i0, %g2
+; SPARC32-NEXT:    mov %g2, %i0
+; SPARC32-NEXT:    ! kill: def $i2 killed $i2 killed $i2_i3
 ; SPARC32-NEXT:    ret
-; SPARC32-NEXT:    restore
+; SPARC32-NEXT:    restore %g0, %i4, %o3
 ;
 ; SPARC64-LABEL: test_sincos_v2f16:
 ; SPARC64:       ! %bb.0:
 ; SPARC64-NEXT:    save %sp, -192, %sp
-; SPARC64-NEXT:    st %f1, [%fp+2039] ! 4-byte Folded Spill
-; SPARC64-NEXT:    fmovs %f3, %f1
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    srl %i0, 0, %o0
 ; SPARC64-NEXT:    st %f0, [%fp+2043] ! 4-byte Folded Spill
-; SPARC64-NEXT:    call __truncsfhf2
-; SPARC64-NEXT:    ld [%fp+2039], %f1
-; SPARC64-NEXT:    call __extendhfsf2
-; SPARC64-NEXT:    nop
-; SPARC64-NEXT:    st %f0, [%fp+2031] ! 4-byte Folded Spill
 ; SPARC64-NEXT:    fmovs %f0, %f1
 ; SPARC64-NEXT:    call sinf
 ; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    fmovs %f0, %f1
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    mov %o0, %i0
+; SPARC64-NEXT:    call __extendhfsf2
+; SPARC64-NEXT:    srl %i1, 0, %o0
 ; SPARC64-NEXT:    st %f0, [%fp+2039] ! 4-byte Folded Spill
+; SPARC64-NEXT:    fmovs %f0, %f1
 ; SPARC64-NEXT:    call sinf
-; SPARC64-NEXT:    ld [%fp+2043], %f1
-; SPARC64-NEXT:    st %f0, [%fp+2035] ! 4-byte Folded Spill
-; SPARC64-NEXT:    call cosf
-; SPARC64-NEXT:    ld [%fp+2031], %f1
-; SPARC64-NEXT:    st %f0, [%fp+2031] ! 4-byte Folded Spill
+; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    fmovs %f0, %f1
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    mov %o0, %i1
 ; SPARC64-NEXT:    call cosf
 ; SPARC64-NEXT:    ld [%fp+2043], %f1
-; SPARC64-NEXT:    fmovs %f0, %f3
-; SPARC64-NEXT:    ld [%fp+2039], %f0 ! 4-byte Folded Reload
-; SPARC64-NEXT:    ld [%fp+2035], %f1 ! 4-byte Folded Reload
-; SPARC64-NEXT:    ld [%fp+2031], %f2 ! 4-byte Folded Reload
+; SPARC64-NEXT:    fmovs %f0, %f1
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
+; SPARC64-NEXT:    mov %o0, %i2
+; SPARC64-NEXT:    call cosf
+; SPARC64-NEXT:    ld [%fp+2039], %f1
+; SPARC64-NEXT:    fmovs %f0, %f1
+; SPARC64-NEXT:    call __truncsfhf2
+; SPARC64-NEXT:    nop
 ; SPARC64-NEXT:    ret
-; SPARC64-NEXT:    restore
+; SPARC64-NEXT:    restore %g0, %o0, %o3
 ;
 ; GNU32-LABEL: test_sincos_v2f16:
 ; GNU32:       ! %bb.0:
-; GNU32-NEXT:    save %sp, -120, %sp
-; GNU32-NEXT:    call __truncsfhf2
-; GNU32-NEXT:    mov %i1, %o0
-; GNU32-NEXT:    call __extendhfsf2
-; GNU32-NEXT:    nop
-; GNU32-NEXT:    st %f0, [%fp+-28] ! 4-byte Folded Spill
-; GNU32-NEXT:    call __truncsfhf2
-; GNU32-NEXT:    mov %i0, %o0
+; GNU32-NEXT:    save %sp, -144, %sp
 ; GNU32-NEXT:    call __extendhfsf2
-; GNU32-NEXT:    nop
-; GNU32-NEXT:    st %f0, [%fp+-20]
-; GNU32-NEXT:    ld [%fp+-20], %o0
+; GNU32-NEXT:    mov %i1, %o0
+; GNU32-NEXT:    st %f0, [%fp+-32]
+; GNU32-NEXT:    ld [%fp+-32], %o0
 ; GNU32-NEXT:    add %fp, -12, %o1
 ; GNU32-NEXT:    call sincosf
 ; GNU32-NEXT:    add %fp, -16, %o2
-; GNU32-NEXT:    ld [%fp+-28], %f0 ! 4-byte Folded Reload
-; GNU32-NEXT:    st %f0, [%fp+-24]
-; GNU32-NEXT:    ld [%fp+-24], %o0
-; GNU32-NEXT:    add %fp, -4, %o1
+; GNU32-NEXT:    call __extendhfsf2
+; GNU32-NEXT:    mov %i0, %o0
+; GNU32-NEXT:    st %f0, [%fp+-28]
+; GNU32-NEXT:    ld [%fp+-28], %o0
+; GNU32-NEXT:    add %fp, -20, %o1
 ; GNU32-NEXT:    call sincosf
-; GNU32-NEXT:    add %fp, -8, %o2
+; GNU32-NEXT:    add %fp, -24, %o2
+; GNU32-NEXT:    ld [%fp+-16], %f0
+; GNU32-NEXT:    st %f0, [%fp+-44]
+; GNU32-NEXT:    ld [%fp+-24], %f0
+; GNU32-NEXT:    st %f0, [%fp+-36]
 ; GNU32-NEXT:    ld [%fp+-12], %f0
-; GNU32-NEXT:    ld [%fp+-4], %f1
-; GNU32-NEXT:    ld [%fp+-16], %f2
-; GNU32-NEXT:    ld [%fp+-8], %f3
+; GNU32-NEXT:    st %f0, [%fp+-48]
+; GNU32-NEXT:    ld [%fp+-20], %f0
+; GNU32-NEXT:    st %f0, [%fp+-40]
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-44], %o0
+; GNU32-NEXT:    sethi 63, %i0
+; GNU32-NEXT:    or %i0, 1023, %i0
+; GNU32-NEXT:    and %o0, %i0, %i4
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-36], %o0
+; GNU32-NEXT:    and %o0, %i0, %i2
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-48], %o0
+; GNU32-NEXT:    and %o0, %i0, %i1
+; GNU32-NEXT:    call __truncsfhf2
+; GNU32-NEXT:    ld [%fp+-40], %o0
+; GNU32-NEXT:    and %o0, %i0, %g2
+; GNU32-NEXT:    mov %g2, %i0
+; GNU32-NEXT:    ! kill: def $i2 killed $i2 killed $i2_i3
 ; GNU32-NEXT:    ret
-; GNU32-NEXT:    restore
+; GNU32-NEXT:    restore %g0, %i4, %o3
 ;
 ; GNU64-LABEL: test_sincos_v2f16:
 ; GNU64:       ! %bb.0:
-; GNU64-NEXT:    save %sp, -208, %sp
-; GNU64-NEXT:    st %f1, [%fp+2023] ! 4-byte Folded Spill
-; GNU64-NEXT:    fmovs %f3, %f1
-; GNU64-NEXT:    call __truncsfhf2
-; GNU64-NEXT:    nop
-; GNU64-NEXT:    call __extendhfsf2
-; GNU64-NEXT:    nop
-; GNU64-NEXT:    st %f0, [%fp+2027] ! 4-byte Folded Spill
-; GNU64-NEXT:    call __truncsfhf2
-; GNU64-NEXT:    ld [%fp+2023], %f1
+; GNU64-NEXT:    save %sp, -192, %sp
 ; GNU64-NEXT:    call __extendhfsf2
-; GNU64-NEXT:    nop
+; GNU64-NEXT:    srl %i0, 0, %o0
 ; GNU64-NEXT:    add %fp, 2035, %o1
 ; GNU64-NEXT:    add %fp, 2031, %o2
 ; GNU64-NEXT:    fmovs %f0, %f1
 ; GNU64-NEXT:    call sincosf
 ; GNU64-NEXT:    nop
+; GNU64-NEXT:    call __extendhfsf2
+; GNU64-NEXT:    srl %i1, 0, %o0
 ; GNU64-NEXT:    add %fp, 2043, %o1
 ; GNU64-NEXT:    add %fp, 2039, %o2
+; GNU64-NEXT:    fmovs %f0, %f1
 ; GNU64-NEXT:    call sincosf
-; GNU64-NEXT:    ld [%fp+2027], %f1
-; GNU64-NEXT:    ld [%fp+2035], %f0
+; GNU64-NEXT:    nop
+; GNU64-NEXT:    call __truncsfhf2
+; GNU64-NEXT:    ld [%fp+2035], %f1
+; GNU64-NEXT:    mov %o0, %i0
+; GNU64-NEXT:    call __truncsfhf2
 ; GNU64-NEXT:    ld [%fp+2043], %f1
-; GNU64-NEXT:    ld [%fp+2031], %f2
-; GNU64-NEXT:    ld [%fp+2039], %f3
+; GNU64-NEXT:    mov %o0, %i1
+; GNU64-NEXT:    call __truncsfhf2
+; GNU64-NEXT:    ld [%fp+2031], %f1
+; GNU64-NEXT:    mov %o0, %i2
+; GNU64-NEXT:    call __truncsfhf2
+; GNU64-NEXT:    ld [%fp+2039], %f1
 ; GNU64-NEXT:    ret
-; GNU64-NEXT:    restore
+; GNU64-NEXT:    restore %g0, %o0, %o3
   %result = call { <2 x half>, <2 x half> } @llvm.sincos.v2f16(<2 x half> %a)
   ret { <2 x half>, <2 x half> } %result
 }