[llvm] r323791 - [AMDGPU] Revert "[AMDGPU] Add options for waitcnt pass debugging; add instr count in debug output."

[Mark Searles via llvm-commits]

Yes, I will recommit this. But, as you say, there is a conflict that I need
to deal with. If you - or others - want this recommitted, let me know and
I'll bump it up on my list. Hmmm... it's actually fairly high anyway. The
"old" waitcnt pass has been a proxy for debugging the "new" waitcnt pass.
I've been meaning to remove the old waitcnt pass; I'll make sure the
debugging options for the new waitcnt pass are available before removing
the old one.

Mark


On Wed, Mar 7, 2018 at 3:21 PM, Matt Arsenault <arsenm2 at gmail.com> wrote:

>
>
> > On Jan 30, 2018, at 12:17, Mark Searles via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
> >
> > Author: msearles
> > Date: Tue Jan 30 09:17:06 2018
> > New Revision: 323791
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=323791&view=rev
> > Log:
> > [AMDGPU] Revert "[AMDGPU] Add options for waitcnt pass debugging; add
> instr count in debug output."
> >
> > Patch caused a buildbot failure; arg; http://lab.llvm.org:8011/
> builders/lld-x86_64-darwin13/builds/17373/s\
> > teps/build_Lld/logs/stdio :
> >        /Users/buildslave/as-bldslv9/lld-x86_64-darwin13/llvm.src/
> lib/Target/AMDGPU/SIInsertWaitcnts.cpp:1563:18: error: unused variable
> 'InstCnt' [-Werror,-Wunused-variable]
> >          static int32_t InstCnt = 0;
> >                                              "
> > This reverts commit 4f4a7d61e306b67044d9f16bc2016fee806bc2cc.
> >
> > Removed:
> >    llvm/trunk/test/CodeGen/AMDGPU/waitcnt-debug.mir
> > Modified:
> >    llvm/trunk/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
> >
> > Modified: llvm/trunk/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> AMDGPU/SIInsertWaitcnts.cpp?rev=323791&r1=323790&r2=323791&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/AMDGPU/SIInsertWaitcnts.cpp (original)
> > +++ llvm/trunk/lib/Target/AMDGPU/SIInsertWaitcnts.cpp Tue Jan 30
> 09:17:06 2018
> > @@ -54,26 +54,6 @@
> >
>
>
> Are you planning on recommitting this? There seems to be a large conflict
> with another patch since then
>
> -Matt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180307/a49749a1/attachment.html>