Skip to content

Commit 7037878

Browse files
authored
[RISCV][TableGen] Get right experimental extension name
We should remove the `experimental-` prefix when printing march string. We didn't meet this problem because there is no processor containing experimental extensions. Reviewers: fpetrogalli, asb, topperc Reviewed By: topperc, asb Pull Request: #90185
1 parent 679e99d commit 7037878

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

llvm/test/TableGen/riscv-target-def.td

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@ def ROCKET_RV32 : RISCVProcessorModel<"rocket-rv32",
8383
FeatureStdExtI,
8484
FeatureStdExtZifencei,
8585
FeatureStdExtZicsr,
86+
FeatureStdExtZidummy,
8687
FeatureDummy]>;
8788
def ROCKET_RV64 : RISCVProcessorModel<"rocket-rv64",
8889
NoSchedModel,
8990
[Feature64Bit,
9091
FeatureStdExtI,
9192
FeatureStdExtZifencei,
9293
FeatureStdExtZicsr,
94+
FeatureStdExtZidummy,
9395
FeatureDummy]>;
9496
def ROCKET : RISCVTuneProcessorModel<"rocket",
9597
NoSchedModel>;
@@ -125,8 +127,8 @@ def ROCKET : RISCVTuneProcessorModel<"rocket",
125127

126128
// CHECK: PROC(GENERIC_RV32, {"generic-rv32"}, {"rv32i2p1"}, 0)
127129
// CHECK-NEXT: PROC(GENERIC_RV64, {"generic-rv64"}, {"rv64i2p1"}, 0)
128-
// CHECK-NEXT: PROC(ROCKET_RV32, {"rocket-rv32"}, {"rv32i2p1_zicsr2p0_zifencei2p0"}, 0)
129-
// CHECK-NEXT: PROC(ROCKET_RV64, {"rocket-rv64"}, {"rv64i2p1_zicsr2p0_zifencei2p0"}, 0)
130+
// CHECK-NEXT: PROC(ROCKET_RV32, {"rocket-rv32"}, {"rv32i2p1_zicsr2p0_zidummy0p1_zifencei2p0"}, 0)
131+
// CHECK-NEXT: PROC(ROCKET_RV64, {"rocket-rv64"}, {"rv64i2p1_zicsr2p0_zidummy0p1_zifencei2p0"}, 0)
130132

131133
// CHECK: #undef PROC
132134

llvm/utils/TableGen/RISCVTargetDefEmitter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static void printMArch(raw_ostream &OS, const Record &Rec) {
9595

9696
// Convert features to FeatureVector.
9797
for (auto *Feature : Rec.getValueAsListOfDefs("Features")) {
98-
StringRef FeatureName = Feature->getValueAsString("Name");
98+
StringRef FeatureName = getExtensionName(Feature);
9999
if (Feature->isSubClassOf("RISCVExtension")) {
100100
unsigned Major = Feature->getValueAsInt("MajorVersion");
101101
unsigned Minor = Feature->getValueAsInt("MinorVersion");

0 commit comments

Comments
 (0)