[snippy] fix IR building for load symbol address and JALR generation …

…routine
syntacore · Nov 27, 2024 · bbfba84 · bbfba84
1 parent 4d7fa97
commit bbfba84
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 12 deletions.
diff --git a/llvm/test/tools/llvm-snippy/calls/calls-jalr-error.yaml b/llvm/test/tools/llvm-snippy/calls/calls-jalr-error.yaml
@@ -0,0 +1,57 @@
+# XFAIL: *
+
+# RUN: llvm-snippy %s -march=riscv64-linux-gnu -function-number=20 -function-layers=5 -num-instrs=100 \
+# RUN: --dump-mf -stack-size=10240 -num-instr-ancil=50 -verify-mi |& Filcheck %s
+
+options:
+  redefine-sp: SP
+  reserved-regs-list:
+    - X5
+    - X6
+    - X7
+    - X8
+    - X9
+    - X10
+    - X11
+    - X12
+    - X13
+    - X14
+    - X15
+    - X16
+    - X17
+    - X18
+    - X19
+    - X20
+    - X21
+    - X22
+    - X23
+    - X24
+    - X25
+    - X26
+    - X27
+    - X28
+    - X29
+    - X30
+    - X31
+
+
+
+sections:
+  - no:        1
+    VMA:       0x210000
+    SIZE:      0x100000
+    LMA:       0x210000
+    ACCESS:    rx
+  - no:        2
+    VMA:       0x100000
+    SIZE:      0x100000
+    LMA:       0x100000
+    ACCESS:    rw
+
+histogram:
+    - [ADD, 1.0]
+    - [ADDI, 1.0]
+    - [SUB, 1.0]
+    - [JALR, 10]
+
+#CHECK: error: No available register GPRJALR: scratch register for storing function address
diff --git a/llvm/test/tools/llvm-snippy/calls/calls-with-loops.yaml b/llvm/test/tools/llvm-snippy/calls/calls-with-loops.yaml
@@ -4,7 +4,7 @@
 
 options:
   march: "riscv64-linux-gnu"
-  num-instrs: 20
+  num-instrs: 50
   stack-size: 32768
   last-instr: "RET"
   function-number: 32
@@ -59,8 +59,7 @@ histogram:
     - [BNE, 1.0]
     - [BLT, 1.0]
     - [BLTU, 1.0]
-    - [JAL, 1.0]
-    - [JALR, 1.0]
+    - [JAL, 6.0]
 
 branches:
   permutation: on
@@ -71,6 +70,7 @@ branches:
     min: 1
     max: 1
 
+# CHECK: SnippyFunction
 # CHECK: SD $x1, $x2, 0, pcsections
 # CHECK-NEXT: PseudoCALL
 # CHECK-NEXT: $x1 = LD $x2, 0, pcsections
diff --git a/llvm/test/tools/llvm-snippy/calls/calls.yaml b/llvm/test/tools/llvm-snippy/calls/calls.yaml
@@ -1,5 +1,5 @@
 # RUN: llvm-snippy %s -march=riscv64-linux-gnu -function-number=20 -function-layers=5 -num-instrs=100 \
-# RUN: --dump-mf -stack-size=10240 -num-instr-ancil=50 |& FileCheck %s
+# RUN: --dump-mf -stack-size=10240 -num-instr-ancil=50 -verify-mi |& FileCheck %s
 
 sections:
   - no:        1

diff --git a/llvm/test/tools/llvm-snippy/gen-plan-verification-calls.yaml b/llvm/test/tools/llvm-snippy/gen-plan-verification-calls.yaml
@@ -1,5 +1,5 @@
 # RUN: llvm-snippy %s -march=riscv64-linux-gnu -function-number=20 -function-layers=5 -num-instrs=100 \
-# RUN: -stack-size=10240 -num-instr-ancil=50 -verify-gen-plan |& FileCheck %s
+# RUN: -stack-size=10240 -num-instr-ancil=50 -verify-gen-plan -verify-mi |& FileCheck %s
 
 sections:
   - no:        1

diff --git a/llvm/tools/llvm-snippy/lib/Generator/Generation.cpp b/llvm/tools/llvm-snippy/lib/Generator/Generation.cpp
@@ -16,6 +16,7 @@
 #include "snippy/Generator/Policy.h"
 #include "snippy/Support/Options.h"
 
+#include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/FormatVariadic.h"
 
 namespace llvm {
@@ -1092,10 +1093,8 @@ void spillPseudoInstImplicitReg(MachineInstr &MI, Register Reg,
   auto &MBB = *MBBPtr;
   auto RealStackPointer = GC.getProgramContext().getStackPointer();
 
-  auto PointBeforeSpill = std::find_if(
-      std::next(MachineBasicBlock::reverse_iterator(MI)), MBB.rend(),
-      [](auto &&Inst) { return checkSupportMetadata(Inst); });
-  auto SpillPoint = std::next(PointBeforeSpill.getReverse());
+  // FIXME: This code can be unsuitable for some platforms
+  auto SpillPoint = MachineBasicBlock::iterator(MI);
   SnpTgt.generateSpillToStack(MBB, SpillPoint, Reg, GC, RealStackPointer);
 
   auto ReloadPoint = std::next(MachineBasicBlock::iterator(MI));

diff --git a/llvm/tools/llvm-snippy/lib/Target/RISCV/Target.cpp b/llvm/tools/llvm-snippy/lib/Target/RISCV/Target.cpp
@@ -2097,14 +2097,14 @@ class SnippyRISCVTarget final : public SnippyTarget {
 
     MachineInstr *MIAUIPC =
         getSupportInstBuilder(*this, MBB, Ins, Ctx, InstrInfo.get(RISCV::AUIPC))
-            .addReg(DestReg)
+            .addDef(DestReg)
             .addGlobalAddress(Target, 0, RISCVII::MO_PCREL_HI);
     MCSymbol *AUIPCSymbol = MF->getContext().createNamedTempSymbol("pcrel_hi");
     MIAUIPC->setPreInstrSymbol(*MF, AUIPCSymbol);
 
     return getSupportInstBuilder(*this, MBB, Ins, Ctx,
                                  InstrInfo.get(RISCV::ADDI))
-        .addReg(DestReg)
+        .addDef(DestReg)
         .addReg(DestReg)
         .addSym(AUIPCSymbol, RISCVII::MO_PCREL_LO);
   }
@@ -2131,7 +2131,7 @@ class SnippyRISCVTarget final : public SnippyTarget {
     auto &State = GC.getLLVMState();
     auto &Ctx = State.getCtx();
     const auto &RI = State.getRegInfo();
-    const auto &RegClass = RI.getRegClass(RISCV::GPRRegClassID);
+    const auto &RegClass = RI.getRegClass(RISCV::GPRJALRRegClassID);
     auto RP = GC.getRegisterPool();
     auto Reg = getNonZeroReg("scratch register for storing function address",
                              RI, RegClass, RP, MBB);