Skip to content

Commit 98763df

Browse files
fixup! use std::set::count; use zicfilp as experimental extension
1 parent aab0d37 commit 98763df

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

llvm/lib/TargetParser/RISCVISAInfo.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void RISCVISAInfo::printEnabledExtensions(
124124
RISCVISAUtils::OrderedExtensionMap FullExtMap;
125125
RISCVISAUtils::OrderedExtensionMap ExtMap;
126126
for (const auto &E : SupportedExtensions)
127-
if (EnabledFeatureNames.find(E.Name) != EnabledFeatureNames.end()) {
127+
if (EnabledFeatureNames.count(E.Name) != 0) {
128128
FullExtMap[E.Name] = {E.Version.Major, E.Version.Minor};
129129
ExtMap[E.Name] = {E.Version.Major, E.Version.Minor};
130130
}
@@ -138,8 +138,7 @@ void RISCVISAInfo::printEnabledExtensions(
138138
ExtMap.clear();
139139
for (const auto &E : SupportedExperimentalExtensions) {
140140
StringRef Name(E.Name);
141-
if (EnabledFeatureNames.find("experimental-" + Name.str()) !=
142-
EnabledFeatureNames.end()) {
141+
if (EnabledFeatureNames.count("experimental-" + Name.str()) != 0) {
143142
FullExtMap[E.Name] = {E.Version.Major, E.Version.Minor};
144143
ExtMap[E.Name] = {E.Version.Major, E.Version.Minor};
145144
}

llvm/unittests/TargetParser/RISCVISAInfoTest.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,20 +1078,20 @@ R"(Extensions enabled for the given RISC-V target
10781078
i 2.1 'I' (Base Integer Instruction Set)
10791079
10801080
Experimental extensions
1081-
ztso 0.1 'Ztso' (Memory Model - Total Store Order)
1081+
zicfilp 0.4 'Zicfilp' (Landing pad)
10821082
1083-
ISA String: rv64i2p1_ztso0p1)";
1083+
ISA String: rv64i2p1_zicfilp0p4)";
10841084
// clang-format on
10851085

10861086
StringMap<StringRef> DescMap;
10871087
DescMap["i"] = "'I' (Base Integer Instruction Set)";
1088-
DescMap["experimental-ztso"] = "'Ztso' (Memory Model - Total Store Order)";
1089-
std::set<StringRef> EnabledExtensions = {"i", "experimental-ztso"};
1088+
DescMap["experimental-zicfilp"] = "'Zicfilp' (Landing pad)";
1089+
std::set<StringRef> EnabledExtensions = {"i", "experimental-zicfilp"};
10901090

10911091
outs().flush();
10921092
testing::internal::CaptureStdout();
10931093
RISCVISAInfo::printEnabledExtensions(/*IsRV64=*/true, EnabledExtensions,
1094-
DescMap);
1094+
DescMap);
10951095
outs().flush();
10961096
std::string CapturedOutput = testing::internal::GetCapturedStdout();
10971097

0 commit comments

Comments
 (0)