[llvm] [llvm][RISCV] Make X0 register pair legal in pre-ra pass (PR #169164)

[via llvm-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-risc-v

Author: Brandon Wu (4vtomat)

<details>
<summary>Changes</summary>



---
Full diff: https://github.com/llvm/llvm-project/pull/169164.diff


2 Files Affected:

- (modified) llvm/lib/Target/RISCV/RISCVZilsdOptimizer.cpp (+2-1) 
- (modified) llvm/test/CodeGen/RISCV/zilsd-ldst-opt-prera.mir (+38) 


``````````diff
diff --git a/llvm/lib/Target/RISCV/RISCVZilsdOptimizer.cpp b/llvm/lib/Target/RISCV/RISCVZilsdOptimizer.cpp
index 99e83fbb05a73..480937df9c3df 100644
--- a/llvm/lib/Target/RISCV/RISCVZilsdOptimizer.cpp
+++ b/llvm/lib/Target/RISCV/RISCVZilsdOptimizer.cpp
@@ -209,9 +209,10 @@ bool RISCVPreAllocZilsdOpt::canFormLdSdPair(MachineInstr *MI0,
 
   // Check that the two destination/source registers are different for
   // load/store respectively.
+  // The only case two destinations/sources can be same is (x0, x0).
   Register FirstReg = MI0->getOperand(0).getReg();
   Register SecondReg = MI1->getOperand(0).getReg();
-  if (FirstReg == SecondReg)
+  if (FirstReg == SecondReg && FirstReg != RISCV::X0)
     return false;
 
   return true;
diff --git a/llvm/test/CodeGen/RISCV/zilsd-ldst-opt-prera.mir b/llvm/test/CodeGen/RISCV/zilsd-ldst-opt-prera.mir
index dab394d4bc8c4..e5251736db45e 100644
--- a/llvm/test/CodeGen/RISCV/zilsd-ldst-opt-prera.mir
+++ b/llvm/test/CodeGen/RISCV/zilsd-ldst-opt-prera.mir
@@ -19,6 +19,13 @@
     ret void
   }
 
+  define void @basic_store_zero_combine(ptr %0, i32 %1, i32 %2) {
+    store i32 0, ptr %0, align 4
+    %4 = getelementptr inbounds i32, ptr %0, i32 1
+    store i32 0, ptr %4, align 4
+    ret void
+  }
+
   define i32 @basic_load_combine_8_byte_aligned(ptr %0) {
     %2 = load i32, ptr %0, align 8
     %3 = getelementptr inbounds i32, ptr %0, i32 1
@@ -310,6 +317,37 @@ body: |
     SW %2, %0, 4 :: (store (s32))
     PseudoRET
 
+...
+---
+# Basic case: two consecutive 32-bit store 0 that can be combined into SD
+name: basic_store_zero_combine
+alignment: 4
+tracksRegLiveness: true
+liveins:
+  - { reg: '$x10', virtual-reg: '%0' }
+body: |
+  bb.0:
+    liveins: $x10
+
+    ; CHECK-LABEL: name: basic_store_zero_combine
+    ; CHECK: liveins: $x10
+    ; CHECK-NEXT: {{  $}}
+    ; CHECK-NEXT: [[COPY:%[0-9]+]]:gpr = COPY $x10
+    ; CHECK-NEXT: SW $x0, [[COPY]], 0 :: (store (s32))
+    ; CHECK-NEXT: SW $x0, [[COPY]], 4 :: (store (s32))
+    ; CHECK-NEXT: PseudoRET
+    ;
+    ; CHECK-4BYTE-LABEL: name: basic_store_zero_combine
+    ; CHECK-4BYTE: liveins: $x10
+    ; CHECK-4BYTE-NEXT: {{  $}}
+    ; CHECK-4BYTE-NEXT: [[COPY:%[0-9]+]]:gpr = COPY $x10
+    ; CHECK-4BYTE-NEXT: PseudoSD_RV32_OPT $x0, $x0, [[COPY]], 0 :: (store (s32))
+    ; CHECK-4BYTE-NEXT: PseudoRET
+    %0:gpr = COPY $x10
+    SW $x0, %0, 0 :: (store (s32))
+    SW $x0, %0, 4 :: (store (s32))
+    PseudoRET
+
 ...
 ---
 name: basic_load_combine_8_byte_aligned

``````````

</details>


https://github.com/llvm/llvm-project/pull/169164