From 7e96a89b3cfa47e30078b0e4bcc38a3d21bc8985 Mon Sep 17 00:00:00 2001 From: Igor Breger Date: Sun, 9 Jul 2017 05:55:20 +0000 Subject: [PATCH] [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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307489 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 3 ++- test/CodeGen/X86/fast-isel-abort-warm.ll | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 72b1b39a524..bdf57e80584 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -1483,7 +1483,6 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) { // Try to select the instruction with FastISel. if (FastIS->selectInstruction(Inst)) { - FastISelFailed = true; --NumFastIselRemaining; ++NumFastIselSuccess; // If fast isel succeeded, skip over all the folded instructions, and @@ -1506,6 +1505,8 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) { continue; } + FastISelFailed = true; + // Then handle certain instructions as single-LLVM-Instruction blocks. // 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 diff --git a/test/CodeGen/X86/fast-isel-abort-warm.ll b/test/CodeGen/X86/fast-isel-abort-warm.ll index 3caa91b11ec..e87d14bb28a 100644 --- a/test/CodeGen/X86/fast-isel-abort-warm.ll +++ b/test/CodeGen/X86/fast-isel-abort-warm.ll @@ -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. ; Note: This test needs to use whatever is not supported by 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 triple = "x86_64-apple-macosx" +; CHECK: remark: :0:0: FastISel missed call: call void asm sideeffect ; CHECK: warning: Instruction selection used fallback path for foo define void @foo(){ entry: call void asm sideeffect "nop", "~{dirflag},~{fpsr},~{flags}"() ret void } + +; CHECK: remark: :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: :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 +} -- 2.40.0