use separate case handler for f and improve/simplify tests

Author: MaskRay

clang/lib/Basic/Targets/Mips.h

@@ -237,15 +237,14 @@ class LLVM_LIBRARY_VISIBILITY MipsTargetInfo : public TargetInfo {
     case 'r': // CPU registers.
     case 'd': // Equivalent to "r" unless generating MIPS16 code.
     case 'y': // Equivalent to "r", backward compatibility only.
-    case 'f': // floating-point registers.
-      if (*Name == 'f' && FloatABI == SoftFloat)
-        return false;
-      LLVM_FALLTHROUGH;
     case 'c': // $25 for indirect jumps
     case 'l': // lo register
     case 'x': // hilo register pair
       Info.setAllowsRegister();
       return true;
+    case 'f': // floating-point registers.
+      Info.setAllowsRegister();
+      return FloatABI != SoftFloat;
     case 'I': // Signed 16-bit constant
     case 'J': // Integer 0
     case 'K': // Unsigned 16-bit constant

clang/test/CodeGen/Mips/inline-asm-constraints.c

@@ -1,18 +1,11 @@
-// RUN: %clang_cc1 %s -triple mips -target-feature +soft-float \
-// RUN:            -DSOFT_FLOAT_CONSTRAINT_R \
-// RUN:            -DFLOAT=float -emit-llvm -o - \
-// RUN:      | FileCheck %s --check-prefix SOFT_FLOAT_CONSTRAINT_R_SINGLE
+// RUN: %clang_cc1 -emit-llvm -triple mips -target-feature +soft-float %s -o - | FileCheck %s --check-prefix=SOFT_FLOAT
 
-// RUN: %clang_cc1 %s -triple mips -target-feature +soft-float \
-// RUN:            -DSOFT_FLOAT_CONSTRAINT_R \
-// RUN:            -DFLOAT=double -emit-llvm -o - \
-// RUN:      | FileCheck %s --check-prefix SOFT_FLOAT_CONSTRAINT_R_DOUBLE
+// SOFT_FLOAT: call void asm sideeffect "", "r,~{$1}"(float %1)
+void read_float(float *p) {
+  __asm__("" ::"r"(*p));
+}
 
-#ifdef SOFT_FLOAT_CONSTRAINT_R
-// SOFT_FLOAT_CONSTRAINT_R_SINGLE: call void asm sideeffect "", "r,~{$1}"(float %2) #1, !srcloc !2
-// SOFT_FLOAT_CONSTRAINT_R_DOUBLE: call void asm sideeffect "", "r,~{$1}"(double %2) #1, !srcloc !2
-void read_float(FLOAT* p) {
-    FLOAT result = *p;
-    __asm__("" ::"r"(result));
+// SOFT_FLOAT: call void asm sideeffect "", "r,~{$1}"(double %1)
+void read_double(double *p) {
+  __asm__("" :: "r"(*p));
 }
-#endif // SOFT_FLOAT_CONSTRAINT_R

clang/test/Sema/inline-asm-validate-mips.c

@@ -1,8 +1,9 @@
-// RUN: %clang_cc1 -triple mips -target-feature +soft-float -DSOFT_FLOAT_NO_CONSTRAINT_F -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple mips64 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple mips64 -target-feature +soft-float -fsyntax-only -verify=softfloat %s
 
-#ifdef SOFT_FLOAT_NO_CONSTRAINT_F
-void read_float(float p) {
-    float result = p;
-    __asm__("" ::"f"(result)); // expected-error{{invalid input constraint 'f' in asm}}
+// expected-no-diagnostics
+
+void test_f(float p) {
+  float result = p;
+  __asm__("" :: "f"(result)); // softfloat-error{{invalid input constraint 'f' in asm}}
 }
-#endif // SOFT_FLOAT_NO_CONSTRAINT_F

llvm/test/CodeGen/Mips/inlineasm-constraints-softfloat.ll

@@ -1,23 +1,46 @@
-; RUN: llc  -march=mips < %s | FileCheck %s --check-prefix=MIPS32
-; RUN: llc  -march=mips64 < %s | FileCheck %s --check-prefix=MIPS64
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
+; RUN: llc -march=mips < %s | FileCheck %s --check-prefix=MIPS32
+; RUN: llc -march=mips64 < %s | FileCheck %s --check-prefix=MIPS64
 
 define dso_local void @read_double(ptr nocapture noundef readonly %0) local_unnamed_addr #0 {
-  %2 = load double, ptr %0, align 8
 ; MIPS32-LABEL: read_double:
-; MIPS32: lw      $2, 4($4)
-; MIPS32-NEXT: lw      $3, 0($4)
+; MIPS32:       # %bb.0:
+; MIPS32-NEXT:    lw $2, 4($4)
+; MIPS32-NEXT:    lw $3, 0($4)
+; MIPS32-NEXT:    #APP
+; MIPS32-NEXT:    #NO_APP
+; MIPS32-NEXT:    jr $ra
+; MIPS32-NEXT:    nop
+;
 ; MIPS64-LABEL: read_double:
-; MIPS64: ld      $2, 0($4)
+; MIPS64:       # %bb.0:
+; MIPS64-NEXT:    ld $2, 0($4)
+; MIPS64-NEXT:    #APP
+; MIPS64-NEXT:    #NO_APP
+; MIPS64-NEXT:    jr $ra
+; MIPS64-NEXT:    nop
+  %2 = load double, ptr %0, align 8
   tail call void asm sideeffect "", "r,~{$1}"(double %2)
   ret void
 }
 
 define dso_local void @read_float(ptr nocapture noundef readonly %0) local_unnamed_addr #0 {
-  %2 = load float, ptr %0, align 8
 ; MIPS32-LABEL: read_float:
-; MIPS32: lw      $2, 0($4)
+; MIPS32:       # %bb.0:
+; MIPS32-NEXT:    lw $2, 0($4)
+; MIPS32-NEXT:    #APP
+; MIPS32-NEXT:    #NO_APP
+; MIPS32-NEXT:    jr $ra
+; MIPS32-NEXT:    nop
+;
 ; MIPS64-LABEL: read_float:
-; MIPS64: lw      $2, 0($4)
+; MIPS64:       # %bb.0:
+; MIPS64-NEXT:    lw $2, 0($4)
+; MIPS64-NEXT:    #APP
+; MIPS64-NEXT:    #NO_APP
+; MIPS64-NEXT:    jr $ra
+; MIPS64-NEXT:    nop
+  %2 = load float, ptr %0, align 8
   tail call void asm sideeffect "", "r,~{$1}"(float %2)
   ret void
 }