Change tests triple from arm--- to armv7--

Author: Varnike

llvm/lib/Target/ARM/ARMISelLowering.cpp

@@ -1291,12 +1291,16 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM_,
     if (!Subtarget->hasFPARMv8Base() || !Subtarget->hasFP64()) {
       setOperationAction(ISD::FP16_TO_FP, MVT::f64, Expand);
       setOperationAction(ISD::FP_TO_FP16, MVT::f64, Expand);
+      setOperationAction(ISD::STRICT_FP16_TO_FP, MVT::f64, LibCall);
+      setOperationAction(ISD::STRICT_FP_TO_FP16, MVT::f64, LibCall);
     }
 
     // fp16 is a special v7 extension that adds f16 <-> f32 conversions.
     if (!Subtarget->hasFP16()) {
       setOperationAction(ISD::FP16_TO_FP, MVT::f32, Expand);
       setOperationAction(ISD::FP_TO_FP16, MVT::f32, Expand);
+      setOperationAction(ISD::STRICT_FP16_TO_FP, MVT::f32, LibCall);
+      setOperationAction(ISD::STRICT_FP_TO_FP16, MVT::f32, LibCall);
     }
 
     // Strict floating-point comparisons need custom lowering.

llvm/test/CodeGen/ARM/strict-fp-ops.ll

@@ -1,13 +1,13 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
-; RUN: llc -mtriple arm-- -mattr=+vfp4 %s -o - | FileCheck %s
+; RUN: llc -mtriple armv7-- -mattr=+vfp4 %s -o - | FileCheck %s
 
 
 ; Div whose result is unused should be removed unless we have strict exceptions
 
 define void @unused_div(float %x, float %y) {
 ; CHECK-LABEL: unused_div:
 ; CHECK:       @ %bb.0: @ %entry
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add = fdiv float %x, %y
   ret void
@@ -19,7 +19,7 @@ define void @unused_div_fpexcept_strict(float %x, float %y) #0 {
 ; CHECK-NEXT:    vmov s0, r1
 ; CHECK-NEXT:    vmov s2, r0
 ; CHECK-NEXT:    vdiv.f32 s0, s2, s0
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add = call float @llvm.experimental.constrained.fdiv.f32(float %x, float %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   ret void
@@ -28,7 +28,7 @@ entry:
 define void @unused_div_round_dynamic(float %x, float %y) #0 {
 ; CHECK-LABEL: unused_div_round_dynamic:
 ; CHECK:       @ %bb.0: @ %entry
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add = call float @llvm.experimental.constrained.fdiv.f32(float %x, float %y, metadata !"round.dynamic", metadata !"fpexcept.ignore") #0
   ret void
@@ -44,9 +44,10 @@ define float @add_twice(float %x, float %y, i32 %n) {
 ; CHECK-NEXT:    cmp r2, #0
 ; CHECK-NEXT:    vmov s2, r0
 ; CHECK-NEXT:    vadd.f32 s0, s2, s0
-; CHECK-NEXT:    vmulne.f32 s0, s0, s0
-; CHECK-NEXT:    vmov r0, s0
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    vmul.f32 s2, s0, s0
+; CHECK-NEXT:    vmoveq.f32 s2, s0
+; CHECK-NEXT:    vmov r0, s2
+; CHECK-NEXT:    bx lr
 entry:
   %add = fadd float %x, %y
   %tobool.not = icmp eq i32 %n, 0
@@ -72,7 +73,7 @@ define float @add_twice_fpexcept_strict(float %x, float %y, i32 %n) #0 {
 ; CHECK-NEXT:    vaddne.f32 s2, s4, s2
 ; CHECK-NEXT:    vmulne.f32 s0, s0, s2
 ; CHECK-NEXT:    vmov r0, s0
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add = call float @llvm.experimental.constrained.fadd.f32(float %x, float %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   %tobool.not = icmp eq i32 %n, 0
@@ -97,7 +98,7 @@ define float @add_twice_round_dynamic(float %x, float %y, i32 %n) #0 {
 ; CHECK-NEXT:    vadd.f32 s0, s2, s0
 ; CHECK-NEXT:    vmulne.f32 s0, s0, s0
 ; CHECK-NEXT:    vmov r0, s0
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add = call float @llvm.experimental.constrained.fadd.f32(float %x, float %y, metadata !"round.dynamic", metadata !"fpexcept.ignore") #0
   %tobool.not = icmp eq i32 %n, 0
@@ -131,7 +132,7 @@ define float @set_rounding(float %x, float %y) {
 ; CHECK-NEXT:    vmrs r1, fpscr
 ; CHECK-NEXT:    bic r1, r1, #12582912
 ; CHECK-NEXT:    vmsr fpscr, r1
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add1 = fadd float %x, %y
   call void @llvm.set.rounding(i32 0)
@@ -156,7 +157,7 @@ define float @set_rounding_fpexcept_strict(float %x, float %y) #0 {
 ; CHECK-NEXT:    vmsr fpscr, r0
 ; CHECK-NEXT:    vsub.f32 s0, s4, s0
 ; CHECK-NEXT:    vmov r0, s0
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add1 = call float @llvm.experimental.constrained.fadd.f32(float %x, float %y, metadata !"round.tonearest", metadata !"fpexcept.strict") #0
   call void @llvm.set.rounding(i32 0) #0
@@ -181,7 +182,7 @@ define float @set_rounding_round_dynamic(float %x, float %y) #0 {
 ; CHECK-NEXT:    vmsr fpscr, r0
 ; CHECK-NEXT:    vsub.f32 s0, s4, s0
 ; CHECK-NEXT:    vmov r0, s0
-; CHECK-NEXT:    mov pc, lr
+; CHECK-NEXT:    bx lr
 entry:
   %add1 = call float @llvm.experimental.constrained.fadd.f32(float %x, float %y, metadata !"round.dynamic", metadata !"fpexcept.ignore") #0
   call void @llvm.set.rounding(i32 0) #0