This is an archive of the discontinued LLVM Phabricator instance.

Differential D145809

[RISCV] Error if F and Zfinx extensions are specified together.
ClosedPublic

Authored by craig.topper on Mar 10 2023, 9:44 AM.

Details

Reviewers
reames
jrtc27
kito-cheng
asb
Commits
rG2800d57e124a: [RISCV] Error if F and Zfinx extensions are specified together.

Diff Detail

Event Timeline

craig.topper created this revision.Mar 10 2023, 9:44 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 10 2023, 9:44 AM
Herald added subscribers: luke, VincentWu, vkmr and 25 others. · View Herald Transcript
craig.topper requested review of this revision.Mar 10 2023, 9:44 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMar 10 2023, 9:44 AM
Herald added subscribers: cfe-commits, • pcwang-thead, eopXD, MaskRay. · View Herald Transcript
asb added a comment.Mar 10 2023, 9:53 AM

The change itself looks good to me, but we have the same issue for D and Zdinx as well.

craig.topper added a comment.Mar 10 2023, 10:07 AM
In D145809#4185320, @asb wrote:

The change itself looks good to me, but we have the same issue for D and Zdinx as well.

D implies F and Zdinx implies Zfinx so it should still trigger this error. I can add a test?

craig.topper updated this revision to Diff 504203.Mar 10 2023, 10:12 AM

Add test for D and Zdinx which will produce the same error as F and Zfinx.

asb accepted this revision.Mar 10 2023, 10:28 AM

LGTM, thanks!

This revision is now accepted and ready to land.Mar 10 2023, 10:28 AM
This revision was landed with ongoing or failed builds.Mar 10 2023, 11:26 AM
Closed by commit rG2800d57e124a: [RISCV] Error if F and Zfinx extensions are specified together. (authored by craig.topper). · Explain Why
This revision was automatically updated to reflect the committed changes.
craig.topper added a commit: rG2800d57e124a: [RISCV] Error if F and Zfinx extensions are specified together..
Harbormaster completed remote builds in B218718: Diff 504203.Mar 10 2023, 1:34 PM

Revision Contents

PathSize
clang/
test/
Driver/
10 lines
llvm/
lib/
Support/
4 lines

Diff 504227

clang/test/Driver/riscv-arch.c

Show First 20 Lines • Show All 577 Lines • ▼ Show 20 Lines
// RUN: %clang -target riscv32-unknown-elf -march=rv32i_zmmul2p0 -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32i_zmmul2p0 -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZMMUL-BADVERS %s // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZMMUL-BADVERS %s
// RV32-ZMMUL-BADVERS: error: invalid arch name 'rv32i_zmmul2p0' // RV32-ZMMUL-BADVERS: error: invalid arch name 'rv32i_zmmul2p0'
// RV32-ZMMUL-BADVERS: unsupported version number 2.0 for extension // RV32-ZMMUL-BADVERS: unsupported version number 2.0 for extension
// RUN: %clang -target riscv32-unknown-elf -march=rv32i_zmmul1p0 -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32i_zmmul1p0 -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZMMUL-GOODVERS %s // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-ZMMUL-GOODVERS %s
// RV32-ZMMUL-GOODVERS: "-target-feature" "+zmmul" // RV32-ZMMUL-GOODVERS: "-target-feature" "+zmmul"
// RUN: %clang --target=riscv32-unknown-elf -march=rv32ifzfinx -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-F-ZFINX-ER %s
// RV32-F-ZFINX-ER: error: invalid arch name 'rv32ifzfinx',
// RV32-F-ZFINX-ER: 'f' and 'zfinx' extensions are incompatible
// RUN: %clang --target=riscv32-unknown-elf -march=rv32idzdinx -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-D-ZDINX-ER %s
// RV32-D-ZDINX-ER: error: invalid arch name 'rv32idzdinx',
// RV32-D-ZFINX-ER: 'f' and 'zfinx' extensions are incompatible

llvm/lib/Support/RISCVISAInfo.cpp

Show First 20 Lines • Show All 833 Lines • ▼ Show 20 LinesError RISCVISAInfo::checkDependency() {
bool HasZve64d = Exts.count("zve64d") != 0; bool HasZve64d = Exts.count("zve64d") != 0;
bool HasZvl = MinVLen != 0; bool HasZvl = MinVLen != 0;
if (HasE && !IsRv32) if (HasE && !IsRv32)
return createStringError( return createStringError(
errc::invalid_argument, errc::invalid_argument,
"standard user-level extension 'e' requires 'rv32'"); "standard user-level extension 'e' requires 'rv32'");
if (HasF && HasZfinx)
return createStringError(errc::invalid_argument,
"'f' and 'zfinx' extensions are incompatible");
if (HasZve32f && !HasF && !HasZfinx) if (HasZve32f && !HasF && !HasZfinx)
return createStringError( return createStringError(
errc::invalid_argument, errc::invalid_argument,
"zve32f requires f or zfinx extension to also be specified"); "zve32f requires f or zfinx extension to also be specified");
if (HasZve64d && !HasD && !HasZdinx) if (HasZve64d && !HasD && !HasZdinx)
return createStringError( return createStringError(
errc::invalid_argument, errc::invalid_argument,
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines