This is an archive of the discontinued LLVM Phabricator instance.

Differential D103878

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

Authored by benshi001 on Jun 8 2021, 2:43 AM.

Details

Reviewers
craig.topper
asb
luismarques
MaskRay
Commits
rGb0eb3919835a: [clang][RISCV][test] Add more tests of the -mabi and -march options
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.

Diff Detail

Event Timeline

benshi001 created this revision.Jun 8 2021, 2:43 AM
Herald added subscribers: vkmr, frasercrmck, evandro and 24 others. · View Herald TranscriptJun 8 2021, 2:43 AM
benshi001 requested review of this revision.Jun 8 2021, 2:43 AM
Herald added a subscriber: MaskRay. · View Herald TranscriptJun 8 2021, 2:43 AM
benshi001 retitled this revision from [RISCV][clang] to [RISCV][clang] Improve deduction of default ABI for some special archs.Jun 8 2021, 2:48 AM
benshi001 edited the summary of this revision. (Show Details)
benshi001 added reviewers: craig.topper, asb, luismarques, MaskRay.
benshi001 set the repository for this revision to rG LLVM Github Monorepo.
Herald added a project: Restricted Project. · View Herald TranscriptJun 8 2021, 2:48 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B108164: Diff 350542.Jun 8 2021, 3:17 AM
benshi001 updated this revision to Diff 350755.Jun 8 2021, 6:29 PM
benshi001 retitled this revision from [RISCV][clang] Improve deduction of default ABI for some special archs to [clang][RISCV][test] Add more tests of the -mabi and -march options.
benshi001 edited the summary of this revision. (Show Details)

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.

Harbormaster completed remote builds in B108317: Diff 350755.Jun 8 2021, 7:17 PM
MaskRay added a comment.Jun 8 2021, 10:18 PM

How do the new tests provide additional coverage?

clang/test/Driver/riscv-arch.c
45

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 updated this revision to Diff 350788.Jun 8 2021, 11:23 PM
benshi001 marked an inline comment as done.
benshi001 added inline comments.
clang/test/Driver/riscv-arch.c
45

Thanks for your suggestion.

benshi001 marked an inline comment as done.Jun 8 2021, 11:24 PM
benshi001 added a comment.Jun 8 2021, 11:30 PM
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.
Harbormaster completed remote builds in B108343: Diff 350788.Jun 9 2021, 12:39 AM
benshi001 updated this revision to Diff 350828.Jun 9 2021, 2:31 AM
Harbormaster completed remote builds in B108369: Diff 350828.Jun 9 2021, 3:10 AM
luismarques added a comment.Jun 9 2021, 2:13 PM
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 edited the summary of this revision. (Show Details)Jun 9 2021, 4:51 PM
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 accepted this revision.Jun 9 2021, 5:00 PM

LGTM.

clang/test/Driver/riscv-arch.c
122
// CHECK-LP64F:      "-target-feature" "+m"
// CHECK-LP64F-SAME: {{^}} "-target-feature" "+a"
This revision is now accepted and ready to land.Jun 9 2021, 5:00 PM
Closed by commit rGb0eb3919835a: [clang][RISCV][test] Add more tests of the -mabi and -march options (authored by benshi001). · Explain WhyJun 9 2021, 6:14 PM
This revision was automatically updated to reflect the committed changes.
benshi001 added a commit: rGb0eb3919835a: [clang][RISCV][test] Add more tests of the -mabi and -march options.
benshi001 marked an inline comment as done.Jun 9 2021, 6:15 PM
• pcwang-thead mentioned this in D125947: [RISCV] Add default ABI for archs with only F extension.May 18 2022, 11:18 PM

Revision Contents

PathSize
clang/
test/
Driver/
25 lines
54 lines

Diff 351025

clang/test/Driver/riscv-abi.c

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

clang/test/Driver/riscv-arch.c

Show All 33 Lines
// RUN: %clang -target riscv32-unknown-elf -march=rv32iafdc -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32iafdc -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv32-unknown-elf -march=rv32g -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32g -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv32-unknown-elf -march=rv32gc -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32gc -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv32-unknown-elf -mabi=ilp32 -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-ILP32 %s
// CHECK-ILP32: "-target-feature" "+m"
MaskRayUnsubmitted
Done
ReplyInline Actions

I suggest the style used in linux-cross.cpp

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

MaskRay: I suggest the style used in linux-cross.cpp Just using `-SAME` cannot detect unrelated strings…
benshi001AuthorUnsubmitted
Done
ReplyInline Actions

Thanks for your suggestion.

