Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-22 Thread Tom Stellard
Pushed, thanks. -Tom On Tue, Oct 22, 2013 at 02:15:01AM +0200, Marek Olk wrote: > From: Marek Olk > > This fixes piglit: > - shaders/glsl-fs-texture2d-masked > - shaders/glsl-fs-texture2d-masked-4 > > Signed-off-by: Marek Olk > Reviewed-by: Tom Stellard > --- > lib/Target/R600/S

[Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-21 Thread Marek Olšák
From: Marek Olšák This fixes piglit: - shaders/glsl-fs-texture2d-masked - shaders/glsl-fs-texture2d-masked-4 Signed-off-by: Marek Olšák Reviewed-by: Tom Stellard --- lib/Target/R600/SIISelLowering.cpp | 27 +++-- test/CodeGen/R600/llvm.SI.sample-masked.ll | 93

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-09 Thread Marek Olšák
No, I don't have commit access. I haven't even asked for it yet. Marek On Wed, Oct 9, 2013 at 8:01 PM, Tom Stellard wrote: > On Wed, Oct 09, 2013 at 03:33:37PM +0200, Marek Olšák wrote: >> From: Marek Olšák >> >> This fixes piglit: >> - shaders/glsl-fs-texture2d-masked >> - shaders/glsl-fs-text

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-09 Thread Tom Stellard
On Wed, Oct 09, 2013 at 03:33:37PM +0200, Marek Olšák wrote: > From: Marek Olšák > > This fixes piglit: > - shaders/glsl-fs-texture2d-masked > - shaders/glsl-fs-texture2d-masked-4 > > Signed-off-by: Marek Olšák > --- > lib/Target/R600/SIISelLowering.cpp | 27 +++-- > test/CodeGen/R

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-09 Thread Michel Dänzer
On Mit, 2013-10-09 at 16:39 +0200, Marek Olšák wrote: > No, I just added the test. Which means you didn't address Tom's LLVM coding style comment, requiring C++ formatting (// instead of /**/) for the comment below: > >> +/* Lane means which subreg of %VGPRa_VGPRb_VGPRc_VGPRd is used. > >>

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-09 Thread Marek Olšák
No, I just added the test. Marek On Wed, Oct 9, 2013 at 4:28 PM, Christian König wrote: > Are there any changes to the original patch you've send out? > > Anyway this version is: Reviewed-by: Christian König > > > Am 09.10.2013 15:33, schrieb Marek Olšák: > >> From: Marek Olšák >> >> This fixe

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-09 Thread Christian König
Are there any changes to the original patch you've send out? Anyway this version is: Reviewed-by: Christian König Am 09.10.2013 15:33, schrieb Marek Olšák: From: Marek Olšák This fixes piglit: - shaders/glsl-fs-texture2d-masked - shaders/glsl-fs-texture2d-masked-4 Signed-off-by: Marek Olš

[Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-10-09 Thread Marek Olšák
From: Marek Olšák This fixes piglit: - shaders/glsl-fs-texture2d-masked - shaders/glsl-fs-texture2d-masked-4 Signed-off-by: Marek Olšák --- lib/Target/R600/SIISelLowering.cpp | 27 +++-- test/CodeGen/R600/llvm.SI.sample-masked.ll | 93 ++ 2 files changed

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-09-27 Thread Tom Stellard
On Mon, Sep 23, 2013 at 09:09:14PM +0200, mar...@gmail.com wrote: > From: Marek Olšák > > This fixes piglit: > - shaders/glsl-fs-texture2d-masked > - shaders/glsl-fs-texture2d-masked-4 > > Signed-off-by: Marek Olšák > --- > lib/Target/R600/SIISelLowering.cpp | 27 +-- >

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-09-24 Thread Christian König
Sorry, I didn't investigate why. Maybe some pass is executed twice? Probably. Well when I wrote the function the idea was to figure out (once) if a result of MIMG is used or not and if it's not used to adjust the mask, but that doesn't seems to be the case any more. Whatever, the patch itself

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-09-24 Thread Marek Olšák
Sorry, I didn't investigate why. Maybe some pass is executed twice? Marek On Tue, Sep 24, 2013 at 11:48 AM, Christian König wrote: > Sorry, my fault let me refine the question: Why the heck is the function > applied twice? > > Christian. > > Am 24.09.2013 11:44, schrieb Marek Olšák: > >> If the

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-09-24 Thread Christian König
Sorry, my fault let me refine the question: Why the heck is the function applied twice? Christian. Am 24.09.2013 11:44, schrieb Marek Olšák: If the TGSI writemask is .xzw and the initial dmask is 0xf, the first application of the function sees 4 VGPRs and correctly sets the dmask to 13 (xzw) b

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-09-24 Thread Marek Olšák
If the TGSI writemask is .xzw and the initial dmask is 0xf, the first application of the function sees 4 VGPRs and correctly sets the dmask to 13 (xzw) because the second VGPR is unused, but the second application of the function now sees 3 VGPRs, ignores the fact that dmask is 13 meaning xzw, and

Re: [Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-09-24 Thread Christian König
Why should that be necessary? Christian. Am 23.09.2013 21:09, schrieb mar...@gmail.com: From: Marek Olšák This fixes piglit: - shaders/glsl-fs-texture2d-masked - shaders/glsl-fs-texture2d-masked-4 Signed-off-by: Marek Olšák --- lib/Target/R600/SIISelLowering.cpp | 27 +

[Mesa-dev] [PATCH] R600/SI: fix MIMG writemask adjustement

2013-09-23 Thread maraeo
From: Marek Olšák This fixes piglit: - shaders/glsl-fs-texture2d-masked - shaders/glsl-fs-texture2d-masked-4 Signed-off-by: Marek Olšák --- lib/Target/R600/SIISelLowering.cpp | 27 +-- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/Target/R600/SIISel