[clang][RISCV][test] Add more tests of the -mabi and -march options

[benshi001]

Summary

1. There is no tests for mabi=ilp32e, and my patch covers that.
2. The tests in riscv-abi.c will show default ABI changes for special archs in the future, especially the arch with the F but without the D extension.
3. The tests in riscv-arch.c will show default arch changes for abi=ilp32, which is rv32imacfd currently, but it is better to be rv32imac. And it is also better for abi=ilp32f defaults to arch=imacf.

[benshi001]

How to formulate the default abi and arch is still under discussion.

https://github.com/riscv/riscv-toolchain-conventions/issues/13

But the tests can be added first, for contrast of future changes.

[MaskRay]

How do the new tests provide additional coverage?

clang/test/Driver/riscv-arch.c

45 ↗

(On Diff #350755)

I suggest the style used in linux-cross.cpp

Just using -SAME cannot detect unrelated strings between "-target-feature" "+m" and "-target-feature" "+f"

[benshi001]

clang/test/Driver/riscv-arch.c

45 ↗

(On Diff #350755)

Thanks for your suggestion.

[benshi001]

In D103878#2807034, @MaskRay wrote:

How do the new tests provide additional coverage?

For these tests,

1. there is no tests for mabi=ilp32e, and my patch covers that.
2. the tests in riscv-abi.c will show default abi changes for special archs, especially for the arch with F but without D extension, in the future.
3. the tests in riscv-arch.c will show default arch changes for abi=ilp32, which is rv32imacfd now, and it is better to be rv32imac. for abi=ilp32f it is better arch=imacf than current imacfd.

[luismarques]

In D103878#2807118, @benshi001 wrote:

1. there is no tests for mabi=ilp32e, and my patch covers that.
2. the tests in riscv-abi.c will show default abi changes for special archs, especially for the arch with F but without D extension, in the future.
3. the tests in riscv-arch.c will show default arch changes for abi=ilp32, which is rv32imacfd now, and it is better to be rv32imac. for abi=ilp32f it is better arch=imacf than current imacfd.

That sounds like a good description to add to the patch summary / commit message!

[benshi001]

In D103878#2809033, @luismarques wrote:

In D103878#2807118, @benshi001 wrote:

1. there is no tests for mabi=ilp32e, and my patch covers that.
2. the tests in riscv-abi.c will show default abi changes for special archs, especially for the arch with F but without D extension, in the future.
3. the tests in riscv-arch.c will show default arch changes for abi=ilp32, which is rv32imacfd now, and it is better to be rv32imac. for abi=ilp32f it is better arch=imacf than current imacfd.

That sounds like a good description to add to the patch summary / commit message!

Done. Thanks.

[MaskRay]

LGTM.

clang/test/Driver/riscv-arch.c

122 ↗

(On Diff #350828)

// CHECK-LP64F:      "-target-feature" "+m"
// CHECK-LP64F-SAME: {{^}} "-target-feature" "+a"

clang/lib/Driver/ToolChains/Arch/RISCV.cpp

StringRef riscv::getRISCVABI(const ArgList &Args, const llvm::Triple &Triple) {
   // 1. If `-mabi=` is specified, use it.
   if (const Arg *A = Args.getLastArg(options::OPT_mabi_EQ))
     return A->getValue();
 
   // 2. Choose a default based on the target architecture.
   //
   // rv32g | rv32*d -> ilp32d
   // rv32e -> ilp32e
+  // rv32*f (excluding zbf/d, including zfh) -> ilp32f
   // rv32* -> ilp32
   // rv64g | rv64*d -> lp64d
+  // rv64*f (excluding zbf/d, including zfh) -> lp64f
   // rv64* -> lp64
   StringRef MArch = getRISCVArch(Args, Triple);
 
   if (MArch.startswith_lower("rv32")) {
     // FIXME: parse `March` to find `D` extension properly
     if (MArch.substr(4).contains_lower("d") || MArch.startswith_lower("rv32g"))
       return "ilp32d";
     else if (MArch.startswith_lower("rv32e"))
       return "ilp32e";
+    else if (MArch.substr(4).contains_lower("f") &&
+             !MArch.substr(4).contains_lower("d") &&
+             !MArch.substr(4).contains_lower("zbf"))
+      return "ilp32f";
     else
       return "ilp32";
   } else if (MArch.startswith_lower("rv64")) {
     // FIXME: parse `March` to find `D` extension properly
     if (MArch.substr(4).contains_lower("d") || MArch.startswith_lower("rv64g"))
       return "lp64d";
+    else if (MArch.substr(4).contains_lower("f") &&
+             !MArch.substr(4).contains_lower("d") &&
+             !MArch.substr(4).contains_lower("zbf"))
+      return "lp64f";
     else
       return "lp64";
   }
 
   // 3. Choose a default based on the triple
   //
   // We deviate from GCC's defaults here:
   // - On `riscv{XLEN}-unknown-elf` we use the integer calling convention only.

clang/test/Driver/riscv-abi.c

 // RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ILP32 %s
 // RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -mabi=ilp32 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ILP32 %s
+// RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -march=rv32imac 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-ILP32 %s
 // RUN: %clang -target riscv32-unknown-elf -x assembler %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ILP32 %s
 // RUN: %clang -target riscv32-unknown-elf -x assembler %s -### -o %t.o \
 // RUN:   -mabi=ilp32 2>&1 | FileCheck -check-prefix=CHECK-ILP32 %s
 
 // CHECK-ILP32: "-target-abi" "ilp32"
 
+// RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -mabi=ilp32e 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-ILP32E %s
+// RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -march=rv32e 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-ILP32E %s
+
+// CHECK-ILP32E: "-target-abi" "ilp32e"
+
 // RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -march=rv32if -mabi=ilp32f 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ILP32F %s
+// RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -march=rv32if 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-ILP32F %s
 
 // CHECK-ILP32F: "-target-abi" "ilp32f"
 
 // RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -march=rv32ifd -mabi=ilp32d 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ILP32D %s
+// RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -march=rv32ifd 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-ILP32D %s
+// RUN: %clang -target riscv32-unknown-elf %s -### -o %t.o -march=rv32gc 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-ILP32D %s
 // RUN: %clang -target riscv32-unknown-linux-gnu %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ILP32D %s
 // RUN: %clang -target riscv32-unknown-linux-gnu -x assembler %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-ILP32D %s
 
 // CHECK-ILP32D: "-target-abi" "ilp32d"
 
 // RUN: not %clang -target riscv32-unknown-elf %s -o %t.o -mabi=lp64 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-RV32-LP64 %s
 
 // CHECK-RV32-LP64: error: unknown target ABI 'lp64'
 
 // RUN: %clang -target riscv64-unknown-elf %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-LP64 %s
 // RUN: %clang -target riscv64-unknown-elf %s -### -o %t.o -mabi=lp64 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-LP64 %s
+// RUN: %clang -target riscv64-unknown-elf %s -### -o %t.o -march=rv64m 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-LP64 %s
 // RUN: %clang -target riscv64-unknown-elf -x assembler %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-LP64  %s
 // RUN: %clang -target riscv64-unknown-elf -x assembler %s -### -o %t.o \
 // RUN:   -mabi=lp64 2>&1 | FileCheck -check-prefix=CHECK-LP64 %s
 
 // CHECK-LP64: "-target-abi" "lp64"
 
 // RUN:  %clang -target riscv64-unknown-elf %s -### -o %t.o -march=rv64f -mabi=lp64f 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-LP64F %s
+// RUN:  %clang -target riscv64-unknown-elf %s -### -o %t.o -march=rv64f 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-LP64F %s
 
 // CHECK-LP64F: "-target-abi" "lp64f"
 
 // RUN: %clang -target riscv64-unknown-elf %s -### -o %t.o -march=rv64d -mabi=lp64d 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-LP64D %s
+// RUN: %clang -target riscv64-unknown-elf %s -### -o %t.o -march=rv64d 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-LP64D %s
+// RUN: %clang -target riscv64-unknown-elf %s -### -o %t.o -march=rv64g 2>&1 \
+// RUN:   | FileCheck -check-prefix=CHECK-LP64D %s
 // RUN: %clang -target riscv64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-LP64D %s
 // RUN: %clang -target riscv64-unknown-linux-gnu -x assembler %s -### -o %t.o 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-LP64D  %s
 
 // CHECK-LP64D: "-target-abi" "lp64d"
 
 // RUN: not %clang -target riscv64-unknown-elf %s -o %t.o -mabi=ilp32 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHECK-RV64-ILP32 %s
 
 // CHECK-RV64-ILP32: error: unknown target ABI 'ilp32'

clang/test/Driver/riscv-cpus.c

 // MCPU-ABI-SIFIVE-U54: "-target-feature" "+c" "-target-feature" "+64bit"
 // MCPU-ABI-SIFIVE-U54: "-target-abi" "lp64"
 
 // mcpu with default march
 // RUN: %clang -target riscv64 -### -c %s 2>&1 -mcpu=sifive-e76 | FileCheck -check-prefix=MCPU-SIFIVE-E76 %s
 // MCPU-SIFIVE-E76: "-nostdsysteminc" "-target-cpu" "sifive-e76"
 // MCPU-SIFIVE-E76: "-target-feature" "+m" "-target-feature" "+a" "-target-feature" "+f"
 // MCPU-SIFIVE-E76: "-target-feature" "+c"
-// MCPU-SIFIVE-E76: "-target-abi" "ilp32"
+// MCPU-SIFIVE-E76: "-target-abi" "ilp32f"
 
 // mcpu with mabi option
 // RUN: %clang -target riscv64 -### -c %s 2>&1 -mcpu=sifive-u74 -mabi=lp64 | FileCheck -check-prefix=MCPU-ABI-SIFIVE-U74 %s
 // MCPU-ABI-SIFIVE-U74: "-nostdsysteminc" "-target-cpu" "sifive-u74"
 // MCPU-ABI-SIFIVE-U74: "-target-feature" "+m" "-target-feature" "+a" "-target-feature" "+f" "-target-feature" "+d"
 // MCPU-ABI-SIFIVE-U74: "-target-feature" "+c" "-target-feature" "+64bit"
 // MCPU-ABI-SIFIVE-U74: "-target-abi" "lp64"