This is an archive of the discontinued LLVM Phabricator instance.

Differential D60970

[BlockExtractor] Change the basic block separator from ',' to ';'
ClosedPublic

Authored by qcolombet on Apr 22 2019, 10:54 AM.

Details

Reviewers
volkan
Commits
rGae2cbb34007d: [BlockExtractor] Change the basic block separator from ',' to ';'
rL359462: [BlockExtractor] Change the basic block separator from ',' to ';'
Summary

This change aims at making the file format be compatible with the
way LLVM handles command line options.

Diff Detail

Repository
rL LLVM

Event Timeline

qcolombet created this revision.Apr 22 2019, 10:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 22 2019, 10:54 AM
qcolombet added a child revision: D60973: [llvm-extract] Expose the group extraction feature of the BlockExtractor.Apr 22 2019, 10:58 AM
volkan accepted this revision.Apr 23 2019, 11:20 AM

LGTM

This revision is now accepted and ready to land.Apr 23 2019, 11:20 AM
Closed by commit rL359462: [BlockExtractor] Change the basic block separator from ',' to ';' (authored by qcolombet). · Explain WhyApr 29 2019, 9:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Transforms/
IPO/
2 lines
test/
Transforms/
BlockExtractor/
4 lines

Diff 197126

llvm/trunk/lib/Transforms/IPO/BlockExtractor.cpp

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines Buf->getBuffer().split(Lines, '\n', /*MaxSplit=*/-1,
/*KeepEmpty=*/false); /*KeepEmpty=*/false);
for (const auto &Line : Lines) { for (const auto &Line : Lines) {
SmallVector<StringRef, 4> LineSplit; SmallVector<StringRef, 4> LineSplit;
Line.split(LineSplit, ' ', /*MaxSplit=*/-1, Line.split(LineSplit, ' ', /*MaxSplit=*/-1,
/*KeepEmpty=*/false); /*KeepEmpty=*/false);
if (LineSplit.empty()) if (LineSplit.empty())
continue; continue;
SmallVector<StringRef, 4> BBNames; SmallVector<StringRef, 4> BBNames;
LineSplit[1].split(BBNames, ',', /*MaxSplit=*/-1, LineSplit[1].split(BBNames, ';', /*MaxSplit=*/-1,
/*KeepEmpty=*/false); /*KeepEmpty=*/false);
if (BBNames.empty()) if (BBNames.empty())
report_fatal_error("Missing bbs name"); report_fatal_error("Missing bbs name");
BlocksByName.push_back({LineSplit[0], {BBNames.begin(), BBNames.end()}}); BlocksByName.push_back({LineSplit[0], {BBNames.begin(), BBNames.end()}});
} }
} }
/// Extracts the landing pads to make sure all of them have only one /// Extracts the landing pads to make sure all of them have only one
▲ Show 20 Lines • Show All 99 Lines • Show Last 20 Lines

llvm/trunk/test/Transforms/BlockExtractor/extract-blocks-with-groups.ll

; Extract the 'if', 'then', and 'else' blocks into the same function. ; Extract the 'if', 'then', and 'else' blocks into the same function.
; RUN: echo 'foo if,then,else' > %t ; RUN: echo 'foo if;then;else' > %t
; Make sure we can still extract a single basic block ; Make sure we can still extract a single basic block
; RUN: echo 'foo end' >> %t ; RUN: echo 'foo end' >> %t
; RUN: echo 'bar bb14,bb20' >> %t ; RUN: echo 'bar bb14;bb20' >> %t
; RUN: opt -S -extract-blocks -extract-blocks-file=%t %s | FileCheck %s ; RUN: opt -S -extract-blocks -extract-blocks-file=%t %s | FileCheck %s
; CHECK-LABEL: foo ; CHECK-LABEL: foo
; ;
; CHECK: if: ; CHECK: if:
; The diamond will produce an i32 value, make sure we account for that. ; The diamond will produce an i32 value, make sure we account for that.
; CHECK: [[RES_VAL_ADDR:%[^ ]*]] = alloca i32 ; CHECK: [[RES_VAL_ADDR:%[^ ]*]] = alloca i32
; CHECK-NEXT: br label %[[FOO_DIAMOND_LABEL:.*$]] ; CHECK-NEXT: br label %[[FOO_DIAMOND_LABEL:.*$]]
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines