[llvm-reduce] Check if reduction fails/is redundant before invoking oracle

[aeubanks]

Summary

So we don't over count the number of chunks and do unnecessary work reducing more chunks than exist.

This lowers some random reduction I tested with locally from 250s to 232s.

[aeubanks]

update

llvm/test/tools/llvm-reduce/oracle-count.ll

+; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2>&1 | FileCheck %s --check-prefix=CHECK-LOG
+; RUN: FileCheck --check-prefixes=CHECK-FINAL --input-file=%t %s
+
+; CHECK-INTERESTINGNESS: ret i32
+; CHECK-FINAL: ret i32 0
+
+; Test that we don't invoke the oracle more than necessary (e.g. check the
+; oracle then perform some failable/redundant reduction, as opposed to check if
+; a reduction will fail/be redundant before invoking the oracle). This prevents
+; overestimation of the number of possible reductions and the number of times we
+; attempt to reduce.
+
+; IR passes
+; CHECK-LOG: Saved new best reduction
+; Module data
+; CHECK-LOG: Saved new best reduction
+; SimplifyCFG
+; CHECK-LOG: Saved new best reduction
+; CHECK-LOG-NOT: Saved new best reduction
+
+define i32 @f() {
+  ret i32 0
+}
 No newline at end of file

llvm/tools/llvm-reduce/deltas/ReduceOpcodes.cpp

static Value *reduceInstruction(Module &M, Instruction &I) {
 
   return nullptr;
 }
 
 static void replaceOpcodesInModule(Oracle &O, Module &Mod) {
   for (Function &F : Mod) {
     for (BasicBlock &BB : F)
       for (Instruction &I : make_early_inc_range(BB)) {
-        if (O.shouldKeep())
-          continue;
 
         Instruction *Replacement =
             dyn_cast_or_null<Instruction>(reduceInstruction(Mod, I));
         if (Replacement && Replacement != &I) {
+          if (O.shouldKeep())
+            continue;
+
           if (isa<FPMathOperator>(Replacement))
             Replacement->copyFastMathFlags(&I);
 
           Replacement->copyIRFlags(&I);
           Replacement->copyMetadata(I);
           Replacement->takeName(&I);
           I.replaceAllUsesWith(Replacement);
           I.eraseFromParent();
         }
       }
   }
 }
 
 void llvm::reduceOpcodesDeltaPass(TestRunner &Test) {
   runDeltaPass(Test, replaceOpcodesInModule, "Reducing Opcodes");
 }

llvm/tools/llvm-reduce/deltas/ReduceOperands.cpp

for (auto &I : instructions(&F)) {
               Phi->setIncomingValueForBlock(Phi->getIncomingBlock(Op), Reduced);
           }
         }
 
         continue;
       }
 
       for (auto &Op : I.operands()) {
-        if (!O.shouldKeep()) {
-          if (Value *Reduced = ReduceValue(Op))
+        if (Value *Reduced = ReduceValue(Op)) {
+          if (!O.shouldKeep())
             Op.set(Reduced);
         }
       }
     }
   }
 }
 
 static bool isOne(Use &Op) {

llvm/tools/llvm-reduce/deltas/SimplifyInstructions.cpp

static void extractInstrFromModule(Oracle &O, Module &Program) {
   std::vector<Instruction *> InstsToDelete;
 
   const DataLayout &DL = Program.getDataLayout();
 
   std::vector<Instruction *> InstToDelete;
   for (auto &F : Program) {
     for (auto &BB : F) {
       for (auto &Inst : BB) {
-        if (O.shouldKeep())
-          continue;
 
         SimplifyQuery Q(DL, &Inst);
         if (Value *Simplified = simplifyInstruction(&Inst, Q)) {
+          if (O.shouldKeep())
+            continue;
           Inst.replaceAllUsesWith(Simplified);
           InstToDelete.push_back(&Inst);
         }
       }
     }
   }
 
   for (Instruction *I : InstToDelete)
     I->eraseFromParent();
 }
 
 void llvm::simplifyInstructionsDeltaPass(TestRunner &Test) {
   runDeltaPass(Test, extractInstrFromModule, "Simplifying Instructions");
 }