[llvm-reduce] Attempt to inline calls

[arsenm]

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

25

Can you get away without building this vector if you use make_early_inc on the block and instruction ranges?

[aeubanks]

use make_early_inc_range()
initially I only wanted to do one level of inlining everywhere, but we'd go through all of them anyway if we try running the pass again

[arsenm]

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

20

Unused variable

llvm/tools/llvm-reduce/deltas/InlineCalls.h

1

Missing C++ mode comment

[aeubanks]

I realized that this may badly handle mutually recursive functions, need to think about how to handle that

llvm/test/tools/llvm-reduce/inline-calls.ll

+; RUN: llvm-reduce --delta-passes=inline-calls --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: FileCheck --check-prefixes=CHECK-FINAL --input-file=%t %s
+
+; CHECK-INTERESTINGNESS: define i32 @fn1
+; CHECK-INTERESTINGNESS: define i32 @fn2
+
+; CHECK-FINAL-NOT: call i32
+; CHECK-FINAL: @fn1
+; CHECK-FINAL: add
+; CHECK-FINAL: @fn2
+; CHECK-FINAL: add
+
+define i32 @fn1(i32 %a) {
+  %b = call i32 @fn2(i32 %a)
+  ret i32 %b
+}
+
+define i32 @fn2(i32 %a) {
+  %b = add i32 %a, 1
+  ret i32 %b
+}
+
+declare i32 @llvm.f(i32)
+
+define i32 @fn3(i32 %a) {
+  %b = call i32 @llvm.f(i32 %a)
+  ret i32 %b
+}

llvm/tools/llvm-reduce/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   )
 
 add_llvm_tool(llvm-reduce
   DeltaManager.cpp
   ReducerWorkItem.cpp
   TestRunner.cpp
   deltas/Delta.cpp
   deltas/Utils.cpp
+  deltas/InlineCalls.cpp
   deltas/ReduceAliases.cpp
   deltas/ReduceArguments.cpp
   deltas/ReduceAttributes.cpp
   deltas/ReduceBasicBlocks.cpp
   deltas/ReduceDIMetadata.cpp
   deltas/ReduceFunctionBodies.cpp
   deltas/ReduceFunctions.cpp
   deltas/ReduceGlobalObjects.cpp

llvm/tools/llvm-reduce/DeltaManager.cpp

 // file.
 //
 //===----------------------------------------------------------------------===//
 
 #include "DeltaManager.h"
 #include "ReducerWorkItem.h"
 #include "TestRunner.h"
 #include "deltas/Delta.h"
+#include "deltas/InlineCalls.h"
 #include "deltas/ReduceAliases.h"
 #include "deltas/ReduceArguments.h"
 #include "deltas/ReduceAttributes.h"
 #include "deltas/ReduceBasicBlocks.h"
 #include "deltas/ReduceDIMetadata.h"
 #include "deltas/ReduceFunctionBodies.h"
 #include "deltas/ReduceFunctions.h"
 #include "deltas/ReduceGlobalObjects.h"
do {                                                                         \
     DELTA_PASS("ir-passes", runIRPassesDeltaPass)                              \
     DELTA_PASS("operands-zero", reduceOperandsZeroDeltaPass)                   \
     DELTA_PASS("operands-one", reduceOperandsOneDeltaPass)                     \
     DELTA_PASS("operands-nan", reduceOperandsNaNDeltaPass)                     \
     DELTA_PASS("operands-to-args", reduceOperandsToArgsDeltaPass)              \
     DELTA_PASS("operands-skip", reduceOperandsSkipDeltaPass)                   \
     DELTA_PASS("operand-bundles", reduceOperandBundesDeltaPass)                \
     DELTA_PASS("simplify-cfg", reduceUsingSimplifyCFGDeltaPass)                \
+    DELTA_PASS("inline-calls", inlineCallsDeltaPass)                           \
     DELTA_PASS("attributes", reduceAttributesDeltaPass)                        \
     DELTA_PASS("module-data", reduceModuleDataDeltaPass)                       \
     DELTA_PASS("opcodes", reduceOpcodesDeltaPass)                              \
   } while (false)
 
 #define DELTA_PASSES_MIR                                                       \
   do {                                                                         \
     DELTA_PASS("instructions", reduceInstructionsMIRDeltaPass)                 \

llvm/tools/llvm-reduce/deltas/InlineCalls.h

+//===- InlineCalls.h ------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TOOLS_LLVM_REDUCE_DELTAS_INLINECALLS_H
+#define LLVM_TOOLS_LLVM_REDUCE_DELTAS_INLINECALLS_H
+
+#include "Delta.h"
+
+namespace llvm {
+void inlineCallsDeltaPass(TestRunner &Test);
+} // namespace llvm
+
+#endif

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

+//===- InlineCalls.cpp ----------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "InlineCalls.h"
+#include "Delta.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/IR/InstIterator.h"
+#include "llvm/Transforms/Utils/Cloning.h"
+
+using namespace llvm;
+
+/// Removes all aliases aren't inside any of the
+/// desired Chunks.
+static void inlineCalls(Oracle &O, Module &Program) {
+  std::vector<CallBase *> CBs;
+  for (Function &F : Program.functions()) {
+    for (BasicBlock &BB : make_early_inc_range(F)) {
+      for (Instruction &I : make_early_inc_range(BB)) {
+        if (auto *CB = dyn_cast<CallBase>(&I);
+            CB && !CB->isIndirectCall() &&
+            !CB->getCalledFunction()->isIntrinsic()) {
+          if (O.shouldKeep())
+            continue;
+
+          InlineFunctionInfo IFI;
+          // There are various cases where inlining can fail; we don't want to
+          // copy all those conditions here to check beforehand if inlining will
+          // fail, so *shrug* if some fail.
+          InlineFunction(*CB, IFI);
+        }
+      }
+    }
+  }
+}
+
+void llvm::inlineCallsDeltaPass(TestRunner &Test) {
+  errs() << "*** Inlining calls ...\n";
+  runDeltaPass(Test, inlineCalls);
+  errs() << "----------------------------\n";
+}

llvm/utils/gn/secondary/llvm/tools/llvm-reduce/BUILD.gn

deps = [
     "//llvm/lib/Transforms/Utils",
   ]
   include_dirs = [ "." ]
   sources = [
     "DeltaManager.cpp",
     "ReducerWorkItem.cpp",
     "TestRunner.cpp",
     "deltas/Delta.cpp",
+    "deltas/InlineCalls.cpp",
     "deltas/ReduceAliases.cpp",
     "deltas/ReduceArguments.cpp",
     "deltas/ReduceAttributes.cpp",
     "deltas/ReduceBasicBlocks.cpp",
     "deltas/ReduceDIMetadata.cpp",
     "deltas/ReduceFunctionBodies.cpp",
     "deltas/ReduceFunctions.cpp",
     "deltas/ReduceGlobalObjects.cpp",