From 11f0f7f583c9565256750b50784b28b1ba3edd90 Mon Sep 17 00:00:00 2001 From: James Molloy Date: Wed, 4 Sep 2019 12:57:23 +0000 Subject: [PATCH] [ModuloSchedule] Fix no-asserts build Apologies, due to a git SNAFU this fix (dump doesn't exist and silence unused variables) stayed in my index rather than applying to rL370893. llvm-svn: 370894 --- llvm/lib/CodeGen/ModuloSchedule.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/llvm/lib/CodeGen/ModuloSchedule.cpp b/llvm/lib/CodeGen/ModuloSchedule.cpp index 2a394a0..55fa2af 100644 --- a/llvm/lib/CodeGen/ModuloSchedule.cpp +++ b/llvm/lib/CodeGen/ModuloSchedule.cpp @@ -1386,8 +1386,6 @@ Register KernelRewriter::remapUse(Register Reg, MachineInstr &MI) { assert(LoopProducer); } int LoopProducerStage = S.getStage(LoopProducer); - int LoopProducerCycle = S.getCycle(LoopProducer); - int ConsumerCycle = S.getCycle(&MI); Optional IllegalPhiDefault; @@ -1396,7 +1394,12 @@ Register KernelRewriter::remapUse(Register Reg, MachineInstr &MI) { } else if (LoopProducerStage > ConsumerStage) { // This schedule is only representable if ProducerStage == ConsumerStage+1. // In addition, Consumer's cycle must be scheduled after Producer in the - // rescheduled loop. + // rescheduled loop. This is enforced by the pipeliner's ASAP and ALAP + // functions. +#ifndef NDEBUG // Silence unused variables in non-asserts mode. + int LoopProducerCycle = S.getCycle(LoopProducer); + int ConsumerCycle = S.getCycle(&MI); +#endif assert(LoopProducerCycle <= ConsumerCycle); assert(LoopProducerStage == ConsumerStage + 1); // Peel off the first phi from Defaults and insert a phi between producer @@ -1637,9 +1640,9 @@ void PeelingModuloScheduleExpander::validateAgainstModuloScheduleExpander() { if (Failed) { errs() << "Golden reference kernel:\n"; - ExpandedKernel->dump(); + ExpandedKernel->print(errs()); errs() << "New kernel:\n"; - BB->dump(); + BB->print(errs()); errs() << ScheduleDump; report_fatal_error( "Modulo kernel validation (-pipeliner-experimental-cg) failed"); -- 2.7.4