Revert "[llvm-reduce] Add MIR support"

This reverts commit bc2773c.

Broke the clang-ppc64le-linux-multistage build. Reverting while I
investigate.

Author: markuslavin

llvm/test/tools/llvm-reduce/mir/instr-reduce.mir

@@ -5,15 +5,13 @@ set(LLVM_LINK_COMPONENTS
   AllTargetsInfos
   Core
   IRReader
-  MIRParser
   Support
   Target
   TransformUtils
   )
 
 add_llvm_tool(llvm-reduce
   DeltaManager.cpp
-  ReducerWorkItem.cpp
   TestRunner.cpp
   deltas/Delta.cpp
   deltas/ReduceAliases.cpp
@@ -32,7 +30,6 @@ add_llvm_tool(llvm-reduce
   deltas/ReduceSpecialGlobals.cpp
   deltas/ReduceOperands.cpp
   deltas/ReduceOperandsToArgs.cpp
-  deltas/ReduceInstructionsMIR.cpp
   llvm-reduce.cpp
 
   DEPENDS

llvm/test/tools/llvm-reduce/mir/instr-reduce.py

@@ -24,7 +24,6 @@
 #include "deltas/ReduceGlobalVarInitializers.h"
 #include "deltas/ReduceGlobalVars.h"
 #include "deltas/ReduceInstructions.h"
-#include "deltas/ReduceInstructionsMIR.h"
 #include "deltas/ReduceMetadata.h"
 #include "deltas/ReduceModuleData.h"
 #include "deltas/ReduceOperandBundles.h"
@@ -60,16 +59,9 @@ static cl::opt<std::string>
   DELTA_PASS("attributes", reduceAttributesDeltaPass)                          \
   DELTA_PASS("module-data", reduceModuleDataDeltaPass)
 
-#define DELTA_PASSES_MIR                                                       \
-  DELTA_PASS("instructions", reduceInstructionsMIRDeltaPass)
-
 static void runAllDeltaPasses(TestRunner &Tester) {
 #define DELTA_PASS(NAME, FUNC) FUNC(Tester);
-  if (Tester.getProgram().isMIR()) {
-    DELTA_PASSES_MIR
-  } else {
-    DELTA_PASSES
-  }
+  DELTA_PASSES
 #undef DELTA_PASS
 }
 
@@ -79,11 +71,7 @@ static void runDeltaPassName(TestRunner &Tester, StringRef PassName) {
     FUNC(Tester);                                                              \
     return;                                                                    \
   }
-  if (Tester.getProgram().isMIR()) {
-    DELTA_PASSES_MIR
-  } else {
-    DELTA_PASSES
-  }
+  DELTA_PASSES
 #undef DELTA_PASS
   errs() << "unknown pass \"" << PassName << "\"";
   exit(1);
@@ -92,10 +80,7 @@ static void runDeltaPassName(TestRunner &Tester, StringRef PassName) {
 void llvm::printDeltaPasses(raw_ostream &OS) {
   OS << "Delta passes (pass to `--delta-passes=` as a comma separated list):\n";
 #define DELTA_PASS(NAME, FUNC) OS << "  " << NAME << "\n";
-  OS << " IR:\n";
   DELTA_PASSES
-  OS << " MIR:\n";
-  DELTA_PASSES_MIR
 #undef DELTA_PASS
 }
 

llvm/tools/llvm-reduce/CMakeLists.txt

@@ -12,7 +12,7 @@ using namespace llvm;
 
 TestRunner::TestRunner(StringRef TestName,
                        const std::vector<std::string> &TestArgs,
-                       std::unique_ptr<ReducerWorkItem> Program)
+                       std::unique_ptr<Module> Program)
     : TestName(TestName), TestArgs(TestArgs), Program(std::move(Program)) {
   assert(this->Program && "Initialized with null program?");
 }

llvm/tools/llvm-reduce/DeltaManager.cpp

@@ -9,7 +9,6 @@
 #ifndef LLVM_TOOLS_LLVM_REDUCE_TESTRUNNER_H
 #define LLVM_TOOLS_LLVM_REDUCE_TESTRUNNER_H
 
-#include "ReducerWorkItem.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Error.h"
@@ -26,24 +25,24 @@ namespace llvm {
 class TestRunner {
 public:
   TestRunner(StringRef TestName, const std::vector<std::string> &TestArgs,
-             std::unique_ptr<ReducerWorkItem> Program);
+             std::unique_ptr<Module> Program);
 
   /// Runs the interesting-ness test for the specified file
   /// @returns 0 if test was successful, 1 if otherwise
   int run(StringRef Filename);
 
   /// Returns the most reduced version of the original testcase
-  ReducerWorkItem &getProgram() const { return *Program; }
+  Module &getProgram() const { return *Program; }
 
-  void setProgram(std::unique_ptr<ReducerWorkItem> P) {
+  void setProgram(std::unique_ptr<Module> P) {
     assert(P && "Setting null program?");
     Program = std::move(P);
   }
 
 private:
   StringRef TestName;
   const std::vector<std::string> &TestArgs;
-  std::unique_ptr<ReducerWorkItem> Program;
+  std::unique_ptr<Module> Program;
 };
 
 } // namespace llvm