replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[llvm-extract] Expose the group extraction feature of the BlockExtractor 

This patch extends the `-bb` option to be able to use the group
extraction feature from the BlockExtractor.
In particular, `-bb=func:bb` is modified to support a list of basic
blocks per function: `-bb=func:bb1[;bb2...]` that will be extracted
together if at all possible (region must be single entry.)

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

llvm-svn: 359464
This commit is contained in:
Quentin Colombet 2019-04-29 16:14:03 +00:00
parent 31ce274207
commit 2d977935a2
2 changed files with 143 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
llvm/test/tools/llvm-extract/extract-blocks-with-groups.ll Normal file
View File

@ -0,0 +1,124 @@
; RUN: llvm-extract -bb 'foo:if;then;else' -bb 'bar:bb14;bb20' -S %s | FileCheck %s
; Extract two groups of basic blocks in two different functions.
; The first extracted function is the region composed by the
; blocks if, then, and else from foo.
; CHECK: define dso_local void @foo.if.split(i32 %arg1, i32 %arg, i32* %tmp.0.ce.out) {
; CHECK: newFuncRoot:
; CHECK: br label %if.split
;
; CHECK: end.exitStub: ; preds = %end.split
; CHECK: ret void
;
; CHECK: then: ; preds = %if.split
; CHECK: %tmp12 = shl i32 %arg1, 2
; CHECK: %tmp13 = add nsw i32 %tmp12, %arg
; CHECK: br label %end.split
;
; CHECK: else: ; preds = %if.split
; CHECK: %tmp22 = mul nsw i32 %arg, 3
; CHECK: %tmp24 = sdiv i32 %arg1, 6
; CHECK: %tmp25 = add nsw i32 %tmp24, %tmp22
; CHECK: br label %end.split
;
; CHECK: if.split: ; preds = %newFuncRoot
; CHECK: %tmp5 = icmp sgt i32 %arg, 0
; CHECK: %tmp8 = icmp sgt i32 %arg1, 0
; CHECK: %or.cond = and i1 %tmp5, %tmp8
; CHECK: br i1 %or.cond, label %then, label %else
;
; CHECK: end.split: ; preds = %then, %else
; CHECK: %tmp.0.ce = phi i32 [ %tmp13, %then ], [ %tmp25, %else ]
; CHECK: store i32 %tmp.0.ce, i32* %tmp.0.ce.out
; CHECK: br label %end.exitStub
; CHECK: }
; The second extracted function is the region composed by the blocks
; bb14 and bb20 from bar.
; CHECK: define dso_local i1 @bar.bb14(i32 %arg1, i32 %arg, i32* %tmp25.out) {
; CHECK: newFuncRoot:
; CHECK: br label %bb14
;
; CHECK: bb26.exitStub: ; preds = %bb14
; CHECK: ret i1 true
;
; CHECK: bb30.exitStub: ; preds = %bb20
; CHECK: ret i1 false
;
; CHECK: bb14: ; preds = %newFuncRoot
; CHECK: %tmp0 = and i32 %arg1, %arg
; CHECK: %tmp1 = icmp slt i32 %tmp0, 0
; CHECK: br i1 %tmp1, label %bb20, label %bb26.exitStub
;
; CHECK: bb20: ; preds = %bb14
; CHECK: %tmp22 = mul nsw i32 %arg, 3
; CHECK: %tmp24 = sdiv i32 %arg1, 6
; CHECK: %tmp25 = add nsw i32 %tmp24, %tmp22
; CHECK: store i32 %tmp25, i32* %tmp25.out
; CHECK: br label %bb30.exitStub
; CHECK: }
define i32 @foo(i32 %arg, i32 %arg1) {
if:
%tmp5 = icmp sgt i32 %arg, 0
%tmp8 = icmp sgt i32 %arg1, 0
%or.cond = and i1 %tmp5, %tmp8
br i1 %or.cond, label %then, label %else
then:
%tmp12 = shl i32 %arg1, 2
%tmp13 = add nsw i32 %tmp12, %arg
br label %end
else:
%tmp22 = mul nsw i32 %arg, 3
%tmp24 = sdiv i32 %arg1, 6
%tmp25 = add nsw i32 %tmp24, %tmp22
br label %end
end:
%tmp.0 = phi i32 [ %tmp13, %then ], [ %tmp25, %else ]
%and0 = and i32 %tmp.0, %arg
%cmp1 = icmp slt i32 %and0, 0
br i1 %cmp1, label %ret0, label %ret1
ret0:
ret i32 0
ret1:
ret i32 1
}
define i32 @bar(i32 %arg, i32 %arg1) {
bb:
%tmp5 = icmp sgt i32 %arg, 0
%tmp8 = icmp sgt i32 %arg1, 0
%or.cond = and i1 %tmp5, %tmp8
br i1 %or.cond, label %bb9, label %bb14
bb9: ; preds = %bb
%tmp12 = shl i32 %arg1, 2
%tmp13 = add nsw i32 %tmp12, %arg
br label %bb30
bb14: ; preds = %bb
%tmp0 = and i32 %arg1, %arg
%tmp1 = icmp slt i32 %tmp0, 0
br i1 %tmp1, label %bb20, label %bb26
bb20: ; preds = %bb14
%tmp22 = mul nsw i32 %arg, 3
%tmp24 = sdiv i32 %arg1, 6
%tmp25 = add nsw i32 %tmp24, %tmp22
br label %bb30
bb26: ; preds = %bb14
%tmp29 = sub nsw i32 %arg, %arg1
br label %bb30
bb30: ; preds = %bb26, %bb20, %bb9
%tmp.0 = phi i32 [ %tmp13, %bb9 ], [ %tmp25, %bb20 ], [ %tmp29, %bb26 ]
ret i32 %tmp.0
}

15
llvm/tools/llvm-extract/llvm-extract.cpp
View File

@ -229,7 +229,7 @@ int main(int argc, char **argv) {
}
// Figure out which BasicBlocks we should extract.
SmallVector<BasicBlock *, 4> BBs;
SmallVector<SmallVector<BasicBlock *, 16>, 4> GroupOfBBs;
for (StringRef StrPair : ExtractBlocks) {
auto BBInfo = StrPair.split(':');
// Get the function.
@ -241,9 +241,14 @@ int main(int argc, char **argv) {
}
// Do not materialize this function.
GVs.insert(F);
// Get the basic block.
// Get the basic blocks.
SmallVector<BasicBlock *, 16> BBs;
SmallVector<StringRef, 16> BBNames;
BBInfo.second.split(BBNames, ';', /*MaxSplit=*/-1,
/*KeepEmpty=*/false);
for (StringRef BBName : BBNames) {
auto Res = llvm::find_if(*F, [&](const BasicBlock &BB) {
return BB.getName().equals(BBInfo.second);
return BB.getName().equals(BBName);
});
if (Res == F->end()) {
errs() << argv[0] << ": function " << F->getName()
@ -253,6 +258,8 @@ int main(int argc, char **argv) {
}
BBs.push_back(&*Res);
}
GroupOfBBs.push_back(BBs);
}
// Use *argv instead of argv[0] to work around a wrong GCC warning.
ExitOnError ExitOnErr(std::string(*argv) + ": error reading input: ");
@ -316,7 +323,7 @@ int main(int argc, char **argv) {
// functions.
if (!ExtractBlocks.empty()) {
legacy::PassManager PM;
PM.add(createBlockExtractorPass(BBs, true));
PM.add(createBlockExtractorPass(GroupOfBBs, true));
PM.run(*M);
}