[RISCV] Fix compressing of ymv instruction

Author: veselypeta

llvm/lib/Target/RISCV/RISCVInstrInfoC.td

@@ -1024,7 +1024,16 @@ def : CompressPat<(JALR X0, GPRNoX0:$rs1, 0),
                   (C_JR GPRNoX0:$rs1)>;
 } // Predicates = [HasStdExtC, NotCapMode]
 
+def NotStdExtYCapMode
+    : Predicate<"!(Subtarget->hasStdExtY() && Subtarget->hasCapMode())">,
+      AssemblerPredicate<
+        (any_of (not FeatureStdExtY),(not FeatureCapMode)),
+        "NotHasStdExtYAndCapMode">;
+
 let Predicates = [HasStdExtCOrZca] in {
+// `c.mv` in capmode is uncompressed to a capability move so we can't compress
+// an integer move to this instruction in this case.
+let Predicates = [HasStdExtCOrZca, NotStdExtYCapMode] in {
 let isCompressOnly = true in {
 def : CompressPat<(ADD GPRNoX0:$rs1, X0, GPRNoX0:$rs2),
                   (C_MV GPRNoX0:$rs1, GPRNoX0:$rs2)>;
@@ -1033,6 +1042,7 @@ def : CompressPat<(ADD GPRNoX0:$rs1, GPRNoX0:$rs2, X0),
 }
 def : CompressPat<(ADDI GPRNoX0:$rs1, GPRNoX0:$rs2, 0),
                   (C_MV GPRNoX0:$rs1, GPRNoX0:$rs2)>;
+}
 def : CompressPat<(EBREAK), (C_EBREAK)>;
 def : CompressPat<(UNIMP), (C_UNIMP)>;
 } // Predicates = [HasStdExtCOrZca]

llvm/test/CodeGen/RISCV/cheri/rvy/compress.ll

@@ -0,0 +1,64 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+
+; RUN: cat %s > %t.tgtattr
+; RUN: echo 'attributes #0 = { nounwind }' >> %t.tgtattr
+; RUN: %riscv32y_purecap_llc -mattr=+c,+y,+cap-mode -filetype=obj < %t.tgtattr \
+; RUN:   | llvm-objdump -d -M no-aliases - | FileCheck %s
+; RUN: %riscv64y_purecap_llc -mattr=+c,+y,+cap-mode -filetype=obj < %t.tgtattr \
+; RUN:   | llvm-objdump -d -M no-aliases - | FileCheck %s
+; RUN: %riscv64y_purecap_llc -mattr=+c,+y,+cap-mode,+xcheri-norvc -filetype=obj < %t.tgtattr \
+; RUN:   | llvm-objdump -d -M no-aliases --mattr=+y - | FileCheck %s --check-prefix=CHECK-NORVC
+
+; RUN: cat %s > %t.fnattr
+; RUN: echo 'attributes #0 = { nounwind "target-features"="+c,+y,+cap-mode" }' >> %t.fnattr
+; RUN: %riscv32y_purecap_llc -filetype=obj < %t.fnattr \
+; RUN:   | llvm-objdump -d --mattr=+c -M no-aliases - | FileCheck %s
+; RUN: %riscv64y_purecap_llc -filetype=obj < %t.fnattr \
+; RUN:   | llvm-objdump -d --mattr=+c -M no-aliases - | FileCheck %s
+; RUN: cat %s > %t.fnattr
+; RUN: echo 'attributes #0 = { nounwind "target-features"="+c,+y,+cap-mode,+xcheri-norvc" }' >> %t.fnattr
+; RUN: %riscv64y_purecap_llc -filetype=obj < %t.fnattr \
+; RUN:   | llvm-objdump -d --mattr=+c -M no-aliases --mattr=+y - | FileCheck %s --check-prefix=CHECK-NORVC
+
+
+define i32 @loadstore(ptr addrspace(200) %intptrarg, ptr addrspace(200) %ptrptrarg) addrspace(200) #0 {
+; CHECK-LABEL: <loadstore>:
+; CHECK-NEXT:    c.cincoffset16csp csp, -32
+; CHECK-NEXT:    c.lw a2, 0(ca0)
+; CHECK-NEXT:    c.li a3, 1
+; CHECK-NEXT:    c.sw a3, 0(ca0)
+; CHECK-NEXT:    c.lc ca0, 0(ca1)
+; CHECK-NEXT:    c.sc ca0, 0(ca1)
+; CHECK-NEXT:    c.scsp ca0, 16(csp)
+; CHECK-NEXT:    c.lcsp ca0, 16(csp)
+; CHECK-NEXT:    c.swsp a2, 0(csp)
+; CHECK-NEXT:    c.lwsp a0, 0(csp)
+; CHECK-NEXT:    addi a0, a2, 0
+; CHECK-NEXT:    c.cincoffset16csp csp, 32
+; CHECK-NEXT:    c.jr cra
+; CHECK-NORVC-LABEL: <loadstore>:
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}addiy csp, csp, -32
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}lw a2, 0(ca0)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}c.li a3, 1
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}sw a3, 0(ca0)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}ly ca0, 0(ca1)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}sy ca0, 0(ca1)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}sy ca0, 16(csp)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}ly ca0, 16(csp)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}sw a2, 0(csp)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}lw a0, 0(csp)
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}addi a0, a2, 0
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}addiy csp, csp, 32
+; CHECK-NORVC-NEXT:  {{[^a-z.]}}jalr cnull, 0(cra)
+  %stackptr = alloca ptr addrspace(200), align 16, addrspace(200)
+  %stackint = alloca i32, align 16, addrspace(200)
+  %val = load volatile i32, ptr addrspace(200) %intptrarg
+  store volatile i32 1, ptr addrspace(200) %intptrarg
+  %ptrval = load volatile ptr addrspace(200), ptr addrspace(200) %ptrptrarg
+  store volatile ptr addrspace(200) %ptrval, ptr addrspace(200) %ptrptrarg
+  store volatile ptr addrspace(200) %ptrval, ptr addrspace(200) %stackptr
+  %stackptrval = load volatile ptr addrspace(200), ptr addrspace(200) %stackptr
+  store volatile i32 %val, ptr addrspace(200) %stackint
+  %stackintval = load volatile i32, ptr addrspace(200) %stackint
+  ret i32 %val
+}