Skip to content

Add a new -sil-disable-only-function flag #32622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2020
Merged

Add a new -sil-disable-only-function flag #32622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions lib/SILOptimizer/PassManager/PassManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ llvm::cl::list<std::string>
SILDisablePass("sil-disable-pass", llvm::cl::CommaSeparated,
llvm::cl::desc("Disable passes "
"which contain a string from this list"));
llvm::cl::list<std::string> SILDisablePassOnlyFun(
"sil-disable-pass-only-function", llvm::cl::CommaSeparated,
llvm::cl::desc("Apply -sil-disable-pass only on this function"));

llvm::cl::list<std::string> SILVerifyBeforePass(
"sil-verify-before-pass", llvm::cl::CommaSeparated,
Expand Down Expand Up @@ -204,7 +207,13 @@ static bool doPrintAfter(SILTransform *T, SILFunction *F, bool Default) {
return Default;
}

static bool isDisabled(SILTransform *T) {
static bool isDisabled(SILTransform *T, SILFunction *F = nullptr) {
if (!SILDisablePassOnlyFun.empty() && F &&
SILDisablePassOnlyFun.end() == std::find(SILDisablePassOnlyFun.begin(),
SILDisablePassOnlyFun.end(),
F->getName()))
return false;

for (const std::string &NamePattern : SILDisablePass) {
if (T->getTag().find(NamePattern) != StringRef::npos
|| T->getID().find(NamePattern) != StringRef::npos) {
Expand Down Expand Up @@ -395,7 +404,7 @@ void SILPassManager::runPassOnFunction(unsigned TransIdx, SILFunction *F) {
return;
}

if (isDisabled(SFT)) {
if (isDisabled(SFT, F)) {
if (SILPrintPassName)
dumpPassInfo("(Disabled)", TransIdx, F);
return;
Expand Down
25 changes: 25 additions & 0 deletions test/SILOptimizer/testflag_disable_pass_only.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// RUN: %target-swift-frontend -emit-sil %s -Xllvm -sil-disable-pass=AllocBoxToStack -Xllvm -sil-disable-pass-only-function='$s26testflag_disable_pass_only4foo1yyF' | %FileCheck %s

// CHECK-LABEL: sil hidden [noinline] @$s26testflag_disable_pass_only4foo1yyF :
// CHECK: alloc_box
// CHECK-LABEL: } // end sil function '$s26testflag_disable_pass_only4foo1yyF'
@inline(never)
func foo1() {
var a = 100
@inline(never)
func bar() {
print(a)
}
}

// CHECK-LABEL: sil hidden [noinline] @$s26testflag_disable_pass_only4foo2yyF :
// CHECK-NOT: alloc_box
// CHECK-LABEL: } // end sil function '$s26testflag_disable_pass_only4foo2yyF'
@inline(never)
func foo2() {
var a = 100
@inline(never)
func bar() {
print(a)
}
}