Skip to content

[RISCV] Detect duplicate extensions in parseNormalizedArchString. #91416

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 8, 2024
Merged

[RISCV] Detect duplicate extensions in parseNormalizedArchString. #91416

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
2 changes: 1 addition & 1 deletion llvm/include/llvm/TargetParser/RISCVISAInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class RISCVISAInfo {

RISCVISAUtils::OrderedExtensionMap Exts;

void addExtension(StringRef ExtName, RISCVISAUtils::ExtensionVersion Version);
bool addExtension(StringRef ExtName, RISCVISAUtils::ExtensionVersion Version);

Error checkDependency();

Expand Down
8 changes: 5 additions & 3 deletions llvm/lib/TargetParser/RISCVISAInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ findDefaultVersion(StringRef ExtName) {
return std::nullopt;
}

void RISCVISAInfo::addExtension(StringRef ExtName,
bool RISCVISAInfo::addExtension(StringRef ExtName,
RISCVISAUtils::ExtensionVersion Version) {
Exts[ExtName.str()] = Version;
return Exts.emplace(ExtName, Version).second;
}

static StringRef getExtensionTypeDesc(StringRef Ext) {
Expand Down Expand Up @@ -492,7 +492,9 @@ RISCVISAInfo::parseNormalizedArchString(StringRef Arch) {
"'" + Twine(ExtName[0]) +
"' must be followed by a letter");

ISAInfo->addExtension(ExtName, {MajorVersion, MinorVersion});
if (!ISAInfo->addExtension(ExtName, {MajorVersion, MinorVersion}))
return createStringError(errc::invalid_argument,
"duplicate extension '" + ExtName + "'");
}
ISAInfo->updateImpliedLengths();
return std::move(ISAInfo);
Expand Down
8 changes: 8 additions & 0 deletions llvm/unittests/TargetParser/RISCVISAInfoTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ TEST(ParseNormalizedArchString, RejectsBadX) {
}
}

TEST(ParseNormalizedArchString, DuplicateExtension) {
for (StringRef Input : {"rv64i2p0_a2p0_a1p0"}) {
EXPECT_EQ(
toString(RISCVISAInfo::parseNormalizedArchString(Input).takeError()),
"duplicate extension 'a'");
}
}

TEST(ParseNormalizedArchString, AcceptsValidBaseISAsAndSetsXLen) {
auto MaybeRV32I = RISCVISAInfo::parseNormalizedArchString("rv32i2p0");
ASSERT_THAT_EXPECTED(MaybeRV32I, Succeeded());
Expand Down