DivergenceAnalysis: added debug output

Summary:
This commit does two things:

1. modified the existing DivergenceAnalysis::dump() so it dumps the
   whole function with added DIVERGENT: annotations;

2. added code to do that dump if the appropriate -debug-only option is
   on.

Subscribers: llvm-commits

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

Change-Id: Id97b605aab1fc6f5a11a20c58a99bbe8c565bf83
llvm-svn: 336998
This commit is contained in:
Tim Renouf 2018-07-13 13:13:30 +00:00
parent e0e5b4cf2e
commit f3d8295105
2 changed files with 20 additions and 6 deletions

View File

@ -77,6 +77,8 @@
#include <vector> #include <vector>
using namespace llvm; using namespace llvm;
#define DEBUG_TYPE "divergence"
namespace { namespace {
class DivergencePropagator { class DivergencePropagator {
@ -299,6 +301,10 @@ bool DivergenceAnalysis::runOnFunction(Function &F) {
PDT, DivergentValues); PDT, DivergentValues);
DP.populateWithSourcesOfDivergence(); DP.populateWithSourcesOfDivergence();
DP.propagate(); DP.propagate();
LLVM_DEBUG(
dbgs() << "\nAfter divergence analysis on " << F.getName() << ":\n";
print(dbgs(), F.getParent())
);
return false; return false;
} }
@ -318,12 +324,17 @@ void DivergenceAnalysis::print(raw_ostream &OS, const Module *) const {
// Dumps all divergent values in F, arguments and then instructions. // Dumps all divergent values in F, arguments and then instructions.
for (auto &Arg : F->args()) { for (auto &Arg : F->args()) {
if (DivergentValues.count(&Arg)) OS << (DivergentValues.count(&Arg) ? "DIVERGENT: " : " ");
OS << "DIVERGENT: " << Arg << "\n"; OS << Arg << "\n";
} }
// Iterate instructions using instructions() to ensure a deterministic order. // Iterate instructions using instructions() to ensure a deterministic order.
for (auto &I : instructions(F)) { for (auto BI = F->begin(), BE = F->end(); BI != BE; ++BI) {
if (DivergentValues.count(&I)) auto &BB = *BI;
OS << "DIVERGENT:" << I << "\n"; OS << "\n " << BB.getName() << ":\n";
for (auto &I : BB.instructionsWithoutDebug()) {
OS << (DivergentValues.count(&I) ? "DIVERGENT: " : " ");
OS << I << "\n";
}
} }
OS << "\n";
} }

View File

@ -2,9 +2,12 @@
; CHECK-LABEL: 'test1': ; CHECK-LABEL: 'test1':
; CHECK-NEXT: DIVERGENT: i32 %bound ; CHECK-NEXT: DIVERGENT: i32 %bound
; CHECK: {{^ *}}%counter =
; CHECK-NEXT: DIVERGENT: %break = icmp sge i32 %counter, %bound ; CHECK-NEXT: DIVERGENT: %break = icmp sge i32 %counter, %bound
; CHECK-NEXT: DIVERGENT: br i1 %break, label %footer, label %body ; CHECK-NEXT: DIVERGENT: br i1 %break, label %footer, label %body
; CHECK-NEXT: DIVERGENT: br i1 %break, label %end, label %header ; CHECK: {{^ *}}%counter.next =
; CHECK: {{^ *}}%counter.footer =
; CHECK: DIVERGENT: br i1 %break, label %end, label %header
; Note: %counter is not divergent! ; Note: %counter is not divergent!
define amdgpu_ps void @test1(i32 %bound) { define amdgpu_ps void @test1(i32 %bound) {
entry: entry: