From 01aea5809f19901fc30fe40ff03b662c1bb90141 Mon Sep 17 00:00:00 2001 From: Tobias Grosser Date: Wed, 22 Oct 2014 23:16:28 +0000 Subject: [PATCH] Use stringFromIslObj instead of isl_..._dump to print to dbgs() This makes sure we consistently use dbgs() when printing debug output. Previously, the code just mixed calls to isl_*_dump() with printing to dbgs() and was relying for both methods to interact in predictable ways (same output stream, no unexpected reordering of outputs). llvm-svn: 220443 --- polly/lib/CodeGen/IslAst.cpp | 6 +++++- polly/lib/Transform/ScheduleOptimizer.cpp | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/polly/lib/CodeGen/IslAst.cpp b/polly/lib/CodeGen/IslAst.cpp index 9c5070e..8045542 100644 --- a/polly/lib/CodeGen/IslAst.cpp +++ b/polly/lib/CodeGen/IslAst.cpp @@ -25,6 +25,7 @@ #include "polly/LinkAllPasses.h" #include "polly/Options.h" #include "polly/ScopInfo.h" +#include "polly/Support/GICHelper.h" #include "llvm/Support/Debug.h" #include "isl/union_map.h" @@ -491,7 +492,10 @@ void IslAstInfo::printScop(raw_ostream &OS) const { OS << ":: isl ast :: " << F->getName() << " :: " << S.getRegion().getNameStr() << "\n"; - DEBUG(dbgs() << S.getContextStr() << "\n"; isl_union_map_dump(Schedule)); + DEBUG({ + dbgs() << S.getContextStr() << "\n"; + dbgs() << stringFromIslObj(Schedule); + }); OS << "\nif (" << RtCStr << ")\n\n"; OS << AstStr << "\n"; OS << "else\n"; diff --git a/polly/lib/Transform/ScheduleOptimizer.cpp b/polly/lib/Transform/ScheduleOptimizer.cpp index 0e086d1..c8d9fe0 100644 --- a/polly/lib/Transform/ScheduleOptimizer.cpp +++ b/polly/lib/Transform/ScheduleOptimizer.cpp @@ -30,6 +30,7 @@ #include "polly/LinkAllPasses.h" #include "polly/Options.h" #include "polly/ScopInfo.h" +#include "polly/Support/GICHelper.h" #include "llvm/Support/Debug.h" using namespace llvm; @@ -501,11 +502,9 @@ bool IslScheduleOptimizer::runOnScop(Scop &S) { } DEBUG(dbgs() << "\n\nCompute schedule from: "); - DEBUG(dbgs() << "Domain := "; isl_union_set_dump(Domain); dbgs() << ";\n"); - DEBUG(dbgs() << "Proximity := "; isl_union_map_dump(Proximity); - dbgs() << ";\n"); - DEBUG(dbgs() << "Validity := "; isl_union_map_dump(Validity); - dbgs() << ";\n"); + DEBUG(dbgs() << "Domain := " << stringFromIslObj(Domain) << ";\n"); + DEBUG(dbgs() << "Proximity := " << stringFromIslObj(Proximity) << ";\n"); + DEBUG(dbgs() << "Validity := " << stringFromIslObj(Validity) << ";\n"); int IslFusionStrategy; @@ -555,7 +554,7 @@ bool IslScheduleOptimizer::runOnScop(Scop &S) { if (!Schedule) return false; - DEBUG(dbgs() << "Schedule := "; isl_schedule_dump(Schedule); dbgs() << ";\n"); + DEBUG(dbgs() << "Schedule := " << stringFromIslObj(Schedule) << ";\n"); isl_union_map *ScheduleMap = getScheduleMap(Schedule); -- 2.7.4