From: David Blaikie Date: Wed, 11 Sep 2019 00:44:17 +0000 (+0000) Subject: Revert "llvm-reduce: Add pass to reduce parameters" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efbc8503693d90c69f11dd320ea3136ce524a22b;p=llvm Revert "llvm-reduce: Add pass to reduce parameters" Looks to be failing on asan buildbots This reverts commit r371567. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371580 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Reduce/Inputs/remove-args.py b/test/Reduce/Inputs/remove-args.py deleted file mode 100755 index fea62c3174e..00000000000 --- a/test/Reduce/Inputs/remove-args.py +++ /dev/null @@ -1,16 +0,0 @@ -import sys - -InterestingArgumentPresent = False -FunctionCallPresent = False - -input = open(sys.argv[1], "r") -for line in input: - if "%interesting" in line: - InterestingArgumentPresent = True - if "call void @interesting" in line: - FunctionCallPresent = True - -if InterestingArgumentPresent and FunctionCallPresent: - sys.exit(0) # Interesting! - -sys.exit(1) diff --git a/test/Reduce/remove-args.ll b/test/Reduce/remove-args.ll deleted file mode 100644 index 6aadeb57d83..00000000000 --- a/test/Reduce/remove-args.ll +++ /dev/null @@ -1,22 +0,0 @@ -; Test that llvm-reduce can remove uninteresting function arguments from function definitions as well as their calls. -; -; RUN: rm -rf %t -; RUN: mkdir %t -; copy the test file to preserve executable bit -; RUN: cp %p/Inputs/remove-args.py %t/test.py -; get the python path from lit -; RUN: echo "#!" %python > %t/test.py -; then include the rest of the test script -; RUN: cat %p/Inputs/remove-args.py >> %t/test.py - -; RUN: llvm-reduce --test %t/test.py %s -o %t/out.ll -; RUN: cat %t/out.ll | FileCheck -implicit-check-not=uninteresting %s -; REQUIRES: plugins - -; CHECK: @interesting(i32 %interesting) -define void @interesting(i32 %uninteresting1, i32 %interesting, i32 %uninteresting2) { -entry: - ; CHECK: call void @interesting(i32 0) - call void @interesting(i32 -1, i32 0, i32 -1) - ret void -} diff --git a/tools/llvm-reduce/CMakeLists.txt b/tools/llvm-reduce/CMakeLists.txt index b981ffcfc07..c13d41edd7e 100644 --- a/tools/llvm-reduce/CMakeLists.txt +++ b/tools/llvm-reduce/CMakeLists.txt @@ -20,7 +20,6 @@ add_llvm_tool(llvm-reduce deltas/ReduceFunctions.cpp deltas/ReduceGlobalVars.cpp deltas/ReduceMetadata.cpp - deltas/ReduceArguments.cpp DEPENDS intrinsics_gen diff --git a/tools/llvm-reduce/DeltaManager.h b/tools/llvm-reduce/DeltaManager.h index bee15777edc..ac848462eed 100644 --- a/tools/llvm-reduce/DeltaManager.h +++ b/tools/llvm-reduce/DeltaManager.h @@ -13,7 +13,6 @@ #include "TestRunner.h" #include "deltas/Delta.h" -#include "deltas/ReduceArguments.h" #include "deltas/ReduceFunctions.h" #include "deltas/ReduceGlobalVars.h" #include "deltas/ReduceMetadata.h" @@ -25,7 +24,6 @@ inline void runDeltaPasses(TestRunner &Tester) { reduceFunctionsDeltaPass(Tester); reduceGlobalsDeltaPass(Tester); reduceMetadataDeltaPass(Tester); - reduceArgumentsDeltaPass(Tester); // TODO: Implement the remaining Delta Passes } diff --git a/tools/llvm-reduce/deltas/ReduceArguments.cpp b/tools/llvm-reduce/deltas/ReduceArguments.cpp deleted file mode 100644 index dbd208cd8b9..00000000000 --- a/tools/llvm-reduce/deltas/ReduceArguments.cpp +++ /dev/null @@ -1,125 +0,0 @@ -//===- 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 "ReduceArguments.h" -#include "Delta.h" -#include "llvm/ADT/SmallVector.h" -#include -#include - -using namespace llvm; - -/// Goes over OldF calls and replaces them with a call to NewF -static void replaceFunctionCalls(Function &OldF, Function &NewF, - const std::set &ArgIndexesToKeep) { - for (auto *U : OldF.users()) - if (auto *CI = dyn_cast(U)) { - SmallVector Args; - for (auto ArgI = CI->arg_begin(), E = CI->arg_end(); ArgI != E; ++ArgI) - if (ArgIndexesToKeep.count(ArgI - CI->arg_begin())) - Args.push_back(*ArgI); - - CallInst *NewCI = CallInst::Create(&NewF, Args); - NewCI->setCallingConv(NewF.getCallingConv()); - if (!CI->use_empty()) - CI->replaceAllUsesWith(NewCI); - ReplaceInstWithInst(CI, NewCI); - } -} - -/// 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 extractArgumentsFromModule(std::vector ChunksToKeep, - Module *Program) { - unsigned I = 0, ArgCount = 0; - std::set ArgsToKeep; - std::vector Funcs; - // Get inside-chunk arguments, as well as their parent function - for (auto &F : *Program) - if (!F.isDeclaration()) { - Funcs.push_back(&F); - for (auto &A : F.args()) - if (I < ChunksToKeep.size()) { - if (ChunksToKeep[I].contains(++ArgCount)) - ArgsToKeep.insert(&A); - if (ChunksToKeep[I].end == ArgCount) - ++I; - } - } - - for (auto *F : Funcs) { - ValueToValueMapTy VMap; - std::vector InstToDelete; - for (auto &A : F->args()) - if (!ArgsToKeep.count(&A)) { - // By adding undesired arguments to the VMap, CloneFunction will remove - // them from the resulting Function - VMap[&A] = UndefValue::get(A.getType()); - for (auto *U : A.users()) - if (auto *I = dyn_cast(*&U)) - InstToDelete.push_back(I); - } - // Delete any instruction that uses the argument - for (auto *I : InstToDelete) { - I->replaceAllUsesWith(UndefValue::get(I->getType())); - I->eraseFromParent(); - } - - // No arguments to reduce - if (VMap.empty()) - continue; - - std::set ArgIndexesToKeep; - int ArgI = 0; - for (auto &Arg : F->args()) - if (ArgsToKeep.count(&Arg)) - ArgIndexesToKeep.insert(++ArgI); - - auto *ClonedFunc = CloneFunction(F, VMap); - // In order to preserve function order, we move Clone after old Function - ClonedFunc->removeFromParent(); - Program->getFunctionList().insertAfter(F->getIterator(), ClonedFunc); - - replaceFunctionCalls(*F, *ClonedFunc, ArgIndexesToKeep); - // Rename Cloned Function to Old's name - auto FName = F->getName(); - F->eraseFromParent(); - ClonedFunc->setName(FName); - } -} - -/// Counts the amount of arguments in non-declaration functions and prints their -/// respective name, index, and parent function name -static int countArguments(Module *Program) { - // TODO: Silence index with --quiet flag - outs() << "----------------------------\n"; - outs() << "Param Index Reference:\n"; - int ArgsCount = 0; - for (auto &F : *Program) - if (!F.isDeclaration() && F.arg_size()) { - outs() << " " << F.getName() << "\n"; - for (auto &A : F.args()) - outs() << "\t" << ++ArgsCount << ": " << A.getName() << "\n"; - - outs() << "----------------------------\n"; - } - - return ArgsCount; -} - -void llvm::reduceArgumentsDeltaPass(TestRunner &Test) { - outs() << "*** Reducing Arguments...\n"; - unsigned ArgCount = countArguments(Test.getProgram()); - runDeltaPass(Test, ArgCount, extractArgumentsFromModule); -} diff --git a/tools/llvm-reduce/deltas/ReduceArguments.h b/tools/llvm-reduce/deltas/ReduceArguments.h deleted file mode 100644 index d9682b44f74..00000000000 --- a/tools/llvm-reduce/deltas/ReduceArguments.h +++ /dev/null @@ -1,21 +0,0 @@ -//===- 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/IR/Argument.h" -#include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "llvm/Transforms/Utils/Cloning.h" - -namespace llvm { -void reduceArgumentsDeltaPass(TestRunner &Test); -} // namespace llvm