Skip to content

Commit cb4f329

Browse files
authored
[RISCV] Fix HasStdExtCOrZcfOrZce Syntax (#145141)
1 parent 9cc9efc commit cb4f329

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

llvm/lib/Target/RISCV/RISCVFeatures.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ def FeatureStdExtZce
459459
[FeatureStdExtZcb, FeatureStdExtZcmp, FeatureStdExtZcmt]>;
460460

461461
def HasStdExtCOrZcfOrZce
462-
: Predicate<"Subtarget->hasStdExtC() || Subtarget->hasStdExtZcf() "
462+
: Predicate<"Subtarget->hasStdExtC() || Subtarget->hasStdExtZcf() ||"
463463
"Subtarget->hasStdExtZce()">,
464464
AssemblerPredicate<(any_of FeatureStdExtC, FeatureStdExtZcf,
465465
FeatureStdExtZce),

llvm/lib/Target/RISCV/RISCVInstrInfoC.td

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ def : CompressPat<(LW_INX GPRF32C:$rd, GPRCMem:$rs1, uimm7_lsb00:$imm),
870870
let Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32] in {
871871
def : CompressPat<(FLW FPR32C:$rd, GPRCMem:$rs1, uimm7_lsb00:$imm),
872872
(C_FLW FPR32C:$rd, GPRCMem:$rs1, uimm7_lsb00:$imm)>;
873-
} // Predicates = [HasStdExtC, HasStdExtF, IsRV32]
873+
} // Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32]
874874

875875
let Predicates = [HasStdExtCOrZca, IsRV64] in {
876876
def : CompressPat<(LD GPRC:$rd, GPRCMem:$rs1, uimm8_lsb000:$imm),
@@ -894,7 +894,7 @@ def : CompressPat<(SW_INX GPRF32C:$rs2, GPRCMem:$rs1, uimm7_lsb00:$imm),
894894
let Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32] in {
895895
def : CompressPat<(FSW FPR32C:$rs2, GPRCMem:$rs1, uimm7_lsb00:$imm),
896896
(C_FSW FPR32C:$rs2, GPRCMem:$rs1, uimm7_lsb00:$imm)>;
897-
} // Predicates = [HasStdExtC, HasStdExtF, IsRV32]
897+
} // Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32]
898898

899899
let Predicates = [HasStdExtCOrZca, IsRV64] in {
900900
def : CompressPat<(SD GPRC:$rs2, GPRCMem:$rs1, uimm8_lsb000:$imm),
@@ -1001,7 +1001,7 @@ def : CompressPat<(LW_INX GPRF32NoX0:$rd, SPMem:$rs1, uimm8_lsb00:$imm),
10011001
let Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32] in {
10021002
def : CompressPat<(FLW FPR32:$rd, SPMem:$rs1, uimm8_lsb00:$imm),
10031003
(C_FLWSP FPR32:$rd, SPMem:$rs1, uimm8_lsb00:$imm)>;
1004-
} // Predicates = [HasStdExtC, HasStdExtF, IsRV32]
1004+
} // Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32]
10051005

10061006
let Predicates = [HasStdExtCOrZca, IsRV64] in {
10071007
def : CompressPat<(LD GPRNoX0:$rd, SPMem:$rs1, uimm9_lsb000:$imm),
@@ -1047,7 +1047,7 @@ def : CompressPat<(SW_INX GPRF32:$rs2, SPMem:$rs1, uimm8_lsb00:$imm),
10471047
let Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32] in {
10481048
def : CompressPat<(FSW FPR32:$rs2, SPMem:$rs1, uimm8_lsb00:$imm),
10491049
(C_FSWSP FPR32:$rs2, SPMem:$rs1, uimm8_lsb00:$imm)>;
1050-
} // Predicates = [HasStdExtC, HasStdExtF, IsRV32]
1050+
} // Predicates = [HasStdExtCOrZcfOrZce, HasStdExtF, IsRV32]
10511051

10521052
let Predicates = [HasStdExtCOrZca, IsRV64] in {
10531053
def : CompressPat<(SD GPR:$rs2, SPMem:$rs1, uimm9_lsb000:$imm),

0 commit comments

Comments
 (0)