diff options
author | Craig Topper <craig.topper@sifive.com> | 2021-12-14 09:17:50 -0800 |
---|---|---|
committer | Craig Topper <craig.topper@sifive.com> | 2021-12-14 09:30:13 -0800 |
commit | df44aaa50e3632f3528850278bdec1c4a45890b1 (patch) | |
tree | d75ce69df436d60379ec9f9d02b3b1405775c1c6 | |
parent | 0005efd455c490d72a3c927edf4f9bd293dfbde2 (diff) | |
download | llvm-df44aaa50e3632f3528850278bdec1c4a45890b1.tar.gz |
[RISCV] Add a table for extension implications.
This a proof of concept for a suggestion I proposed in D108694.
Reviewed By: eopXD
Differential Revision: https://reviews.llvm.org/D115668
-rw-r--r-- | llvm/lib/Support/RISCVISAInfo.cpp | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/llvm/lib/Support/RISCVISAInfo.cpp b/llvm/lib/Support/RISCVISAInfo.cpp index 378e6644d0d7..bce6ea63870d 100644 --- a/llvm/lib/Support/RISCVISAInfo.cpp +++ b/llvm/lib/Support/RISCVISAInfo.cpp @@ -695,11 +695,28 @@ Error RISCVISAInfo::checkDependency() { return Error::success(); } +static const char *ImpliedExtsV[] = {"zvlsseg"}; +static const char *ImpliedExtsZfh[] = {"zfhmin"}; + +struct ImpliedExtsEntry { + StringLiteral Name; + ArrayRef<const char *> Exts; + + bool operator<(const ImpliedExtsEntry &Other) const { + return Name < Other.Name; + } + + bool operator<(StringRef Other) const { return Name < Other; } +}; + +static constexpr ImpliedExtsEntry ImpliedExts[] = { + {"v", ImpliedExtsV}, + {"zfh", ImpliedExtsZfh}, +}; + void RISCVISAInfo::updateImplication() { bool HasE = Exts.count("e") == 1; bool HasI = Exts.count("i") == 1; - bool HasV = Exts.count("v") == 1; - bool HasZfh = Exts.count("zfh") == 1; // If not in e extension and i extension does not exist, i extension is // implied @@ -708,14 +725,15 @@ void RISCVISAInfo::updateImplication() { addExtension("i", Version->Major, Version->Minor); } - if (HasV) { - auto Version = findDefaultVersion("zvlsseg"); - addExtension("zvlsseg", Version->Major, Version->Minor); - } - - if (HasZfh) { - auto Version = findDefaultVersion("zfhmin"); - addExtension("zfhmin", Version->Major, Version->Minor); + assert(llvm::is_sorted(ImpliedExts) && "Table not sorted by Name"); + for (auto &Ext : Exts) { + auto I = llvm::lower_bound(ImpliedExts, Ext.first); + if (I != std::end(ImpliedExts) && I->Name == Ext.first) { + for (auto &ImpliedExt : I->Exts) { + auto Version = findDefaultVersion(ImpliedExt); + addExtension(ImpliedExt, Version->Major, Version->Minor); + } + } } } |