[llvm-exegesis][AArch64] Add return statement at the end of the snipp…

…et correctly Currently llvm-exegesis fails to do this which causes every snippet to crash ~~ Huawei RRI, OS Lab Reviewed By: courbet Differential Revision: https://reviews.llvm.org/D147699
llvm · Apr 6, 2023 · 5348a25 · 5348a25
1 parent ef1b22a
commit 5348a25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/llvm/test/tools/llvm-exegesis/AArch64/add-return.s b/llvm/test/tools/llvm-exegesis/AArch64/add-return.s
@@ -0,0 +1,5 @@
+# RUN: llvm-exegesis --opcode-name=ADDv16i8 --mcpu=cortex-a78 --mtriple=aarch64-linux-gnu \
+# RUN:               --mode=latency --benchmark-phase=assemble-measured-code 2>&1 | FileCheck %s
+
+# Check that we add ret (bx lr) instr to snippet
+# CHECK: assembled_snippet: {{.*}}C0035FD6
diff --git a/llvm/tools/llvm-exegesis/lib/Assembler.cpp b/llvm/tools/llvm-exegesis/lib/Assembler.cpp
@@ -132,8 +132,8 @@ void BasicBlockFiller::addReturn(const DebugLoc &DL) {
 
     FunctionLoweringInfo FuncInfo;
     FuncInfo.CanLowerReturn = true;
-    MF.getSubtarget().getCallLowering()->lowerReturn(MIB, nullptr, {},
-                                                     FuncInfo);
+    MF.getSubtarget().getCallLowering()->lowerReturn(MIB, nullptr, {}, FuncInfo,
+                                                     0);
   }
 }