Skip to content
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

Jump to bottom

[RISCV] Fix bad isel predicate handling for Ztso. #66739

Merged
merged 2 commits into from
Sep 19, 2023
Merged

[RISCV] Fix bad isel predicate handling for Ztso. #66739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e88653a
[RISCV] Fix bad isel predicate handling for Ztso.
topperc Sep 19, 2023
ebc9528
Fix the same bug for RV64 patterns.
topperc Sep 19, 2023
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/lib/Target/RISCV/RISCVFeatures.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ def HasStdExtSvinval : Predicate<"Subtarget->hasStdExtSvinval()">,
def FeatureStdExtZtso
: SubtargetFeature<"experimental-ztso", "HasStdExtZtso", "true",
"'Ztso' (Memory Model - Total Store Order)">;
def HasStdExtZtso : Predicate<"Subtarget->hasStdExtZTso()">,
def HasStdExtZtso : Predicate<"Subtarget->hasStdExtZtso()">,
AssemblerPredicate<(all_of FeatureStdExtZtso),
"'Ztso' (Memory Model - Total Store Order)">;
def NotHasStdExtZtso : Predicate<"!Subtarget->hasStdExtZtso()">;
Expand Down
31 changes: 16 additions & 15 deletions llvm/lib/Target/RISCV/RISCVInstrInfoA.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,9 @@ let Predicates = [HasAtomicLdSt, IsRV64] in {

/// AMOs

multiclass AMOPat<string AtomicOp, string BaseInst, ValueType vt = XLenVT> {
let Predicates = [HasStdExtA, NotHasStdExtZtso] in {
multiclass AMOPat<string AtomicOp, string BaseInst, ValueType vt = XLenVT,
list<Predicate> ExtraPreds = []> {
let Predicates = !listconcat([HasStdExtA, NotHasStdExtZtso], ExtraPreds) in {
def : PatGprGpr<!cast<PatFrag>(AtomicOp#"_monotonic"),
!cast<RVInst>(BaseInst), vt>;
def : PatGprGpr<!cast<PatFrag>(AtomicOp#"_acquire"),
Expand All @@ -142,7 +143,7 @@ let Predicates = [HasStdExtA, NotHasStdExtZtso] in {
def : PatGprGpr<!cast<PatFrag>(AtomicOp#"_seq_cst"),
!cast<RVInst>(BaseInst#"_AQ_RL"), vt>;
}
let Predicates = [HasStdExtA, HasStdExtZtso] in {
let Predicates = !listconcat([HasStdExtA, HasStdExtZtso], ExtraPreds) in {
def : PatGprGpr<!cast<PatFrag>(AtomicOp#"_monotonic"),
!cast<RVInst>(BaseInst), vt>;
def : PatGprGpr<!cast<PatFrag>(AtomicOp#"_acquire"),
Expand All @@ -156,8 +157,6 @@ let Predicates = [HasStdExtA, HasStdExtZtso] in {
}
}

let Predicates = [HasStdExtA] in {

defm : AMOPat<"atomic_swap_32", "AMOSWAP_W">;
defm : AMOPat<"atomic_load_add_32", "AMOADD_W">;
defm : AMOPat<"atomic_load_and_32", "AMOAND_W">;
Expand All @@ -168,6 +167,8 @@ defm : AMOPat<"atomic_load_min_32", "AMOMIN_W">;
defm : AMOPat<"atomic_load_umax_32", "AMOMAXU_W">;
defm : AMOPat<"atomic_load_umin_32", "AMOMINU_W">;

let Predicates = [HasStdExtA] in {

/// Pseudo AMOs

class PseudoAMO : Pseudo<(outs GPR:$res, GPR:$scratch),
Expand Down Expand Up @@ -315,17 +316,17 @@ def : Pat<(int_riscv_masked_cmpxchg_i32

} // Predicates = [HasStdExtA]

let Predicates = [HasStdExtA, IsRV64] in {
defm : AMOPat<"atomic_swap_64", "AMOSWAP_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_add_64", "AMOADD_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_and_64", "AMOAND_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_or_64", "AMOOR_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_xor_64", "AMOXOR_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_max_64", "AMOMAX_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_min_64", "AMOMIN_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_umax_64", "AMOMAXU_D", i64, [IsRV64]>;
defm : AMOPat<"atomic_load_umin_64", "AMOMINU_D", i64, [IsRV64]>;

defm : AMOPat<"atomic_swap_64", "AMOSWAP_D", i64>;
defm : AMOPat<"atomic_load_add_64", "AMOADD_D", i64>;
defm : AMOPat<"atomic_load_and_64", "AMOAND_D", i64>;
defm : AMOPat<"atomic_load_or_64", "AMOOR_D", i64>;
defm : AMOPat<"atomic_load_xor_64", "AMOXOR_D", i64>;
defm : AMOPat<"atomic_load_max_64", "AMOMAX_D", i64>;
defm : AMOPat<"atomic_load_min_64", "AMOMIN_D", i64>;
defm : AMOPat<"atomic_load_umax_64", "AMOMAXU_D", i64>;
defm : AMOPat<"atomic_load_umin_64", "AMOMINU_D", i64>;
let Predicates = [HasStdExtA, IsRV64] in {

/// 64-bit pseudo AMOs

Expand Down
Loading