This is an archive of the discontinued LLVM Phabricator instance.

Differential D118334

[NFC][RISCV] Bundle up ISAInfo updates and checks
ClosedPublic

Authored by eopXD on Jan 27 2022, 1:20 AM.

Details

Reviewers
kito-cheng
craig.topper
Commits
rG5f856c5b308e: [NFC][RISCV] Bundle up ISAInfo updates and checks

Diff Detail

Event Timeline

eopXD created this revision.Jan 27 2022, 1:20 AM
Herald added subscribers: VincentWu, luke957, achieveartificialintelligence and 26 others. · View Herald TranscriptJan 27 2022, 1:20 AM
eopXD requested review of this revision.Jan 27 2022, 1:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 27 2022, 1:20 AM
Herald added subscribers: llvm-commits, • pcwang-thead, MaskRay. · View Herald Transcript
eopXD updated this revision to Diff 403547.Jan 27 2022, 1:38 AM

Update code. Try to encapsulate more.

Harbormaster completed remote builds in B145953: Diff 403547.Jan 27 2022, 9:27 AM
eopXD updated this revision to Diff 403882.Jan 27 2022, 9:36 PM

Rebase again, the test failure in past diff seems to be caused by other commits.

Harbormaster completed remote builds in B146191: Diff 403882.Jan 27 2022, 10:01 PM
eopXD updated this revision to Diff 403952.Jan 28 2022, 3:29 AM

Rebase.

Harbormaster completed remote builds in B146233: Diff 403952.Jan 28 2022, 5:04 AM
kito-cheng accepted this revision.Jan 28 2022, 5:30 AM

LGTM

This revision is now accepted and ready to land.Jan 28 2022, 5:30 AM
This revision was landed with ongoing or failed builds.Jan 28 2022, 7:13 AM
Closed by commit rG5f856c5b308e: [NFC][RISCV] Bundle up ISAInfo updates and checks (authored by eopXD). · Explain Why
This revision was automatically updated to reflect the committed changes.
eopXD added a commit: rG5f856c5b308e: [NFC][RISCV] Bundle up ISAInfo updates and checks.

Revision Contents

PathSize
llvm/
include/
llvm/
Support/
2 lines
lib/
Support/
23 lines

Diff 403545

llvm/include/llvm/Support/RISCVISAInfo.h

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Lines void addExtension(StringRef ExtName, unsigned MajorVersion,
unsigned MinorVersion); unsigned MinorVersion);
Error checkDependency(); Error checkDependency();
void updateImplication(); void updateImplication();
void updateFLen(); void updateFLen();
void updateMinVLen(); void updateMinVLen();
void updateMaxELen(); void updateMaxELen();
Error postProcessAndChecking();
}; };
} // namespace llvm } // namespace llvm
#endif #endif

llvm/lib/Support/RISCVISAInfo.cpp

Show First 20 Lines • Show All 455 Lines • ▼ Show 20 Lines for (auto &Feature : Features) {
if (Add) if (Add)
ISAInfo->addExtension(ExtName, ExtensionInfoIterator->Version.Major, ISAInfo->addExtension(ExtName, ExtensionInfoIterator->Version.Major,
ExtensionInfoIterator->Version.Minor); ExtensionInfoIterator->Version.Minor);
else else
ISAInfo->Exts.erase(ExtName.str()); ISAInfo->Exts.erase(ExtName.str());
} }
ISAInfo->updateImplication(); if (Error Result = ISAInfo->postProcessAndChecking())
ISAInfo->updateFLen();
ISAInfo->updateMinVLen();
ISAInfo->updateMaxELen();
if (Error Result = ISAInfo->checkDependency())
return std::move(Result); return std::move(Result);
return std::move(ISAInfo); return std::move(ISAInfo);
} }
llvm::Expected<std::unique_ptr<RISCVISAInfo>> llvm::Expected<std::unique_ptr<RISCVISAInfo>>
RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension, RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
bool ExperimentalExtensionVersionCheck) { bool ExperimentalExtensionVersionCheck) {
▲ Show 20 Lines • Show All 203 Lines • ▼ Show 20 LinesRISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
for (auto Ext : AllExts) { for (auto Ext : AllExts) {
if (!isSupportedExtension(Ext)) { if (!isSupportedExtension(Ext)) {
StringRef Desc = getExtensionTypeDesc(getExtensionType(Ext)); StringRef Desc = getExtensionTypeDesc(getExtensionType(Ext));
return createStringError(errc::invalid_argument, "unsupported %s '%s'", return createStringError(errc::invalid_argument, "unsupported %s '%s'",
Desc.str().c_str(), Ext.str().c_str()); Desc.str().c_str(), Ext.str().c_str());
} }
} }
ISAInfo->updateImplication(); if (Error Result = ISAInfo->postProcessAndChecking())
ISAInfo->updateFLen();
ISAInfo->updateMinVLen();
ISAInfo->updateMaxELen();
if (Error Result = ISAInfo->checkDependency())
return std::move(Result); return std::move(Result);
return std::move(ISAInfo); return std::move(ISAInfo);
} }
Error RISCVISAInfo::checkDependency() { Error RISCVISAInfo::checkDependency() {
bool IsRv32 = XLen == 32; bool IsRv32 = XLen == 32;
bool HasE = Exts.count("e") == 1; bool HasE = Exts.count("e") == 1;
▲ Show 20 Lines • Show All 211 Lines • ▼ Show 20 Lines if (ExtName == "i") // i is not recognized in clang -cc1
continue; continue;
std::string Feature = isExperimentalExtension(ExtName) std::string Feature = isExperimentalExtension(ExtName)
? "+experimental-" + ExtName ? "+experimental-" + ExtName
: "+" + ExtName; : "+" + ExtName;
FeatureVector.push_back(Feature); FeatureVector.push_back(Feature);
} }
return FeatureVector; return FeatureVector;
} }
Error RISCVISAInfo::postProcessAndChecking() {
updateImplication();
updateFLen();
updateMinVLen();
updateMaxELen();
return checkDependency();
}