[llvm] r372282 - llvm-reduce: Add pass to reduce instructions
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 18 17:59:28 PDT 2019
Author: dblaikie
Date: Wed Sep 18 17:59:27 2019
New Revision: 372282
URL: http://llvm.org/viewvc/llvm-project?rev=372282&view=rev
Log:
llvm-reduce: Add pass to reduce instructions
Patch by Diego Treviño!
Differential Revision: https://reviews.llvm.org/D66263
Added:
llvm/trunk/test/Reduce/Inputs/remove-instructions.py (with props)
llvm/trunk/test/Reduce/remove-instructions.ll
llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.cpp
llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.h
Modified:
llvm/trunk/test/Reduce/Inputs/remove-bbs.py
llvm/trunk/test/Reduce/Inputs/remove-global-vars.py
llvm/trunk/test/Reduce/remove-global-vars.ll
llvm/trunk/tools/llvm-reduce/CMakeLists.txt
llvm/trunk/tools/llvm-reduce/DeltaManager.h
Modified: llvm/trunk/test/Reduce/Inputs/remove-bbs.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Reduce/Inputs/remove-bbs.py?rev=372282&r1=372281&r2=372282&view=diff
==============================================================================
--- llvm/trunk/test/Reduce/Inputs/remove-bbs.py (original)
+++ llvm/trunk/test/Reduce/Inputs/remove-bbs.py Wed Sep 18 17:59:27 2019
@@ -1,5 +1,4 @@
import sys
-import re
InterestingBBs = 0
input = open(sys.argv[1], "r")
Modified: llvm/trunk/test/Reduce/Inputs/remove-global-vars.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Reduce/Inputs/remove-global-vars.py?rev=372282&r1=372281&r2=372282&view=diff
==============================================================================
--- llvm/trunk/test/Reduce/Inputs/remove-global-vars.py (original)
+++ llvm/trunk/test/Reduce/Inputs/remove-global-vars.py Wed Sep 18 17:59:27 2019
@@ -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)
Added: llvm/trunk/test/Reduce/Inputs/remove-instructions.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Reduce/Inputs/remove-instructions.py?rev=372282&view=auto
==============================================================================
--- llvm/trunk/test/Reduce/Inputs/remove-instructions.py (added)
+++ llvm/trunk/test/Reduce/Inputs/remove-instructions.py Wed Sep 18 17:59:27 2019
@@ -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)
Propchange: llvm/trunk/test/Reduce/Inputs/remove-instructions.py
------------------------------------------------------------------------------
svn:executable = *
Modified: llvm/trunk/test/Reduce/remove-global-vars.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Reduce/remove-global-vars.ll?rev=372282&r1=372281&r2=372282&view=diff
==============================================================================
--- llvm/trunk/test/Reduce/remove-global-vars.ll (original)
+++ llvm/trunk/test/Reduce/remove-global-vars.ll Wed Sep 18 17:59:27 2019
@@ -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
}
Added: llvm/trunk/test/Reduce/remove-instructions.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Reduce/remove-instructions.ll?rev=372282&view=auto
==============================================================================
--- llvm/trunk/test/Reduce/remove-instructions.ll (added)
+++ llvm/trunk/test/Reduce/remove-instructions.ll Wed Sep 18 17:59:27 2019
@@ -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
+}
Modified: llvm/trunk/tools/llvm-reduce/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-reduce/CMakeLists.txt?rev=372282&r1=372281&r2=372282&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-reduce/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-reduce/CMakeLists.txt Wed Sep 18 17:59:27 2019
@@ -19,6 +19,7 @@ add_llvm_tool(llvm-reduce
deltas/ReduceMetadata.cpp
deltas/ReduceArguments.cpp
deltas/ReduceBasicBlocks.cpp
+ deltas/ReduceInstructions.cpp
DEPENDS
intrinsics_gen
Modified: llvm/trunk/tools/llvm-reduce/DeltaManager.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-reduce/DeltaManager.h?rev=372282&r1=372281&r2=372282&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-reduce/DeltaManager.h (original)
+++ llvm/trunk/tools/llvm-reduce/DeltaManager.h Wed Sep 18 17:59:27 2019
@@ -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 &T
reduceGlobalsDeltaPass(Tester);
reduceMetadataDeltaPass(Tester);
reduceArgumentsDeltaPass(Tester);
+ reduceInstructionsDeltaPass(Tester);
// TODO: Implement the remaining Delta Passes
}
Added: llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.cpp?rev=372282&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.cpp (added)
+++ llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.cpp Wed Sep 18 17:59:27 2019
@@ -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);
+}
Added: llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.h?rev=372282&view=auto
==============================================================================
--- llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.h (added)
+++ llvm/trunk/tools/llvm-reduce/deltas/ReduceInstructions.h Wed Sep 18 17:59:27 2019
@@ -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
More information about the llvm-commits
mailing list