From 99bd3cba8b75f79c3ecaa22e341381c98b799200 Mon Sep 17 00:00:00 2001 From: Juergen Ributzka Date: Thu, 2 Oct 2014 22:21:49 +0000 Subject: [Stackmaps] Make ithe frame-pointer required for stackmaps. Do not eliminate the frame pointer if there is a stackmap or patchpoint in the function. All stackmap references should be FP relative. This fixes PR21107. llvm-svn: 218920 --- llvm/test/CodeGen/X86/patchpoint-webkit_jscc.ll | 4 ++-- llvm/test/CodeGen/X86/patchpoint.ll | 4 ++-- llvm/test/CodeGen/X86/stackmap-fast-isel.ll | 4 ++-- llvm/test/CodeGen/X86/stackmap-liveness.ll | 4 ++-- llvm/test/CodeGen/X86/stackmap-nops.ll | 2 +- llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll | 4 ++-- llvm/test/CodeGen/X86/stackmap.ll | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'llvm/test/CodeGen') diff --git a/llvm/test/CodeGen/X86/patchpoint-webkit_jscc.ll b/llvm/test/CodeGen/X86/patchpoint-webkit_jscc.ll index 03f662ceadc..5e76bf8d4e6 100644 --- a/llvm/test/CodeGen/X86/patchpoint-webkit_jscc.ll +++ b/llvm/test/CodeGen/X86/patchpoint-webkit_jscc.ll @@ -1,5 +1,5 @@ -; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim < %s | FileCheck %s -; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim -fast-isel -fast-isel-abort < %s | FileCheck %s --check-prefix=FAST +; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -fast-isel -fast-isel-abort < %s | FileCheck %s --check-prefix=FAST ; Test the webkit_jscc calling convention. ; One argument will be passed in register, the other will be pushed on the stack. diff --git a/llvm/test/CodeGen/X86/patchpoint.ll b/llvm/test/CodeGen/X86/patchpoint.ll index 53d05ef0a7e..07148f0329a 100644 --- a/llvm/test/CodeGen/X86/patchpoint.ll +++ b/llvm/test/CodeGen/X86/patchpoint.ll @@ -1,5 +1,5 @@ -; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim < %s | FileCheck %s -; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim -fast-isel -fast-isel-abort < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 < %s | FileCheck %s +; RUN: llc -mtriple=x86_64-apple-darwin -mcpu=corei7 -fast-isel -fast-isel-abort < %s | FileCheck %s ; Trivial patchpoint codegen ; diff --git a/llvm/test/CodeGen/X86/stackmap-fast-isel.ll b/llvm/test/CodeGen/X86/stackmap-fast-isel.ll index 0b7e6dbdc7a..dfb16adaa33 100644 --- a/llvm/test/CodeGen/X86/stackmap-fast-isel.ll +++ b/llvm/test/CodeGen/X86/stackmap-fast-isel.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim | FileCheck %s -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim -fast-isel -fast-isel-abort | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 -fast-isel -fast-isel-abort | FileCheck %s ; CHECK-LABEL: .section __LLVM_STACKMAPS,__llvm_stackmaps ; CHECK-NEXT: __LLVM_StackMaps: diff --git a/llvm/test/CodeGen/X86/stackmap-liveness.ll b/llvm/test/CodeGen/X86/stackmap-liveness.ll index 897595db243..31553c0b684 100644 --- a/llvm/test/CodeGen/X86/stackmap-liveness.ll +++ b/llvm/test/CodeGen/X86/stackmap-liveness.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7-avx -disable-fp-elim -enable-patchpoint-liveness=false | FileCheck %s -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7-avx -disable-fp-elim | FileCheck -check-prefix=PATCH %s +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7-avx -enable-patchpoint-liveness=false | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7-avx | FileCheck -check-prefix=PATCH %s ; ; Note: Print verbose stackmaps using -debug-only=stackmaps. diff --git a/llvm/test/CodeGen/X86/stackmap-nops.ll b/llvm/test/CodeGen/X86/stackmap-nops.ll index 7de63af852a..7932c0dfb99 100644 --- a/llvm/test/CodeGen/X86/stackmap-nops.ll +++ b/llvm/test/CodeGen/X86/stackmap-nops.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 | FileCheck %s define void @nop_test() { entry: diff --git a/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll b/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll index 63debe396b6..6f7c5935b8f 100644 --- a/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll +++ b/llvm/test/CodeGen/X86/stackmap-shadow-optimization.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 | FileCheck %s ; Check that the X86 stackmap shadow optimization is only outputting a 1-byte ; nop here. 8-bytes are requested, but 7 are covered by the code for the call to @@ -18,4 +18,4 @@ entry: } declare void @llvm.experimental.stackmap(i64, i32, ...) -declare void @bar() \ No newline at end of file +declare void @bar() diff --git a/llvm/test/CodeGen/X86/stackmap.ll b/llvm/test/CodeGen/X86/stackmap.ll index 3e87ee114ba..5e356f3e03d 100644 --- a/llvm/test/CodeGen/X86/stackmap.ll +++ b/llvm/test/CodeGen/X86/stackmap.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 -disable-fp-elim | FileCheck %s +; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 | FileCheck %s ; ; Note: Print verbose stackmaps using -debug-only=stackmaps. -- cgit v1.2.3