On Thu, Feb 14, 2013 at 08:52:16AM -0800, Kenneth Graunke wrote: > On 02/14/2013 06:20 AM, Damien Lespiau wrote: > >Turns out the "new" assembler that uses mesa's opcode emission hits the > >path that automatically transforms MRF registers into GRF ones in the > >exa_wm_src_projective shader. > > > >The diff with the new assembler is: > > > >$ intel-gen4disasm -g7 - > >- { 0x00600041, 0x208077be, 0x008d03c0, 0x008d0180 }, > >+ { 0x00600041, 0x2e8077bd, 0x008d03c0, 0x008d0180 }, > >mul(8) m4<1>F g30<8,8,1>F g12<8,8,1>F { align1 }; > >mul(8) g116<1>F g30<8,8,1>F g12<8,8,1>F { align1 }; > > > >Of course, message registers are no more in gen7, so the shader is > >trying to do something shaddy (ahem!). > > > >Instead of using m4, let's make exa_wm_src_projective use g68 for v (aka > >vl) which makes sense since: > > > >1/ vh is g69 > >2/ exa_wm_src_affine uses g68 for vl already > > > >This commit changes the generated assembly, here's the decoded diff: > > > >$ intel-gen4disasm -g7 - > >- { 0x00600041, 0x208077be, 0x008d03c0, 0x008d0180 }, > >+ { 0x00600041, 0x288077bd, 0x008d03c0, 0x008d0180 }, > >mul(8) m4<1>F g30<8,8,1>F g12<8,8,1>F { align1 }; > >mul(8) g68<1>F g30<8,8,1>F g12<8,8,1>F { align1 }; > > > >Cc: Kenneth Graunke <kenneth at whitecape.org> > >Reported-by: Xiang, Haihao <haihao.xiang at intel.com> > >Signed-off-by: Damien Lespiau <damien.lespiau at intel.com> > > If I recall correctly, the only actual changes between the Gen6 and > Gen7 render assembly was converting MRFs to GRFs, and I arbitrarily > picked something in the 60s rather than 112+. If you want, I think > you could actually just delete all the Gen7 custom assembly and let > gen7_convert_mrf_to_grf do it for you. > > But this looks okay to me, if you'd rather continue doing everything > explicitly... > Reviewed-by: Kenneth Graunke <kenneth at whitecape.org> Thanks for the patch and review, pushed. -Chris -- Chris Wilson, Intel Open Source Technology Centre