OSDN Git Service

nv50/ir: copy joinAt when splitting both before and after
authorIlia Mirkin <imirkin@alum.mit.edu>
Wed, 1 Jul 2015 06:11:39 +0000 (02:11 -0400)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 1 Jul 2015 14:22:41 +0000 (15:22 +0100)
commit999b2b27168c85f2895c6574de28c31114fc5b7b
treef340b3e04df0434285529a010dbe497efdcf1190
parent81ac47605f887c9cbf5d2f3a77e7a71a28fbe37f
nv50/ir: copy joinAt when splitting both before and after

The current implementation only moves the joinAt when splitting after
the given instruction, not before it. So if you have a BB with

  foo
  instr
  bar
  joinat

and thus with joinAt set, we end up first splitting before instr, at
which point the instr's bb is updated to the new bb. Since that bb
doesn't have a joinAt set (despite containing one), when splitting after
the instr, there is nothing to copy over. Since the joinat will be in
the "split" bb irrespective of whether we're splitting before or after
the instruction, move it over in either case.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91124
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 5dcb28c3d26828ed1b0e2bd5a0589c5baab04b85)
src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp
src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp