[FastISel] fix a fallback diagnostic.

Summary: FastISel was marked as failed in case instruction selection succeeded.

Reviewers: qcolombet, zvi, rovka, ab

Reviewed By: zvi

Subscribers: javed.absar, ab, qcolombet, bogner, llvm-commits

Differential Revision: https://reviews.llvm.org/D34438

llvm-svn: 307489
This commit is contained in:
Igor Breger 2017-07-09 05:55:20 +00:00
parent 713b5ba2de
commit b80b44b7b9
2 changed files with 20 additions and 2 deletions
llvm
lib/CodeGen/SelectionDAG
test/CodeGen/X86

View File

@ -1483,7 +1483,6 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) {
// Try to select the instruction with FastISel. // Try to select the instruction with FastISel.
if (FastIS->selectInstruction(Inst)) { if (FastIS->selectInstruction(Inst)) {
FastISelFailed = true;
--NumFastIselRemaining; --NumFastIselRemaining;
++NumFastIselSuccess; ++NumFastIselSuccess;
// If fast isel succeeded, skip over all the folded instructions, and // If fast isel succeeded, skip over all the folded instructions, and
@ -1506,6 +1505,8 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) {
continue; continue;
} }
FastISelFailed = true;
// Then handle certain instructions as single-LLVM-Instruction blocks. // Then handle certain instructions as single-LLVM-Instruction blocks.
// We cannot separate out GCrelocates to their own blocks since we need // We cannot separate out GCrelocates to their own blocks since we need
// to keep track of gc-relocates for a particular gc-statepoint. This is // to keep track of gc-relocates for a particular gc-statepoint. This is

View File

@ -1,4 +1,4 @@
; RUN: llc -fast-isel -o - %s -fast-isel-report-on-fallback 2>&1 | FileCheck %s ; RUN: llc -fast-isel -o - %s -fast-isel-report-on-fallback -pass-remarks-missed=isel 2>&1 | FileCheck %s
; Make sure FastISel report a warming when we asked it to do so. ; Make sure FastISel report a warming when we asked it to do so.
; Note: This test needs to use whatever is not supported by FastISel. ; Note: This test needs to use whatever is not supported by FastISel.
; Thus, this test may fail because inline asm gets supported in FastISel. ; Thus, this test may fail because inline asm gets supported in FastISel.
@ -6,9 +6,26 @@
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx" target triple = "x86_64-apple-macosx"
; CHECK: remark: <unknown>:0:0: FastISel missed call: call void asm sideeffect
; CHECK: warning: Instruction selection used fallback path for foo ; CHECK: warning: Instruction selection used fallback path for foo
define void @foo(){ define void @foo(){
entry: entry:
call void asm sideeffect "nop", "~{dirflag},~{fpsr},~{flags}"() call void asm sideeffect "nop", "~{dirflag},~{fpsr},~{flags}"()
ret void ret void
} }
; CHECK: remark: <unknown>:0:0: FastISel missed: store i128
; CHECK: warning: Instruction selection used fallback path for test_instruction_fallback
define void @test_instruction_fallback(i128* %ptr){
%v1 = load i128, i128* %ptr
%result = add i128 %v1, %v1
store i128 %result, i128 * %ptr
ret void
}
; CHECK-NOT: remark: <unknown>:0:0: FastISel missed
; CHECK-NOT: warning: Instruction selection used fallback path for test_instruction_not_fallback
define i32 @test_instruction_not_fallback(i32 %a){
%result = add i32 %a, %a
ret i32 %result
}