llvm-reduce: Add pass to reduce instructions

Patch by Diego Treviño!

Differential Revision: https://reviews.llvm.org/D66263

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@372282 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Reduce/Inputs/remove-bbs.py b/test/Reduce/Inputs/remove-bbs.py
index 099e87813968c25cb9fd0e11535dd2b6e34d80e3..71f099daaba0648cc6da79850a64ded683623d4b 100755 (executable)
--- a/test/Reduce/Inputs/remove-bbs.py
+++ b/test/Reduce/Inputs/remove-bbs.py
@@ -1,5 +1,4 @@
 import sys
-import re
 
 InterestingBBs = 0
 input = open(sys.argv[1], "r")

diff --git a/test/Reduce/Inputs/remove-global-vars.py b/test/Reduce/Inputs/remove-global-vars.py
index 81fbea937ddf2fdaf36ca635e7f5f6544494dd31..1ae8b0e6e76cad164d4f1fcefba048a89e7b7851 100755 (executable)
--- a/test/Reduce/Inputs/remove-global-vars.py
+++ b/test/Reduce/Inputs/remove-global-vars.py
@@ -2,9 +2,17 @@
 
 import sys
 
+InterestingVar = 0
+
 input = open(sys.argv[1], "r")
 for line in input:
-  if "@interesting = global" in line:
-    sys.exit(0)
+  i = line.find(';')
+  if i >= 0:
+    line = line[:i]
+  if line.startswith("@interesting = global") or "@interesting" in line:
+    InterestingVar += 1
+
+if InterestingVar == 4:
+  sys.exit(0) # interesting!
 
-sys.exit(1) # IR isn't interesting
+sys.exit(1)

diff --git a/test/Reduce/Inputs/remove-instructions.py b/test/Reduce/Inputs/remove-instructions.py
new file mode 100755 (executable)
index 0000000..df4d85d
--- /dev/null
+++ b/test/Reduce/Inputs/remove-instructions.py
@@ -0,0 +1,17 @@
+import sys
+
+InterestingInstructions = 0
+
+input = open(sys.argv[1], "r")
+for line in input:
+  i = line.find(';')
+  if i >= 0:
+    line = line[:i]
+  if "%interesting" in line:
+    InterestingInstructions += 1
+  print InterestingInstructions
+
+if InterestingInstructions == 5:
+  sys.exit(0) # interesting!
+
+sys.exit(1)

diff --git a/test/Reduce/remove-global-vars.ll b/test/Reduce/remove-global-vars.ll
index 003577d270470eec27d71abf13da1be21ded2666..921083fc93b0f48b1b202575275a6b4643d93023 100644 (file)
--- a/test/Reduce/remove-global-vars.ll
+++ b/test/Reduce/remove-global-vars.ll
@@ -19,9 +19,7 @@ entry:
   %1 = load i32, i32* @interesting, align 4
   store i32 %1, i32* @uninteresting, align 4
 
-  ; CHECK: %inc = add nsw i32 undef, 1
-  %inc = add nsw i32 %0, 1
-  ; CHECK: store i32 %inc, i32* @interesting, align 4
-  store i32 %inc, i32* @interesting, align 4
+  ; CHECK: store i32 5, i32* @interesting, align 4
+  store i32 5, i32* @interesting, align 4
   ret i32 0
 }

diff --git a/test/Reduce/remove-instructions.ll b/test/Reduce/remove-instructions.ll
new file mode 100644 (file)
index 0000000..101351a
--- /dev/null
+++ b/test/Reduce/remove-instructions.ll
@@ -0,0 +1,23 @@
+; Test that llvm-reduce can remove uninteresting instructions.
+;
+; RUN: llvm-reduce --test %python --test-arg %p/Inputs/remove-instructions.py %s -o %t
+; RUN: cat %t | FileCheck -implicit-check-not=uninteresting %s
+; REQUIRES: plugins
+
+; We're testing all direct uses of %interesting are conserved
+; CHECK-COUNT-5: %interesting
+define i32 @main() #0 {
+entry:
+  %uninteresting1 = alloca i32, align 4
+  %interesting = alloca i32, align 4
+  %uninteresting2 = alloca i32, align 4
+  store i32 0, i32* %uninteresting1, align 4
+  store i32 0, i32* %interesting, align 4
+  %0 = load i32, i32* %interesting, align 4
+  %uninteresting3 = add nsw i32 %0, 1
+  store i32 %uninteresting3, i32* %interesting, align 4
+  %1 = load i32, i32* %interesting, align 4
+  store i32 %1, i32* %uninteresting2, align 4
+  ; CHECK-NOT: ret
+  ret i32 0
+}

