Skip to content

[RISCV] Use binary search to look up supported profiles. #90767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2024
Merged

[RISCV] Use binary search to look up supported profiles. #90767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions llvm/lib/TargetParser/RISCVISAInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,14 +598,14 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
XLen = 64;
} else {
// Try parsing as a profile.
const auto *FoundProfile =
llvm::find_if(SupportedProfiles, [Arch](const RISCVProfile &Profile) {
return Arch.starts_with(Profile.Name);
});

if (FoundProfile != std::end(SupportedProfiles)) {
std::string NewArch = FoundProfile->MArch.str();
StringRef ArchWithoutProfile = Arch.drop_front(FoundProfile->Name.size());
auto I = llvm::upper_bound(SupportedProfiles, Arch,
[](StringRef Arch, const RISCVProfile &Profile) {
return Arch < Profile.Name;
});

if (I != std::begin(SupportedProfiles) && Arch.starts_with((--I)->Name)) {
std::string NewArch = I->MArch.str();
StringRef ArchWithoutProfile = Arch.drop_front(I->Name.size());
if (!ArchWithoutProfile.empty()) {
if (ArchWithoutProfile.front() != '_')
return createStringError(
Expand Down
5 changes: 4 additions & 1 deletion llvm/utils/TableGen/RISCVTargetDefEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ static void emitRISCVProfiles(RecordKeeper &Records, raw_ostream &OS) {

OS << "static constexpr RISCVProfile SupportedProfiles[] = {\n";

for (const Record *Rec : Records.getAllDerivedDefinitions("RISCVProfile")) {
auto Profiles = Records.getAllDerivedDefinitions("RISCVProfile");
llvm::sort(Profiles, LessRecordFieldName());

for (const Record *Rec : Profiles) {
OS.indent(4) << "{\"" << Rec->getValueAsString("Name") << "\",\"";
printMArch(OS, Rec->getValueAsListOfDefs("Implies"));
OS << "\"},\n";
Expand Down