From eb0d6abee36c274cf081948795f4675d8f33fc6f Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 7 Oct 2008 23:00:56 +0000 Subject: [PATCH] Remove -disable-fast-isel. Use cl::boolOrDefault with -fast-isel instead. So now: -fast-isel or -fast-isel=true enable fast-isel, and -fast-isel=false disables it. Fast-isel is also on by default with -fast, and off by default otherwise. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57270 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LLVMTargetMachine.cpp | 11 +++-------- test/CodeGen/X86/2008-05-21-CoalescerBug.ll | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp index cd444552f7a..333b8ab9b7c 100644 --- a/lib/CodeGen/LLVMTargetMachine.cpp +++ b/lib/CodeGen/LLVMTargetMachine.cpp @@ -56,12 +56,9 @@ DisablePostRAScheduler("disable-post-RA-scheduler", // Enable or disable FastISel. Both options are needed, because // FastISel is enabled by default with -fast, and we wish to be // able to enable or disable fast-isel independently from -fast. -static cl::opt +static cl::opt EnableFastISelOption("fast-isel", cl::Hidden, cl::desc("Enable the experimental \"fast\" instruction selector")); -static cl::opt -DisableFastISelOption("disable-fast-isel", cl::Hidden, - cl::desc("Disable the experimental \"fast\" instruction selector")); FileModel::Model LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM, @@ -175,10 +172,8 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) { // Standard Lower-Level Passes. // Enable FastISel with -fast, but allow that to be overridden. - assert((!EnableFastISelOption || !DisableFastISelOption) && - "Both -fast-isel and -disable-fast-isel given!"); - if (EnableFastISelOption || - (Fast && !DisableFastISelOption)) + if (EnableFastISelOption == cl::BOU_TRUE || + (Fast && EnableFastISelOption != cl::BOU_FALSE)) EnableFastISel = true; // Ask the target for an isel. diff --git a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll index 666c26157ac..bed218fb702 100644 --- a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll +++ b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -fast -disable-fast-isel | grep mov | count 5 +; RUN: llvm-as < %s | llc -march=x86 -fast -fast-isel=false | grep mov | count 5 ; PR2343 %llvm.dbg.anchor.type = type { i32, i32 }