This is an archive of the discontinued LLVM Phabricator instance.

Differential D94930

[RISCV] Add support for Zvamo/Zvlsseg to driver
ClosedPublic

Authored by simoncook on Jan 18 2021, 12:28 PM.

Details

Reviewers
asb
luismarques
kito-cheng
HsiangKai
Commits
rGafd483e57d16: [RISCV] Add support for Zvamo/Zvlsseg to driver

Diff Detail

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
Arch/
2 lines
test/
Driver/
38 lines

Diff 317408

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

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
// If the extension is supported as experimental, return the version of that // If the extension is supported as experimental, return the version of that
// extension that the compiler currently supports. // extension that the compiler currently supports.
static Optional<RISCVExtensionVersion> static Optional<RISCVExtensionVersion>
isExperimentalExtension(StringRef Ext) { isExperimentalExtension(StringRef Ext) {
if (Ext == "b" || Ext == "zbb" || Ext == "zbc" || Ext == "zbe" || if (Ext == "b" || Ext == "zbb" || Ext == "zbc" || Ext == "zbe" ||
Ext == "zbf" || Ext == "zbm" || Ext == "zbp" || Ext == "zbr" || Ext == "zbf" || Ext == "zbm" || Ext == "zbp" || Ext == "zbr" ||
Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc") Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc")
return RISCVExtensionVersion{"0", "92"}; return RISCVExtensionVersion{"0", "92"};
if (Ext == "v") if (Ext == "v" || Ext == "zvamo" || Ext == "zvlsseg")
return RISCVExtensionVersion{"0", "9"}; return RISCVExtensionVersion{"0", "9"};
if (Ext == "zfh") if (Ext == "zfh")
return RISCVExtensionVersion{"0", "1"}; return RISCVExtensionVersion{"0", "1"};
return None; return None;
} }
static bool isSupportedExtension(StringRef Ext) { static bool isSupportedExtension(StringRef Ext) {
// LLVM supports "z" extensions which are marked as experimental. // LLVM supports "z" extensions which are marked as experimental.
▲ Show 20 Lines • Show All 634 Lines • Show Last 20 Lines

clang/test/Driver/riscv-arch.c

Show First 20 Lines • Show All 386 Lines • ▼ Show 20 Lines
// RUN: %clang -target riscv32-unknown-elf -march=rv32izfh -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32izfh -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZFH-NOFLAG %s // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZFH-NOFLAG %s
// RV32-EXPERIMENTAL-ZFH-NOFLAG: error: invalid arch name 'rv32izfh' // RV32-EXPERIMENTAL-ZFH-NOFLAG: error: invalid arch name 'rv32izfh'
// RV32-EXPERIMENTAL-ZFH-NOFLAG: requires '-menable-experimental-extensions' // RV32-EXPERIMENTAL-ZFH-NOFLAG: requires '-menable-experimental-extensions'
// RUN: %clang -target riscv32-unknown-elf -march=rv32izfh0p1 -menable-experimental-extensions -### %s \ // RUN: %clang -target riscv32-unknown-elf -march=rv32izfh0p1 -menable-experimental-extensions -### %s \
// RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZFH %s // RUN: -fsyntax-only 2>&1 | FileCheck -check-prefix=RV32-EXPERIMENTAL-ZFH %s
// RV32-EXPERIMENTAL-ZFH: "-target-feature" "+experimental-zfh" // RV32-EXPERIMENTAL-ZFH: "-target-feature" "+experimental-zfh"
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvamo -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVAMO-NOFLAG %s
// RV32-EXPERIMENTAL-ZVAMO-NOFLAG: error: invalid arch name 'rv32izvamo'
// RV32-EXPERIMENTAL-ZVAMO-NOFLAG: requires '-menable-experimental-extensions'
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvamo -menable-experimental-extensions -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVAMO-NOVERS %s
// RV32-EXPERIMENTAL-ZVAMO-NOVERS: error: invalid arch name 'rv32izvamo'
// RV32-EXPERIMENTAL-ZVAMO-NOVERS: experimental extension requires explicit version number
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvamo0p1 -menable-experimental-extensions -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVAMO-BADVERS %s
// RV32-EXPERIMENTAL-ZVAMO-BADVERS: error: invalid arch name 'rv32izvamo0p1'
// RV32-EXPERIMENTAL-ZVAMO-BADVERS: unsupported version number 0.1 for experimental extension
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvamo0p9 -menable-experimental-extensions -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVAMO-GOODVERS %s
// RV32-EXPERIMENTAL-ZVAMO-GOODVERS: "-target-feature" "+experimental-zvamo"
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvlsseg -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVLSSEG-NOFLAG %s
// RV32-EXPERIMENTAL-ZVLSSEG-NOFLAG: error: invalid arch name 'rv32izvlsseg'
// RV32-EXPERIMENTAL-ZVLSSEG-NOFLAG: requires '-menable-experimental-extensions'
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvlsseg -menable-experimental-extensions -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVLSSEG-NOVERS %s
// RV32-EXPERIMENTAL-ZVLSSEG-NOVERS: error: invalid arch name 'rv32izvlsseg'
// RV32-EXPERIMENTAL-ZVLSSEG-NOVERS: experimental extension requires explicit version number
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvlsseg0p1 -menable-experimental-extensions -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVLSSEG-BADVERS %s
// RV32-EXPERIMENTAL-ZVLSSEG-BADVERS: error: invalid arch name 'rv32izvlsseg0p1'
// RV32-EXPERIMENTAL-ZVLSSEG-BADVERS: unsupported version number 0.1 for experimental extension
// RUN: %clang -target riscv32-unknown-elf -march=rv32izvlsseg0p9 -menable-experimental-extensions -### %s -c 2>&1 | \
// RUN: FileCheck -check-prefix=RV32-EXPERIMENTAL-ZVLSSEG-GOODVERS %s
// RV32-EXPERIMENTAL-ZVLSSEG-GOODVERS: "-target-feature" "+experimental-zvlsseg"