Re: [Mesa-dev] [Review Request (master branch)] svga: Use pipe_shader_state_from_tgsi to set shader state

2020-02-11 Thread Michel Dänzer 

Hi Charmaine,


it looks like you pushed this patch and another one directly to the main
Mesa repository master branch.

Pushing directly to the main Mesa repository is no longer common
practice, and indeed discouraged, as it circumvents the pre-merge GitLab
CI pipeline and forfeits all other benefits of a merge request (MR).

The common practice is to create an MR (normally already for patch
review) and assign it to Marge Bot for merging. Marge will rebase as
needed and merge once the pre-merge CI pipeline has passed.


Thanks,


On 2020-01-29 5:14 p.m., Neha Bhende wrote:
> Use pipe_shader_state_from_tgsi() to set shader state for transformed
> shader so that we get all correct data for respective shader state.
> 
> This fixes several regressed glretrace, piglit crashes found during merging
> upsteam mesa
> 
> Fixes: bf12bc2dd7a2 (draw: add nir info gathering and building support)
> 
> Reviewed-by: Charmaine Lee 
> ---
>  src/gallium/drivers/svga/svga_state_tgsi_transform.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/gallium/drivers/svga/svga_state_tgsi_transform.c 
> b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
> index b567aab6bc8..9d701b73772 100644
> --- a/src/gallium/drivers/svga/svga_state_tgsi_transform.c
> +++ b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
> @@ -131,7 +131,7 @@ emulate_point_sprite(struct svga_context *svga,
>   tgsi_dump(new_tokens, 0);
>}
>  
> -  templ.tokens = new_tokens;
> +  pipe_shader_state_from_tgsi(&templ, new_tokens);
>templ.stream_output.num_outputs = 0;
>  
>if (streamout) {
> 


-- 
Earthling Michel Dänzer   |   https://redhat.com
Libre software enthusiast | Mesa and X developer
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [Review Request (master branch)] svga: Use pipe_shader_state_from_tgsi to set shader state

2020-02-11 Thread Brian Paul 


I'm going to update the docs regarding patches and gitlab.  It's kind of 
a mess now.


-Brian


On 02/11/2020 03:03 AM, Michel Dänzer wrote:


Hi Charmaine,


it looks like you pushed this patch and another one directly to the main
Mesa repository master branch.

Pushing directly to the main Mesa repository is no longer common
practice, and indeed discouraged, as it circumvents the pre-merge GitLab
CI pipeline and forfeits all other benefits of a merge request (MR).

The common practice is to create an MR (normally already for patch
review) and assign it to Marge Bot for merging. Marge will rebase as
needed and merge once the pre-merge CI pipeline has passed.


Thanks,


On 2020-01-29 5:14 p.m., Neha Bhende wrote:

Use pipe_shader_state_from_tgsi() to set shader state for transformed
shader so that we get all correct data for respective shader state.

This fixes several regressed glretrace, piglit crashes found during merging
upsteam mesa

Fixes: bf12bc2dd7a2 (draw: add nir info gathering and building support)

Reviewed-by: Charmaine Lee 
---
  src/gallium/drivers/svga/svga_state_tgsi_transform.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/svga/svga_state_tgsi_transform.c 
b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
index b567aab6bc8..9d701b73772 100644
--- a/src/gallium/drivers/svga/svga_state_tgsi_transform.c
+++ b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
@@ -131,7 +131,7 @@ emulate_point_sprite(struct svga_context *svga,
   tgsi_dump(new_tokens, 0);
}
  
-  templ.tokens = new_tokens;

+  pipe_shader_state_from_tgsi(&templ, new_tokens);
templ.stream_output.num_outputs = 0;
  
if (streamout) {







___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [Review Request (master branch)] svga: Use pipe_shader_state_from_tgsi to set shader state

2020-02-11 Thread Michel Dänzer 
On 2020-02-11 6:49 p.m., Charmaine Lee wrote:
> 
> Those two patches are simple fixes to our svga driver and have been tested in 
> house for a while already.
> So I thought it's ok to push the patches directly.
> Thanks for reminding me of the MR practice, will keep that in mind for next 
> submits.

Thanks.

The CI pipeline does test building the svga driver (maybe the testing
coverage can be increased in the future? :), so it's at least
theoretically possible for an svga driver change to break the pipeline.


-- 
Earthling Michel Dänzer   |   https://redhat.com
Libre software enthusiast | Mesa and X developer
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [Review Request (master branch)] svga: Use pipe_shader_state_from_tgsi to set shader state

2020-02-11 Thread Charmaine Lee 


Those two patches are simple fixes to our svga driver and have been tested in 
house for a while already.
So I thought it's ok to push the patches directly.
Thanks for reminding me of the MR practice, will keep that in mind for next 
submits.

-Charmaine


From: Michel Dänzer 
Sent: Tuesday, February 11, 2020 2:03 AM
To: Neha Bhende; Brian Paul; Charmaine Lee
Cc: mesa-dev@lists.freedesktop.org
Subject: Re: [Mesa-dev] [Review Request (master branch)] svga: Use 
pipe_shader_state_from_tgsi to set shader state


Hi Charmaine,


it looks like you pushed this patch and another one directly to the main
Mesa repository master branch.

Pushing directly to the main Mesa repository is no longer common
practice, and indeed discouraged, as it circumvents the pre-merge GitLab
CI pipeline and forfeits all other benefits of a merge request (MR).

The common practice is to create an MR (normally already for patch
review) and assign it to Marge Bot for merging. Marge will rebase as
needed and merge once the pre-merge CI pipeline has passed.


Thanks,


On 2020-01-29 5:14 p.m., Neha Bhende wrote:
> Use pipe_shader_state_from_tgsi() to set shader state for transformed
> shader so that we get all correct data for respective shader state.
>
> This fixes several regressed glretrace, piglit crashes found during merging
> upsteam mesa
>
> Fixes: bf12bc2dd7a2 (draw: add nir info gathering and building support)
>
> Reviewed-by: Charmaine Lee 
> ---
>  src/gallium/drivers/svga/svga_state_tgsi_transform.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/svga/svga_state_tgsi_transform.c 
> b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
> index b567aab6bc8..9d701b73772 100644
> --- a/src/gallium/drivers/svga/svga_state_tgsi_transform.c
> +++ b/src/gallium/drivers/svga/svga_state_tgsi_transform.c
> @@ -131,7 +131,7 @@ emulate_point_sprite(struct svga_context *svga,
>   tgsi_dump(new_tokens, 0);
>}
>
> -  templ.tokens = new_tokens;
> +  pipe_shader_state_from_tgsi(&templ, new_tokens);
>templ.stream_output.num_outputs = 0;
>
>if (streamout) {
>


--
Earthling Michel Dänzer   |   
https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fredhat.com&data=02%7C01%7Ccharmainel%40vmware.com%7Cc04e2bb7e84a46b9879008d7aed996f5%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637170121886003685&sdata=J3VtiMG%2Ba5Co3m3nrjVULvj6a9QcpyIYkzpQrbx%2BR70%3D&reserved=0
Libre software enthusiast | Mesa and X developer
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] Merging experimental r600/nir code

2020-02-11 Thread Dieter Nützel 

Hello Gert,

your merge 'broke' LTO and then later on PGO compilation/linking.

I do generally compiling with '-Dgallium-drivers=r600,radeonsi,swrast'
for testing radeonsi and (your) r600 work. ;-)

After your merge I get several warnings in 'addrlib' with LTO and even a 
compiler error (gcc (SUSE Linux) 9.2.1 20200128).


I had to disable 'r600' ('swrast' is needed for 'nine') to get a working 
LTO and even better PGO radeonsi driver.
I'm preparing GREAT LTO+PGO (the later is the greater) numbers over the 
last 2 months. I'll send my results later, today.


Summary
radeonsi is ~40% smaller and 16-20% faster with PGO (!!!).

Honza and the GCC people (Intel's ICC folks) do GREAT things.
'glmark2' numbers are better then 'vkmark'. (Hello, Marek.).

Need some sleep.

See my log, below.

Greetings and GREAT work!

-Dieter

Am 09.02.2020 15:46, schrieb Gert Wollny:

Am Donnerstag, den 23.01.2020, 20:31 +0100 schrieb Gert Wollny:

has anybody any objections if I merge the r600/NIR code?
Without explicitely setting the debug flag it doesn't change a
thing, but it would be better to continue developing in-tree.

Okay, if nobody objects, I'll merge it Monday evening.

Best,
Gert


[1425/1433] Linking target src/gallium/targets/dri/libgallium_dri.so.
FAILED: src/gallium/targets/dri/libgallium_dri.so
c++  -o src/gallium/targets/dri/libgallium_dri.so 
'src/gallium/targets/dri/8381c20@@gallium_dri@sha/target.c.o' -flto 
-fprofile-generate -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared 
-fPIC -Wl,--start-group -Wl,-soname,libgallium_dri.so 
src/mesa/libmesa_gallium.a src/mesa/libmesa_common.a 
src/compiler/glsl/libglsl.a src/compiler/glsl/glcpp/libglcpp.a 
src/util/libmesa_util.a src/util/format/libmesa_format.a 
src/compiler/nir/libnir.a src/compiler/libcompiler.a 
src/mesa/libmesa_sse41.a src/mesa/drivers/dri/common/libdricommon.a 
src/mesa/drivers/dri/common/libmegadriver_stub.a 
src/gallium/state_trackers/dri/libdri.a 
src/gallium/auxiliary/libgalliumvl.a src/gallium/auxiliary/libgallium.a 
src/mapi/shared-glapi/libglapi.so.0.0.0 
src/gallium/auxiliary/pipe-loader/libpipe_loader_static.a 
src/loader/libloader.a src/util/libxmlconfig.a 
src/gallium/winsys/sw/null/libws_null.a 
src/gallium/winsys/sw/wrapper/libwsw.a 
src/gallium/winsys/sw/dri/libswdri.a 
src/gallium/winsys/sw/kms-dri/libswkmsdri.a 
src/gallium/drivers/llvmpipe/libllvmpipe.a 
src/gallium/drivers/softpipe/libsoftpipe.a 
src/gallium/drivers/r600/libr600.a 
src/gallium/winsys/radeon/drm/libradeonwinsys.a 
src/gallium/drivers/radeonsi/libradeonsi.a 
src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.a 
src/amd/addrlib/libaddrlib.a src/amd/common/libamd_common.a 
src/amd/llvm/libamd_common_llvm.a -Wl,--build-id=sha1 -Wl,--gc-sections 
-Wl,--version-script /opt/mesa/src/gallium/targets/dri/dri.sym 
-Wl,--dynamic-list /opt/mesa/src/gallium/targets/dri/../dri-vdpau.dyn 
/usr/lib64/libdrm.so -L/usr/local/lib -lLLVM-10git -pthread 
/usr/lib64/libexpat.so 
/usr/lib64/gcc/x86_64-suse-linux/9/../../../../lib64/libz.so -lm 
/usr/lib64/gcc/x86_64-suse-linux/9/../../../../lib64/libzstd.so 
-L/usr/local/lib -lLLVM-10git /usr/lib64/libunwind.so -ldl -lsensors 
-L/usr/local/lib -lLLVM-10git /usr/lib64/libdrm_radeon.so 
/usr/lib64/libelf.so -L/usr/local/lib -lLLVM-10git -L/usr/local/lib 
-lLLVM-10git -L/usr/local/lib -lLLVM-10git /usr/lib64/libdrm_amdgpu.so 
-L/usr/local/lib -lLLVM-10git -Wl,--end-group 
'-Wl,-rpath,$ORIGIN/../../../mesa:$ORIGIN/../../../compiler/glsl:$ORIGIN/../../../compiler/glsl/glcpp:$ORIGIN/../../../util:$ORIGIN/../../../util/format:$ORIGIN/../../../compiler/nir:$ORIGIN/../../../compiler:$ORIGIN/../../../mesa/drivers/dri/common:$ORIGIN/../../state_trackers/dri:$ORIGIN/../../auxiliary:$ORIGIN/../../../mapi/shared-glapi:$ORIGIN/../../auxiliary/pipe-loader:$ORIGIN/../../../loader:$ORIGIN/../../winsys/sw/null:$ORIGIN/../../winsys/sw/wrapper:$ORIGIN/../../winsys/sw/dri:$ORIGIN/../../winsys/sw/kms-dri:$ORIGIN/../../drivers/llvmpipe:$ORIGIN/../../drivers/softpipe:$ORIGIN/../../drivers/r600:$ORIGIN/../../winsys/radeon/drm:$ORIGIN/../../drivers/radeonsi:$ORIGIN/../../winsys/amdgpu/drm:$ORIGIN/../../../amd/addrlib:$ORIGIN/../../../amd/common:$ORIGIN/../../../amd/llvm' 
-Wl,-rpath-link,/opt/mesa/build/src/mesa 
-Wl,-rpath-link,/opt/mesa/build/src/compiler/glsl 
-Wl,-rpath-link,/opt/mesa/build/src/compiler/glsl/glcpp 
-Wl,-rpath-link,/opt/mesa/build/src/util 
-Wl,-rpath-link,/opt/mesa/build/src/util/format 
-Wl,-rpath-link,/opt/mesa/build/src/compiler/nir 
-Wl,-rpath-link,/opt/mesa/build/src/compiler 
-Wl,-rpath-link,/opt/mesa/build/src/mesa/drivers/dri/common 
-Wl,-rpath-link,/opt/mesa/build/src/gallium/state_trackers/dri 
-Wl,-rpath-link,/opt/mesa/build/src/gallium/auxiliary 
-Wl,-rpath-link,/opt/mesa/build/src/mapi/shared-glapi 
-Wl,-rpath-link,/opt/mesa/build/src/gallium/auxiliary/pipe-loader 
-Wl,-rpath-link,/opt/mesa/build/src/loader 
-Wl,-rpath-link,/opt/mesa/build/src/gallium/winsys/sw/null 
-Wl,-rpath-link,/opt/mesa/build/src/gallium/winsys/sw/wrapper