[llvm-commits] [llvm] r110520 - in /llvm/trunk: test/BugPoint/crash-narrowfunctiontest.ll test/BugPoint/remove_arguments_test.ll tools/Makefile tools/bugpoint-passes/ tools/bugpoint-passes/TestPasses.cpp tools/bugpoint/TestPasses.cpp

[Rafael Espindola]

Author: rafael
Date: Sat Aug  7 16:48:09 2010
New Revision: 110520

URL: http://llvm.org/viewvc/llvm-project?rev=110520&view=rev
Log:
Move the bugpoint test passes to a plugin in preparation for having bugpoint
use opt.

Added:
    llvm/trunk/tools/bugpoint-passes/
    llvm/trunk/tools/bugpoint-passes/TestPasses.cpp
      - copied, changed from r110518, llvm/trunk/tools/bugpoint/TestPasses.cpp
Removed:
    llvm/trunk/tools/bugpoint/TestPasses.cpp
Modified:
    llvm/trunk/test/BugPoint/crash-narrowfunctiontest.ll
    llvm/trunk/test/BugPoint/remove_arguments_test.ll
    llvm/trunk/tools/Makefile

Modified: llvm/trunk/test/BugPoint/crash-narrowfunctiontest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/BugPoint/crash-narrowfunctiontest.ll?rev=110520&r1=110519&r2=110520&view=diff
==============================================================================
--- llvm/trunk/test/BugPoint/crash-narrowfunctiontest.ll (original)
+++ llvm/trunk/test/BugPoint/crash-narrowfunctiontest.ll Sat Aug  7 16:48:09 2010
@@ -1,6 +1,7 @@
 ; Test that bugpoint can narrow down the testcase to the important function
+; FIXME: This likely fails on windows
 ;
-; RUN: bugpoint %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
+; RUN: bugpoint -load %llvmlibsdir/BugpointPasses.so %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null
 
 define i32 @foo() { ret i32 1 }
 

Modified: llvm/trunk/test/BugPoint/remove_arguments_test.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/BugPoint/remove_arguments_test.ll?rev=110520&r1=110519&r2=110520&view=diff
==============================================================================
--- llvm/trunk/test/BugPoint/remove_arguments_test.ll (original)
+++ llvm/trunk/test/BugPoint/remove_arguments_test.ll Sat Aug  7 16:48:09 2010
@@ -1,4 +1,5 @@
-; RUN: bugpoint %s -output-prefix %t -bugpoint-crashcalls -silence-passes
+; FIXME: This likely fails on windows
+; RUN: bugpoint -load %llvmlibsdir/BugpointPasses.so %s -output-prefix %t -bugpoint-crashcalls -silence-passes
 ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s
 
 ; Test to make sure that arguments are removed from the function if they are 

Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=110520&r1=110519&r2=110520&view=diff
==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Sat Aug  7 16:48:09 2010
@@ -20,7 +20,7 @@
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
                  lli llvm-extract llvm-mc \
-                 bugpoint llvm-bcanalyzer llvm-stub \
+                 bugpoint bugpoint-passes llvm-bcanalyzer llvm-stub \
                  llvmc
 
 # Let users override the set of tools to build from the command line.

Copied: llvm/trunk/tools/bugpoint-passes/TestPasses.cpp (from r110518, llvm/trunk/tools/bugpoint/TestPasses.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint-passes/TestPasses.cpp?p2=llvm/trunk/tools/bugpoint-passes/TestPasses.cpp&p1=llvm/trunk/tools/bugpoint/TestPasses.cpp&r1=110518&r2=110520&rev=110520&view=diff
==============================================================================
    (empty)

Removed: llvm/trunk/tools/bugpoint/TestPasses.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/TestPasses.cpp?rev=110519&view=auto
==============================================================================
--- llvm/trunk/tools/bugpoint/TestPasses.cpp (original)
+++ llvm/trunk/tools/bugpoint/TestPasses.cpp (removed)
@@ -1,75 +0,0 @@
-//===- TestPasses.cpp - "buggy" passes used to test bugpoint --------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains "buggy" passes that are used to test bugpoint, to check
-// that it is narrowing down testcases correctly.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/BasicBlock.h"
-#include "llvm/Constant.h"
-#include "llvm/Instructions.h"
-#include "llvm/Pass.h"
-#include "llvm/Type.h"
-#include "llvm/Support/InstVisitor.h"
-
-using namespace llvm;
-
-namespace {
-  /// CrashOnCalls - This pass is used to test bugpoint.  It intentionally
-  /// crashes on any call instructions.
-  class CrashOnCalls : public BasicBlockPass {
-  public:
-    static char ID; // Pass ID, replacement for typeid
-    CrashOnCalls() : BasicBlockPass(ID) {}
-  private:
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.setPreservesAll();
-    }
-
-    bool runOnBasicBlock(BasicBlock &BB) {
-      for (BasicBlock::iterator I = BB.begin(), E = BB.end(); I != E; ++I)
-        if (isa<CallInst>(*I))
-          abort();
-
-      return false;
-    }
-  };
-
-  char CrashOnCalls::ID = 0;
-  RegisterPass<CrashOnCalls>
-  X("bugpoint-crashcalls",
-    "BugPoint Test Pass - Intentionally crash on CallInsts");
-}
-
-namespace {
-  /// DeleteCalls - This pass is used to test bugpoint.  It intentionally
-  /// deletes some call instructions, "misoptimizing" the program.
-  class DeleteCalls : public BasicBlockPass {
-  public:
-    static char ID; // Pass ID, replacement for typeid
-    DeleteCalls() : BasicBlockPass(ID) {}
-  private:
-    bool runOnBasicBlock(BasicBlock &BB) {
-      for (BasicBlock::iterator I = BB.begin(), E = BB.end(); I != E; ++I)
-        if (CallInst *CI = dyn_cast<CallInst>(I)) {
-          if (!CI->use_empty())
-            CI->replaceAllUsesWith(Constant::getNullValue(CI->getType()));
-          CI->getParent()->getInstList().erase(CI);
-          break;
-        }
-      return false;
-    }
-  };
- 
-  char DeleteCalls::ID = 0;
-  RegisterPass<DeleteCalls>
-  Y("bugpoint-deletecalls",
-    "BugPoint Test Pass - Intentionally 'misoptimize' CallInsts");
-}