benshi001: Thanks for your suggestion.
// CHECK-ILP32-SAME: {{^}} "-target-feature" "+a"
// CHECK-ILP32-SAME: {{^}} "-target-feature" "+f"
// CHECK-ILP32-SAME: {{^}} "-target-feature" "+d"
// CHECK-ILP32-SAME: {{^}} "-target-feature" "+c"
// RUN: %clang -target riscv32-unknown-elf -mabi=ilp32f -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-ILP32F %s
// CHECK-ILP32F: "-target-feature" "+m"
// CHECK-ILP32F-SAME: {{^}} "-target-feature" "+a"
// CHECK-ILP32F-SAME: {{^}} "-target-feature" "+f"
// CHECK-ILP32F-SAME: {{^}} "-target-feature" "+d"
// CHECK-ILP32F-SAME: {{^}} "-target-feature" "+c"
// RUN: %clang -target riscv32-unknown-elf -mabi=ilp32d -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-ILP32D %s
// CHECK-ILP32D: "-target-feature" "+m"
// CHECK-ILP32D-SAME: {{^}} "-target-feature" "+a"
// CHECK-ILP32D-SAME: {{^}} "-target-feature" "+f"
// CHECK-ILP32D-SAME: {{^}} "-target-feature" "+d"
// CHECK-ILP32D-SAME: {{^}} "-target-feature" "+c"
// RUN: %clang -target riscv64-unknown-elf -march=rv64i -### %s \ // RUN: %clang -target riscv64-unknown-elf -march=rv64i -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv64-unknown-elf -march=rv64im -### %s \ // RUN: %clang -target riscv64-unknown-elf -march=rv64im -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv64-unknown-elf -march=rv64ima -### %s \ // RUN: %clang -target riscv64-unknown-elf -march=rv64ima -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv64-unknown-elf -march=rv64imaf -### %s \ // RUN: %clang -target riscv64-unknown-elf -march=rv64imaf -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
Show All 25 Lines
// RUN: %clang -target riscv64-unknown-elf -march=rv64iafdc -### %s \ // RUN: %clang -target riscv64-unknown-elf -march=rv64iafdc -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv64-unknown-elf -march=rv64g -### %s \ // RUN: %clang -target riscv64-unknown-elf -march=rv64g -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv64-unknown-elf -march=rv64gc -### %s \ // RUN: %clang -target riscv64-unknown-elf -march=rv64gc -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck %s // RUN: -fsyntax-only 2>&1 | FileCheck %s
// RUN: %clang -target riscv64-unknown-elf -mabi=lp64 -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-LP64 %s
// CHECK-LP64: "-target-feature" "+m"
// CHECK-LP64-SAME: {{^}} "-target-feature" "+a"
// CHECK-LP64-SAME: {{^}} "-target-feature" "+f"
// CHECK-LP64-SAME: {{^}} "-target-feature" "+d"
// CHECK-LP64-SAME: {{^}} "-target-feature" "+c"
// RUN: %clang -target riscv64-unknown-elf -mabi=lp64f -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-LP64F %s
// CHECK-LP64F: "-target-feature" "+m"
MaskRayUnsubmitted
Done
ReplyInline Actions
// CHECK-LP64F:      "-target-feature" "+m"
// CHECK-LP64F-SAME: {{^}} "-target-feature" "+a"
MaskRay: ``` // CHECK-LP64F: "-target-feature" "+m" // CHECK-LP64F-SAME: {{^}} "-target-feature"…
// CHECK-LP64F-SAME: {{^}} "-target-feature" "+a"
// CHECK-LP64F-SAME: {{^}} "-target-feature" "+f"
// CHECK-LP64F-SAME: {{^}} "-target-feature" "+d"
// CHECK-LP64F-SAME: {{^}} "-target-feature" "+c"
// RUN: %clang -target riscv64-unknown-elf -mabi=lp64d -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=CHECK-LP64D %s
// CHECK-LP64D: "-target-feature" "+m"
// CHECK-LP64D-SAME: {{^}} "-target-feature" "+a"
// CHECK-LP64D-SAME: {{^}} "-target-feature" "+f"
// CHECK-LP64D-SAME: {{^}} "-target-feature" "+d"
// CHECK-LP64D-SAME: {{^}} "-target-feature" "+c"
// CHECK-NOT: error: invalid arch name ' // CHECK-NOT: error: invalid arch name '
// RUN: %clang -target riscv32-unknown-elf -march=rv32 -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32 -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32 %s // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32 %s
// RV32: error: invalid arch name 'rv32' // RV32: error: invalid arch name 'rv32'
// RUN: %clang -target riscv32-unknown-elf -march=rv32m -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32m -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32M %s // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32M %s
▲ Show 20 Lines • Show All 346 Lines • Show Last 20 Lines