diff --git a/tools/llvm-reduce/CMakeLists.txt b/tools/llvm-reduce/CMakeLists.txt
index a8ac76f2f6b693c5fbd9db52888b99d090cd82de..48de0ffa78a10d1fd67c9255a0e84c3010f375f9 100644 (file)
--- a/tools/llvm-reduce/CMakeLists.txt
+++ b/tools/llvm-reduce/CMakeLists.txt
@@ -19,6 +19,7 @@ add_llvm_tool(llvm-reduce
   deltas/ReduceMetadata.cpp
   deltas/ReduceArguments.cpp
   deltas/ReduceBasicBlocks.cpp
+  deltas/ReduceInstructions.cpp
 
   DEPENDS
   intrinsics_gen

diff --git a/tools/llvm-reduce/DeltaManager.h b/tools/llvm-reduce/DeltaManager.h
index 08d4139a6648ef466cb5a037f2b576bda7616b67..2309c3adf4e6c7d300d8a84d870e03d6ba28db9a 100644 (file)
--- a/tools/llvm-reduce/DeltaManager.h
+++ b/tools/llvm-reduce/DeltaManager.h
@@ -18,6 +18,7 @@
 #include "deltas/ReduceFunctions.h"
 #include "deltas/ReduceGlobalVars.h"
 #include "deltas/ReduceMetadata.h"
+#include "deltas/ReduceInstructions.h"
 
 namespace llvm {
 
@@ -28,6 +29,7 @@ inline void runDeltaPasses(TestRunner &Tester) {
   reduceGlobalsDeltaPass(Tester);
   reduceMetadataDeltaPass(Tester);
   reduceArgumentsDeltaPass(Tester);
+  reduceInstructionsDeltaPass(Tester);
   // TODO: Implement the remaining Delta Passes
 }
 

diff --git a/tools/llvm-reduce/deltas/ReduceInstructions.cpp b/tools/llvm-reduce/deltas/ReduceInstructions.cpp
new file mode 100644 (file)
index 0000000..c6b7982
--- /dev/null
+++ b/tools/llvm-reduce/deltas/ReduceInstructions.cpp
@@ -0,0 +1,66 @@
+//===- ReduceArguments.cpp - Specialized Delta Pass -----------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements a function which calls the Generic Delta pass in order
+// to reduce uninteresting Arguments from defined functions.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ReduceInstructions.h"
+
+using namespace llvm;
+
+/// Removes out-of-chunk arguments from functions, and modifies their calls
+/// accordingly. It also removes allocations of out-of-chunk arguments.
+/// @returns the Module stripped of out-of-chunk functions
+static void extractInstrFromModule(std::vector<Chunk> ChunksToKeep,
+                                   Module *Program) {
+  int I = 0, InstCount = 0;
+  std::set<Instruction *> InstToKeep;
+
+  for (auto &F : *Program)
+    for (auto &BB : F)
+      for (auto &Inst : BB)
+        if (I < (int)ChunksToKeep.size()) {
+          if (ChunksToKeep[I].contains(++InstCount))
+            InstToKeep.insert(&Inst);
+          if (ChunksToKeep[I].end == InstCount)
+            ++I;
+        }
+
+  std::vector<Instruction *> InstToDelete;
+  for (auto &F : *Program)
+    for (auto &BB : F)
+      for (auto &Inst : BB)
+        if (!InstToKeep.count(&Inst)) {
+          Inst.replaceAllUsesWith(UndefValue::get(Inst.getType()));
+          InstToDelete.push_back(&Inst);
+        }
+
+  for (auto &I : InstToDelete)
+    I->eraseFromParent();
+}
+
+/// Counts the amount of basic blocks and prints their name & respective index
+static unsigned countInstructions(Module *Program) {
+  // TODO: Silence index with --quiet flag
+  outs() << "----------------------------\n";
+  int InstCount = 0;
+  for (auto &F : *Program)
+    for (auto &BB : F)
+        InstCount += BB.getInstList().size();
+  outs() << "Number of instructions: " << InstCount << "\n";
+
+  return InstCount;
+}
+
+void llvm::reduceInstructionsDeltaPass(TestRunner &Test) {
+  outs() << "*** Reducing Insructions...\n";
+  unsigned InstCount = countInstructions(Test.getProgram());
+  runDeltaPass(Test, InstCount, extractInstrFromModule);
+}

diff --git a/tools/llvm-reduce/deltas/ReduceInstructions.h b/tools/llvm-reduce/deltas/ReduceInstructions.h
new file mode 100644 (file)
index 0000000..a9266ac
--- /dev/null
+++ b/tools/llvm-reduce/deltas/ReduceInstructions.h
@@ -0,0 +1,20 @@
+//===- ReduceArguments.h - Specialized Delta Pass -------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements a function which calls the Generic Delta pass in order
+// to reduce uninteresting Arguments from defined functions.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Delta.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
+#include "llvm/Transforms/Utils/Cloning.h"
+
+namespace llvm {
+void reduceInstructionsDeltaPass(TestRunner &Test);
+} // namespace llvm