From 5348a25377652c5e32f9a85754da7231cb9bf9f6 Mon Sep 17 00:00:00 2001 From: Pavel Kosov Date: Thu, 6 Apr 2023 14:56:53 +0300 Subject: [PATCH] [llvm-exegesis][AArch64] Add return statement at the end of the snippet 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/test/tools/llvm-exegesis/AArch64/add-return.s | 5 +++++ llvm/tools/llvm-exegesis/lib/Assembler.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 llvm/test/tools/llvm-exegesis/AArch64/add-return.s diff --git a/llvm/test/tools/llvm-exegesis/AArch64/add-return.s b/llvm/test/tools/llvm-exegesis/AArch64/add-return.s new file mode 100644 index 0000000..3d827d7 --- /dev/null +++ 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 index 0f8b765..ca882cf 100644 --- 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); } } -- 2.7.4