RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-25 04:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PM] Fix a bunch of bugs I spotted by inspection when working on this

Browse Source 
code. Copious tests added to cover these cases.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199039 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth 2014-01-12 10:02:02 +00:00
parent e7687650c9
commit 83bdd1d763
2 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
test/Other/pass-pipeline-parsing.ll
View File

@ -55,6 +55,56 @@
; CHECK-MIXED-FP-AND-MP: Running module pass: NoOpModulePass ; CHECK-MIXED-FP-AND-MP: Running module pass: NoOpModulePass
; CHECK-MIXED-FP-AND-MP: Finished module pass manager ; CHECK-MIXED-FP-AND-MP: Finished module pass manager
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='no-op-module)' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED1
; CHECK-UNBALANCED1: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='module(no-op-module))' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED2
; CHECK-UNBALANCED2: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='module(no-op-module' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED3
; CHECK-UNBALANCED3: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='no-op-function)' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED4
; CHECK-UNBALANCED4: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='function(no-op-function))' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED5
; CHECK-UNBALANCED5: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='function(function(no-op-function)))' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED6
; CHECK-UNBALANCED6: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='function(no-op-function' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED7
; CHECK-UNBALANCED7: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='function(function(no-op-function)' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED8
; CHECK-UNBALANCED8: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='no-op-module,)' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED9
; CHECK-UNBALANCED9: unable to parse pass pipeline description
; RUN: not opt -disable-output -debug-pass-manager \
; RUN: -passes='no-op-function,)' %s 2>&1 \
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED10
; CHECK-UNBALANCED10: unable to parse pass pipeline description
define void @f() { define void @f() {
ret void ret void
} }

28
tools/opt/Passes.cpp
View File

@ -50,7 +50,6 @@ static bool isFunctionPassName(StringRef Name) {
} }
static bool parseModulePassName(ModulePassManager &MPM, StringRef Name) { static bool parseModulePassName(ModulePassManager &MPM, StringRef Name) {
assert(isModulePassName(Name));
if (Name == "no-op-module") { if (Name == "no-op-module") {
MPM.addPass(NoOpModulePass()); MPM.addPass(NoOpModulePass());
return true; return true;
@ -59,7 +58,6 @@ static bool parseModulePassName(ModulePassManager &MPM, StringRef Name) {
} }
static bool parseFunctionPassName(FunctionPassManager &FPM, StringRef Name) { static bool parseFunctionPassName(FunctionPassManager &FPM, StringRef Name) {
assert(isFunctionPassName(Name));
if (Name == "no-op-function") { if (Name == "no-op-function") {
FPM.addPass(NoOpFunctionPass()); FPM.addPass(NoOpFunctionPass());
return true; return true;
@ -76,9 +74,10 @@ static bool parseFunctionPassPipeline(FunctionPassManager &FPM,
// Parse the inner pipeline inte the nested manager. // Parse the inner pipeline inte the nested manager.
PipelineText = PipelineText.substr(strlen("function(")); PipelineText = PipelineText.substr(strlen("function("));
if (!parseFunctionPassPipeline(NestedFPM, PipelineText)) if (!parseFunctionPassPipeline(NestedFPM, PipelineText) ||
PipelineText.empty())
return false; return false;
assert(!PipelineText.empty() && PipelineText[0] == ')'); assert(PipelineText[0] == ')');
PipelineText = PipelineText.substr(1); PipelineText = PipelineText.substr(1);
// Add the nested pass manager with the appropriate adaptor. // Add the nested pass manager with the appropriate adaptor.
@ -109,9 +108,10 @@ static bool parseModulePassPipeline(ModulePassManager &MPM,
// Parse the inner pipeline into the nested manager. // Parse the inner pipeline into the nested manager.
PipelineText = PipelineText.substr(strlen("module(")); PipelineText = PipelineText.substr(strlen("module("));
if (!parseModulePassPipeline(NestedMPM, PipelineText)) if (!parseModulePassPipeline(NestedMPM, PipelineText) ||
PipelineText.empty())
return false; return false;
assert(!PipelineText.empty() && PipelineText[0] == ')'); assert(PipelineText[0] == ')');
PipelineText = PipelineText.substr(1); PipelineText = PipelineText.substr(1);
// Now add the nested manager as a module pass. // Now add the nested manager as a module pass.
@ -121,9 +121,10 @@ static bool parseModulePassPipeline(ModulePassManager &MPM,
// Parse the inner pipeline inte the nested manager. // Parse the inner pipeline inte the nested manager.
PipelineText = PipelineText.substr(strlen("function(")); PipelineText = PipelineText.substr(strlen("function("));
if (!parseFunctionPassPipeline(NestedFPM, PipelineText)) if (!parseFunctionPassPipeline(NestedFPM, PipelineText) ||
PipelineText.empty())
return false; return false;
assert(!PipelineText.empty() && PipelineText[0] == ')'); assert(PipelineText[0] == ')');
PipelineText = PipelineText.substr(1); PipelineText = PipelineText.substr(1);
// Add the nested pass manager with the appropriate adaptor. // Add the nested pass manager with the appropriate adaptor.
@ -151,23 +152,24 @@ static bool parseModulePassPipeline(ModulePassManager &MPM,
bool llvm::parsePassPipeline(ModulePassManager &MPM, StringRef PipelineText) { bool llvm::parsePassPipeline(ModulePassManager &MPM, StringRef PipelineText) {
// Look at the first entry to figure out which layer to start parsing at. // Look at the first entry to figure out which layer to start parsing at.
if (PipelineText.startswith("module(")) if (PipelineText.startswith("module("))
return parseModulePassPipeline(MPM, PipelineText); return parseModulePassPipeline(MPM, PipelineText) && PipelineText.empty();
if (PipelineText.startswith("function(")) { if (PipelineText.startswith("function(")) {
FunctionPassManager FPM; FunctionPassManager FPM;
if (!parseFunctionPassPipeline(FPM, PipelineText)) if (!parseFunctionPassPipeline(FPM, PipelineText) || !PipelineText.empty())
return false; return false;
MPM.addPass(createModuleToFunctionPassAdaptor(FPM)); MPM.addPass(createModuleToFunctionPassAdaptor(FPM));
return true; return true;
} }
// This isn't a direct pass manager name, look for the end of a pass name. // This isn't a direct pass manager name, look for the end of a pass name.
StringRef FirstName = PipelineText.substr(0, PipelineText.find_first_of(",")); StringRef FirstName =
PipelineText.substr(0, PipelineText.find_first_of(",)"));
if (isModulePassName(FirstName)) if (isModulePassName(FirstName))
return parseModulePassPipeline(MPM, PipelineText); return parseModulePassPipeline(MPM, PipelineText) && PipelineText.empty();
if (isFunctionPassName(FirstName)) { if (isFunctionPassName(FirstName)) {
FunctionPassManager FPM; FunctionPassManager FPM;
if (!parseFunctionPassPipeline(FPM, PipelineText)) if (!parseFunctionPassPipeline(FPM, PipelineText) || !PipelineText.empty())
return false; return false;
MPM.addPass(createModuleToFunctionPassAdaptor(FPM)); MPM.addPass(createModuleToFunctionPassAdaptor(FPM));
return true; return true;