platform/upstream/mesa.git
2 years agovulkan: Add a vk_pipeline_hash_shader_stage() helper
Boris Brezillon [Wed, 22 Jun 2022 11:14:38 +0000 (04:14 -0700)]
vulkan: Add a vk_pipeline_hash_shader_stage() helper

All drivers implement some sort of shader hashing, but each of
them does it slightly differently. Let's provide a generic helper
to avoid new copies of the same logic and encourage new drivers
to use one of the already implemented function.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17186>

2 years agonir/serialize: Silence integer-overflow false positive
Boris Brezillon [Thu, 23 Jun 2022 12:39:34 +0000 (14:39 +0200)]
nir/serialize: Silence integer-overflow false positive

Use util_sign_extend() to silence the following integer-overflow
error.

src/compiler/nir/nir_serialize.c:1333:40: runtime error: left shift of 1000165000 by 13 places cannot be represented in type 'int'

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17186>

2 years agonir/serialize: Support texop >= 16
Boris Brezillon [Thu, 23 Jun 2022 14:32:12 +0000 (16:32 +0200)]
nir/serialize: Support texop >= 16

Extend the packed_instr struct to support texops above
nir_texop_fragment_fetch_amd.

Fixes: 603e6ba972da ("nir: add two new texture ops for multisample fragment color/mask fetches")
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17186>

2 years agobroadcom/compiler: don't predicate postponed spills
Iago Toral Quiroga [Wed, 22 Jun 2022 07:43:30 +0000 (09:43 +0200)]
broadcom/compiler: don't predicate postponed spills

The postponed spill is predicated using the condition from the
last write, but this is only correct if the register was only
written once in the TMU sequence, or if it is always written with
the same predication.

While we could try to track whether this is the case or not, it
would make the postponed spill path even more complex than it
already is, so let's just avoid predicating these. We are already
discouraging TMU spilling of registers in the middle of TMU
sequences, so this should not be a very common case.

Cc: mesa-stable
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17201>

2 years agobroadcom/compiler: fix postponed TMU spills with multiple writes
Iago Toral Quiroga [Wed, 22 Jun 2022 06:29:42 +0000 (08:29 +0200)]
broadcom/compiler: fix postponed TMU spills with multiple writes

If we are spilling a register that is used in the middle of a TMU
sequence, we postpone the spill until the TMU sequence finishes,
at which point we inject the spill and rewrite the original
instruction to write to the new temp.

However, this doesn't work if the register is written multiple
times during the TMU sequence. In that scenario, we need to ensure
that all writes are rewritten to use the new temp, not just the last
one.

Cc: mesa-stable
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17201>

2 years agov3dv: fix leak
Iago Toral Quiroga [Wed, 22 Jun 2022 09:44:12 +0000 (11:44 +0200)]
v3dv: fix leak

Cc: mesa-stable
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17201>

2 years agozink: delete zink_resource_object::dt_has_data
Mike Blumenkrantz [Wed, 22 Jun 2022 17:24:33 +0000 (13:24 -0400)]
zink: delete zink_resource_object::dt_has_data

this should be on the swapchain image

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: use kopper_displaytarget type directly
Mike Blumenkrantz [Wed, 22 Jun 2022 16:02:14 +0000 (12:02 -0400)]
zink: use kopper_displaytarget type directly

casting this all over is super annoying and unnecessary

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: acquire swapchain images on image map
Mike Blumenkrantz [Tue, 21 Jun 2022 20:35:36 +0000 (16:35 -0400)]
zink: acquire swapchain images on image map

this is a weird one

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: no-op pixmap frontbuffer flush calls
Mike Blumenkrantz [Tue, 21 Jun 2022 20:32:17 +0000 (16:32 -0400)]
zink: no-op pixmap frontbuffer flush calls

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: delete zink_resource_object::acquire
Mike Blumenkrantz [Tue, 21 Jun 2022 20:25:32 +0000 (16:25 -0400)]
zink: delete zink_resource_object::acquire

this was duplicated from the swapchain object for convenience, but really
it just leads to desync if a swapchain is shared, so use the swapchain
one instead

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: ensure pending present flushes are handled during frontbuffer flush
Mike Blumenkrantz [Tue, 21 Jun 2022 20:24:25 +0000 (16:24 -0400)]
zink: ensure pending present flushes are handled during frontbuffer flush

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: flag batch as having work during frontbuffer flush
Mike Blumenkrantz [Tue, 21 Jun 2022 19:16:14 +0000 (15:16 -0400)]
zink: flag batch as having work during frontbuffer flush

avoids having the flush deferred

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: improve no-op acquire detection
Mike Blumenkrantz [Tue, 21 Jun 2022 15:22:41 +0000 (11:22 -0400)]
zink: improve no-op acquire detection

the swapchain may have successfully completed the acquire in a previous
batch, in which case a new acquire is not needed

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: remove unnecessary code in kopper readback acquire
Mike Blumenkrantz [Tue, 21 Jun 2022 01:46:21 +0000 (21:46 -0400)]
zink: remove unnecessary code in kopper readback acquire

this used to be important but no longer is, so modify the loop
code to handle this case implicitly

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: remove broken kopper assert
Mike Blumenkrantz [Tue, 21 Jun 2022 01:36:58 +0000 (21:36 -0400)]
zink: remove broken kopper assert

in a single-buffered scenario this can and does happen

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: use better determination for handling swapchain acquire submits
Mike Blumenkrantz [Mon, 20 Jun 2022 16:33:27 +0000 (12:33 -0400)]
zink: use better determination for handling swapchain acquire submits

if the swapchain has data, it has already passed through this function and
thus does not need to attempt to synchronize another swapchain acquire
for the same image

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: move 'acquired' flag onto swapchain struct
Mike Blumenkrantz [Tue, 21 Jun 2022 14:59:55 +0000 (10:59 -0400)]
zink: move 'acquired' flag onto swapchain struct

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: move to AoS for storing swapchain struct data
Mike Blumenkrantz [Wed, 22 Jun 2022 15:46:35 +0000 (11:46 -0400)]
zink: move to AoS for storing swapchain struct data

this is a bit less cumbersome

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: track whether current swapchain has data
Mike Blumenkrantz [Mon, 20 Jun 2022 16:30:23 +0000 (12:30 -0400)]
zink: track whether current swapchain has data

duplicated from resource object since swapchains can be shared

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agozink: fix kopper_acquire return value
Mike Blumenkrantz [Mon, 20 Jun 2022 16:29:19 +0000 (12:29 -0400)]
zink: fix kopper_acquire return value

this should be a VkResult

Fixes: ab1941fc0e9 ("zink: handle zombie swapchains")

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17149>

2 years agolima: wire up MSAA 4x support
Vasily Khoruzhick [Fri, 26 Nov 2021 07:56:41 +0000 (23:56 -0800)]
lima: wire up MSAA 4x support

Utgard supports MSAA 4x, so wire it up.

RSW bits were already REd by Luc, the only remaining part was storing
non-resolved buffers, reloading them (including for depth/stencil) and
doing MSAA resolve.

To store non-resolved buffer we need to set mrt_pitch and mrt_bits
registers in WB, and to resolve non-resolved buffer we need to reload
it into individual samples and then write out with mrt_bits = 0, it's
now done by lima blitter.

We also need to do resolve on transfer_map() of multi-sampled buffers,
so utilize u_transfer_helper for that.

As a side fix, it turns out that our wb_reg definition wasn't correct,
'zero' isn't always zero, it's set if we need to swap channels, and
it goes before mrt_bits. mrt_bits actually enables multiple MRTs,
so this commit renames 'zero' to 'flags' and changes its position.

If mrt_bits == 0 and MSAA is enabled, GPU does resolve
in place, to expose this functionality we set PIPE_CAP_SURFACE_SAMPLE_COUNT.

Fixes dEQP-GLES2.functional.multisample.*

Reviewed-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13963>

2 years agoci/turnip: Trim the a630 VK run a bit.
Emma Anholt [Tue, 21 Jun 2022 21:37:48 +0000 (14:37 -0700)]
ci/turnip: Trim the a630 VK run a bit.

We have a lot of spilling coverage in a618 pre-merge, don't do it all (~2
minutes) here.  Also, force-gmem touch testing should probably test less than
the default run does!

This should help make up for having added the tu-zink run.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17125>

2 years agoci/turnip: Test traces on turnip using zink.
Emma Anholt [Tue, 13 Jul 2021 23:41:07 +0000 (16:41 -0700)]
ci/turnip: Test traces on turnip using zink.

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17125>

2 years agoci/freedreno: Add vulkan+gl integration testing in piglit.
Emma Anholt [Mon, 20 Jun 2022 16:48:11 +0000 (09:48 -0700)]
ci/freedreno: Add vulkan+gl integration testing in piglit.

The libvulkan-dev was needed for building zink, which ended up turning on
the vulkan tests in piglit.  Split them out here.

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17125>

2 years agoci/traces: Drop ZINK_USE_LAVAPIPE ICD override.
Emma Anholt [Thu, 2 Jun 2022 22:24:03 +0000 (15:24 -0700)]
ci/traces: Drop ZINK_USE_LAVAPIPE ICD override.

Not set in the tree any more.

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17125>

2 years agoci/traces: GC unused code for DXVK trace replay.
Emma Anholt [Thu, 2 Jun 2022 22:23:11 +0000 (15:23 -0700)]
ci/traces: GC unused code for DXVK trace replay.

I haven't found any use of it since it was introduced, and it got in the
way of zink trace testing.

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17125>

2 years agolavapipe: always set point_tri_clip
Mike Blumenkrantz [Mon, 27 Jun 2022 17:56:23 +0000 (13:56 -0400)]
lavapipe: always set point_tri_clip

this invokes GLES-compatible point clipping, which is more consistent
with vulkan expectations and fixes a number of zink tests

Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17259>

2 years agolima,panfrost: Do not ralloc contexts against the screen
Alyssa Rosenzweig [Fri, 24 Jun 2022 14:42:00 +0000 (10:42 -0400)]
lima,panfrost: Do not ralloc contexts against the screen

ralloc is not thread-safe. While a given context can only be accessed from a
single thread at once, multiple contexts can be created against the same screen
at once. The ralloc allocations against the shared screens will race. Depending
on the result of the race, the same block of memory can be returned as the two
new contexts in two different threads, causing a use-after-free when the context
is freed later.

We free the context explicitly when it's destroyed anyway. If screens are
getting destroyed without the contexts getting destroyed first, that's a state
tracker bug, not a Panfrost one.

This matches what Iris does.

Fixes crash in test_integer_ops.int_math on Panfrost.

Fixes: 0fcf73bc2d4 ("panfrost: Move to use ralloc for some allocations")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17234>

2 years agozink: remove swizzle from fbfetch lowering
Mike Blumenkrantz [Mon, 27 Jun 2022 15:00:49 +0000 (11:00 -0400)]
zink: remove swizzle from fbfetch lowering

I had this in at one point to fix something, but now it somehow just
breaks fbfetch instead of fixing anything

cc: mesa-stable

fixes:
dEQP-GLES31.functional.blend_equation_advanced*

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17254>

2 years agoglx/dri: Fix DRI drawable release at MakeCurrent time
Adam Jackson [Tue, 21 Jun 2022 20:07:19 +0000 (16:07 -0400)]
glx/dri: Fix DRI drawable release at MakeCurrent time

We want to release the drawables of the context we're coming from, but
we were releasing them from the context we're switching to. This is
probably not a big deal normally because both contexts are likely to be
on the same display, which is all that driReleaseDrawables is really
sensitive to. But if the contexts are on different Displays this would
go quite wrong.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17176>

2 years agomicrosoft/clc: Add a unit test for unused image kernel args
Jesse Natalie [Mon, 27 Jun 2022 04:09:07 +0000 (21:09 -0700)]
microsoft/clc: Add a unit test for unused image kernel args

Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17246>

2 years agomicrosoft/clc: Remove dead image vars
Jesse Natalie [Mon, 27 Jun 2022 04:08:56 +0000 (21:08 -0700)]
microsoft/clc: Remove dead image vars

Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17246>

2 years agomicrosoft/clc: Fix test double free in the case of compilation failure
Jesse Natalie [Mon, 27 Jun 2022 03:58:24 +0000 (20:58 -0700)]
microsoft/clc: Fix test double free in the case of compilation failure

Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17246>

2 years agomicrosoft/clc: Enable tests that pass on server 2022
Jesse Natalie [Mon, 27 Jun 2022 03:58:02 +0000 (20:58 -0700)]
microsoft/clc: Enable tests that pass on server 2022

Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17246>

2 years agoutil/disk_cache: Implement disk_cache_get_function_identifier for Windows
Jesse Natalie [Thu, 23 Jun 2022 14:31:10 +0000 (07:31 -0700)]
util/disk_cache: Implement disk_cache_get_function_identifier for Windows

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17208>

2 years agointel/clc: enable fp16 & subgroups for GRL
Lionel Landwerlin [Mon, 27 Jun 2022 10:13:14 +0000 (13:13 +0300)]
intel/clc: enable fp16 & subgroups for GRL

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17253>

2 years agoclc: add new feature options for intel_clc
Lionel Landwerlin [Mon, 27 Jun 2022 10:12:46 +0000 (13:12 +0300)]
clc: add new feature options for intel_clc

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17253>

2 years agoradv: vectorize nir_op_fabs
Daniel Schürmann [Thu, 7 Oct 2021 18:20:23 +0000 (20:20 +0200)]
radv: vectorize nir_op_fabs

Totals from 4 (0.00% of 134913) affected shaders: (GFX10.3)
CodeSize: 37868 -> 36576 (-3.41%)
Instrs: 5332 -> 5169 (-3.06%)
Latency: 24452 -> 24174 (-1.14%)
InvThroughput: 9784 -> 9462 (-3.29%)
VClause: 54 -> 50 (-7.41%)
Copies: 520 -> 519 (-0.19%)
PreVGPRs: 266 -> 264 (-0.75%)

Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15176>

2 years agoradv: vectorize nir_op_fdiv & nir_op_flrp & nir_op_ineg
Daniel Schürmann [Tue, 10 Aug 2021 16:06:58 +0000 (18:06 +0200)]
radv: vectorize nir_op_fdiv & nir_op_flrp & nir_op_ineg

These instructions are lowered to fmul/isub.
So, prevent scalarization.

Totals from 49 (0.04% of 134913) affected shaders: (GFX10.3)
VGPRs: 2576 -> 2568 (-0.31%)
SpillVGPRs: 1145 -> 1132 (-1.14%); split: -2.10%, +0.96%
CodeSize: 663968 -> 659376 (-0.69%); split: -1.08%, +0.38%
Scratch: 113664 -> 112640 (-0.90%)
Instrs: 110274 -> 109683 (-0.54%); split: -0.81%, +0.27%
Latency: 2904434 -> 2869588 (-1.20%); split: -1.64%, +0.44%
InvThroughput: 1414237 -> 1396600 (-1.25%); split: -1.69%, +0.44%
VClause: 2899 -> 2891 (-0.28%); split: -0.93%, +0.66%
SClause: 1520 -> 1537 (+1.12%); split: -0.07%, +1.18%
Copies: 28829 -> 28662 (-0.58%); split: -1.90%, +1.32%
Branches: 3560 -> 3564 (+0.11%)
PreVGPRs: 2550 -> 2427 (-4.82%)

Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15176>

2 years agoradv: use callback for nir_lower_to_scalar
Daniel Schürmann [Tue, 6 Jul 2021 17:09:51 +0000 (19:09 +0200)]
radv: use callback for nir_lower_to_scalar

Now uses nir_lower_alu_width.
This avoids scalarization and re-vectorization of 16bit instructions.

Totals from 289 (0.21% of 134913) affected shaders: (GFX10.3)
VGPRs: 12864 -> 13072 (+1.62%); split: -0.50%, +2.11%
SpillSGPRs: 609 -> 505 (-17.08%)
SpillVGPRs: 946 -> 1145 (+21.04%)
CodeSize: 2537024 -> 2576976 (+1.57%); split: -0.10%, +1.67%
Scratch: 89088 -> 113664 (+27.59%)
MaxWaves: 7150 -> 7134 (-0.22%)
Instrs: 458352 -> 460830 (+0.54%); split: -0.45%, +0.99%
Latency: 6615279 -> 6844092 (+3.46%); split: -0.08%, +3.54%
InvThroughput: 1929504 -> 2044989 (+5.99%); split: -0.22%, +6.21%
VClause: 7186 -> 7338 (+2.12%); split: -0.08%, +2.20%
SClause: 13144 -> 13116 (-0.21%)
Copies: 46152 -> 50127 (+8.61%); split: -0.11%, +8.73%
Branches: 16530 -> 16572 (+0.25%); split: -0.02%, +0.27%
PreSGPRs: 14903 -> 14905 (+0.01%); split: -0.01%, +0.03%
PreVGPRs: 11806 -> 11730 (-0.64%); split: -1.83%, +1.19%

Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15176>

2 years agoradv: don't lower vectorized instructions to 32bit
Daniel Schürmann [Mon, 27 Jun 2022 12:49:49 +0000 (14:49 +0200)]
radv: don't lower vectorized instructions to 32bit

Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15176>

2 years agoaco: correctly validate v_fma_mixhi_f16 register assignment
Daniel Schürmann [Wed, 1 Jun 2022 15:16:55 +0000 (17:16 +0200)]
aco: correctly validate v_fma_mixhi_f16 register assignment

Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15176>

2 years agoanv: disable injection of primitive shading rate for mesh
Marcin Ślusarz [Fri, 6 May 2022 12:38:43 +0000 (14:38 +0200)]
anv: disable injection of primitive shading rate for mesh

It's not needed and causes issues for mesh code (it doesn't
mark the output as per-primitive, which confuses brw_compute_mue_map)

Fixes many tests matching:
dEQP-VK.fragment_shading_rate.dynamic_rendering.*.ms

Fixes: 1542ab70eb4 ("anv: handle primitive shading rate for mesh")
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16196>

2 years agointel/compiler: adjust task payload offsets as late as possible
Marcin Ślusarz [Mon, 23 May 2022 15:09:33 +0000 (17:09 +0200)]
intel/compiler: adjust task payload offsets as late as possible

Otherwise passes which expect offsets to be in bytes (like
brw_nir_lower_mem_access_bit_sizes, called from brw_postprocess_nir)
may produce incorrect results.

Fixes 64-bit load/stores in task/mesh shaders.

Fixes: c36ae42e4cc ("intel/compiler: Use nir_var_mem_task_payload")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16196>

2 years agointel/common: allocate space for at least one task urb
Marcin Ślusarz [Fri, 6 May 2022 14:37:27 +0000 (16:37 +0200)]
intel/common: allocate space for at least one task urb

Fixes: c93cbc77f78 ("intel/common: Add helper for URB allocation in Mesh pipeline")
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16196>

2 years agoc11: reinstate the original license and authorship
Emil Velikov [Fri, 24 Jun 2022 12:36:44 +0000 (13:36 +0100)]
c11: reinstate the original license and authorship

The original code that was copied in was Boost licensed, so keep that
in. Since Yonggang Luo has code quite some work, keep their copyright
alongside the original one.

Fixes: b2ddec4e98f ("c11: Implement c11/time.h with c11/impl/time.c")
Fixes: e6392fcf3d8 ("c11: Move the implementation of threads.h into c source code")
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17232>

2 years agointel/blorp: Dirty depth bounds dynamic state bits after blorp
Sviatoslav Peleshko [Fri, 24 Jun 2022 07:43:09 +0000 (10:43 +0300)]
intel/blorp: Dirty depth bounds dynamic state bits after blorp

Blorp emits its own 3DSTATE_DEPTH_BOUNDS, so we'll have to re-emit the
expected state after that.

Signed-off-by: Sviatoslav Peleshko <sviatoslav.peleshko@globallogic.com>
Fixes: 56ef501e3aa4 ("blorp: disable depth bounds")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17205>

2 years agoanv: Dirty all dynamic state bits when creating command buffer state
Sviatoslav Peleshko [Thu, 23 Jun 2022 11:20:24 +0000 (14:20 +0300)]
anv: Dirty all dynamic state bits when creating command buffer state

This makes sure that we'll handle situations when the new state has
the same value as the default one, so we won't dirty some bits, and
consequently will not emit necessary commands (e.g. 3DSTATE_DEPTH_BOUNDS).

Signed-off-by: Sviatoslav Peleshko <sviatoslav.peleshko@globallogic.com>
Fixes: 48229d11 ("anv: don't emit 3DSTATE_DEPTH_BOUNDS in pipeline batch")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6722
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17205>

2 years agointel: fix typos found by codespell
Marcin Ślusarz [Wed, 22 Jun 2022 16:31:08 +0000 (18:31 +0200)]
intel: fix typos found by codespell

Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17191>

2 years agodzn: Enable the depthClamp feature
Boris Brezillon [Fri, 24 Jun 2022 15:42:34 +0000 (08:42 -0700)]
dzn: Enable the depthClamp feature

depthClampEnable is actually the case we support properly.

!depthClampEnable requires extra work to make sure the
depth clamping that's forced by D3D12 is inactive (setting the
viewport depth range to [0,1] and dealing with the actual range
at the shader level), and clamp the depth value read by the
fragment shader in that case. This will be addressed separately.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17231>

2 years agodzn: Enable shader{Clip,Cull}Distance
Boris Brezillon [Fri, 24 Jun 2022 11:28:09 +0000 (04:28 -0700)]
dzn: Enable shader{Clip,Cull}Distance

DXIL has clip/cull distance builtins too.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17231>

2 years agodzn: Enable dynamic indexing on all kind of descriptors
Boris Brezillon [Fri, 24 Jun 2022 11:24:42 +0000 (04:24 -0700)]
dzn: Enable dynamic indexing on all kind of descriptors

nir_to_dxil() supports it.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17231>

2 years agodzn: Advertise shaderImageGatherExtended support
Boris Brezillon [Fri, 24 Jun 2022 11:04:46 +0000 (04:04 -0700)]
dzn: Advertise shaderImageGatherExtended support

nir_to_dxil() takes tg4 offsets into account.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17231>

2 years agodzn: Advertise anisotropic filtering support
Boris Brezillon [Fri, 24 Jun 2022 10:51:01 +0000 (03:51 -0700)]
dzn: Advertise anisotropic filtering support

We support it already, let's toggle the switch to expose it.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17231>

2 years agonir/serialize: Put dest last in packed_instr::tex
Boris Brezillon [Thu, 23 Jun 2022 16:53:31 +0000 (18:53 +0200)]
nir/serialize: Put dest last in packed_instr::tex

packed_instr::tex::dest must be last to match the packed_instr::any::dest
position.

Fixes: 35655865cbde ("nir/serialize: pack instructions better")
Cc: stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17212>

2 years agoanv: silence border color swizzle debug message
Lionel Landwerlin [Sun, 26 Jun 2022 06:36:36 +0000 (09:36 +0300)]
anv: silence border color swizzle debug message

   MESA-INTEL: debug: gfx11_CreateSampler: ignored VkStructureType 1000411001

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17245>

2 years agoradv: dump UMR waves before UMR rings
Samuel Pitoiset [Wed, 22 Jun 2022 08:34:34 +0000 (10:34 +0200)]
radv: dump UMR waves before UMR rings

Dumping UMR rings might be slow and dumping waves before would make it
more chance to dump them without reporting "No active waves".

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17183>

2 years agoradv: fix command line for dumping waves with UMR
Samuel Pitoiset [Wed, 22 Jun 2022 08:34:01 +0000 (10:34 +0200)]
radv: fix command line for dumping waves with UMR

GFXOFF must be disabled before dumping waves and re-enabled after.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17183>

2 years agoradv: use RADEON_FLAG_VA_UNCACHED for the trace BO
Samuel Pitoiset [Wed, 22 Jun 2022 07:38:24 +0000 (09:38 +0200)]
radv: use RADEON_FLAG_VA_UNCACHED for the trace BO

Figured this while debugging a GPU hang with a simple CTS test. This
is to make sure data written by the CP are coherent on the CPU.

This also explains spurious GPU hang reports generated for Hitman 3
that made no sense without it. Now it's clear that this game hangs
after a DRAW_INDEX_INDIRECT packet.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17183>

2 years agoradv: disable small primitive culling for user sample locations
Samuel Pitoiset [Fri, 24 Jun 2022 08:11:51 +0000 (10:11 +0200)]
radv: disable small primitive culling for user sample locations

The driver can't assume sample positions at (0.5, 0.5) when user
sample locations are used.

This doesn't fix anything in practice because NGGC is only enabled by
default on GFX10.3 and that extension is currently disabled on GFX10+,
but I would like to expose it at some point.

This fixes dEQP-VK.pipeline.*.sample_locations_ext.verify_location.*
(when the extension is enabled locally).

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17228>

2 years agov3dv: Implement VK_KHR_performance_query
Ella Stanforth [Tue, 23 Nov 2021 22:29:48 +0000 (22:29 +0000)]
v3dv: Implement VK_KHR_performance_query

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14061>

2 years agoci: Revert "CI: Lima farm is offline"
Erico Nunes [Thu, 23 Jun 2022 15:15:39 +0000 (17:15 +0200)]
ci: Revert "CI: Lima farm is offline"

The lab is up and running again.

This reverts commit 686e20afcd32cb80b96984c8eb4428e777fbce97.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Acked-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17240>

2 years agoradeonsi: replace llvm gs input handle with nir lowering
Qiang Yu [Mon, 30 May 2022 12:09:49 +0000 (20:09 +0800)]
radeonsi: replace llvm gs input handle with nir lowering

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoac/llvm: get back nir_intrinsic_load_gs_vertex_offset_amd
Qiang Yu [Mon, 30 May 2022 11:49:55 +0000 (19:49 +0800)]
ac/llvm: get back nir_intrinsic_load_gs_vertex_offset_amd

Will be used by radeonsi.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoac/nir: add triangle_strip_adjacency_fix to gs input lower
Qiang Yu [Mon, 30 May 2022 11:46:15 +0000 (19:46 +0800)]
ac/nir: add triangle_strip_adjacency_fix to gs input lower

From radeonsi.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoradeonsi: replace llvm es output with nir lowering
Qiang Yu [Mon, 30 May 2022 07:03:40 +0000 (15:03 +0800)]
radeonsi: replace llvm es output with nir lowering

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoac/nir: change es output lower param to esgs_itemsize
Qiang Yu [Tue, 31 May 2022 06:18:17 +0000 (14:18 +0800)]
ac/nir: change es output lower param to esgs_itemsize

radeonsi may add extra dword to the stride, so let's pass it
directly.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoac/nir: remove unused param num_reserved_es_outputs from gs input lower
Qiang Yu [Mon, 30 May 2022 12:06:03 +0000 (20:06 +0800)]
ac/nir: remove unused param num_reserved_es_outputs from gs input lower

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoradeonsi: set lds for gs/es to handle nir shared memory load/store
Qiang Yu [Tue, 31 May 2022 02:35:28 +0000 (10:35 +0800)]
radeonsi: set lds for gs/es to handle nir shared memory load/store

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoac/nir: skip gl_ViewportIndex and gl_Layer write in ES
Qiang Yu [Mon, 30 May 2022 06:52:57 +0000 (14:52 +0800)]
ac/nir: skip gl_ViewportIndex and gl_Layer write in ES

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoradeonsi: implement two esgs ring nir intrinsic
Qiang Yu [Mon, 30 May 2022 06:41:08 +0000 (14:41 +0800)]
radeonsi: implement two esgs ring nir intrinsic

nir_intrinsic_load_ring_esgs_amd
nir_intrinsic_load_ring_es2gs_offset_amd

Will be used by esgs lowering.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoac/llvm: fix code format alignment in visit_load_local_invocation_index
Qiang Yu [Mon, 30 May 2022 06:28:32 +0000 (14:28 +0800)]
ac/llvm: fix code format alignment in visit_load_local_invocation_index

Used tab instead of space.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16788>

2 years agoradeonsi: replace llvm tes input load with nir lowering
Qiang Yu [Sat, 28 May 2022 14:23:40 +0000 (22:23 +0800)]
radeonsi: replace llvm tes input load with nir lowering

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: set uses_vmem_load_other for nir_intrinsic_load_buffer_amd
Qiang Yu [Sat, 28 May 2022 14:20:08 +0000 (22:20 +0800)]
radeonsi: set uses_vmem_load_other for nir_intrinsic_load_buffer_amd

Before lower TES load input to load buffer, mark this flag for this
intrinsic, otherwise we get corruption with GFX10 after the lowering.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: enable PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS
Qiang Yu [Sat, 28 May 2022 10:09:56 +0000 (18:09 +0800)]
radeonsi: enable PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS

This can remove special handling of tessfactors which also benifit
the nir lower pass which does not handle these as system value.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: replace llvm tcs output with nir lower pass
Qiang Yu [Sat, 28 May 2022 09:52:35 +0000 (17:52 +0800)]
radeonsi: replace llvm tcs output with nir lower pass

Remove the store_tcs_outputs abi, we can use common output abi
to handle the tessfactor pass as vgpr.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoac/nir: add no_input_lds_space param to hs output lower
Qiang Yu [Wed, 1 Jun 2022 09:13:00 +0000 (17:13 +0800)]
ac/nir: add no_input_lds_space param to hs output lower

This is used by radeonsi to save some lds space when all LS output
is passed by register.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoac/llvm: handle write mask for nir_intrinsic_store_buffer_amd
Qiang Yu [Wed, 25 May 2022 11:35:15 +0000 (19:35 +0800)]
ac/llvm: handle write mask for nir_intrinsic_store_buffer_amd

tess lowering may generate buffer store with partial write mask.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: implement nir_intrinsic_load_tess_rel_patch_id_amd for both tcs and tes
Qiang Yu [Tue, 24 May 2022 07:09:00 +0000 (15:09 +0800)]
radeonsi: implement nir_intrinsic_load_tess_rel_patch_id_amd for both tcs and tes

radv will lower this intrinsic before gets to llvm, so we just need to
implement it in radeonsi.

The tes version will be used in tess lower too.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: implement nir_intrinsic_load_ring_tess_offchip(_offset)_amd
Qiang Yu [Tue, 24 May 2022 06:43:36 +0000 (14:43 +0800)]
radeonsi: implement nir_intrinsic_load_ring_tess_offchip(_offset)_amd

Used by tess lower latter.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: preload tess offchip ring for tcs
Qiang Yu [Tue, 24 May 2022 06:40:05 +0000 (14:40 +0800)]
radeonsi: preload tess offchip ring for tcs

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Sigend-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoac/nir: add wave_size parameter to ac_nir_lower_hs_outputs_to_mem
Qiang Yu [Fri, 27 May 2022 09:39:18 +0000 (17:39 +0800)]
ac/nir: add wave_size parameter to ac_nir_lower_hs_outputs_to_mem

Used by radeonsi and radv to reflect true wave size used, not minimal size.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoac/nir: add pass_tessfactors_by_reg param to hs output lower
Qiang Yu [Mon, 23 May 2022 12:27:55 +0000 (20:27 +0800)]
ac/nir: add pass_tessfactors_by_reg param to hs output lower

radeonsi won't emit tess factor in the lower pass, need to keep
the output for llvm backend to pass it as parameter. This is used
by radeonsi for an optimization to save LDS write.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoac/nir: use nir_intrinsic_load_hs_out_patch_data_offset_amd in tess lower
Qiang Yu [Mon, 23 May 2022 09:26:00 +0000 (17:26 +0800)]
ac/nir: use nir_intrinsic_load_hs_out_patch_data_offset_amd in tess lower

radeonsi load this from SGPR arg, can't use static value because TCS output
and TES input may not match (TCS output is not a key for TES) and
determined in runtime.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoac/nir: add nir_intrinsic_load_hs_out_patch_data_offset_amd
Qiang Yu [Mon, 23 May 2022 09:23:57 +0000 (17:23 +0800)]
ac/nir: add nir_intrinsic_load_hs_out_patch_data_offset_amd

Also add radv and radeonsi implementation. Will be used in tess lowering.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoac/nir: remove unused parameter in tes input lower
Qiang Yu [Mon, 23 May 2022 08:25:15 +0000 (16:25 +0800)]
ac/nir: remove unused parameter in tes input lower

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: implement nir_intrinsic_load_tcs_num_patches_amd
Qiang Yu [Mon, 23 May 2022 06:42:06 +0000 (14:42 +0800)]
radeonsi: implement nir_intrinsic_load_tcs_num_patches_amd

Used by ac_nir_lower_tess_io_to_mem.c.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: replace llvm based fixed tcs with nir
Qiang Yu [Fri, 20 May 2022 09:27:27 +0000 (17:27 +0800)]
radeonsi: replace llvm based fixed tcs with nir

Create nir passthrough shader with explicit input/output and vertex
output count so that it can be handled by compiler same as user tcs.

The drawback is we create more si_shader_selector with different
input/output and vertex output count which was handled by compiler
backend before.

As fixed function tcs can be handled like user tcs, we don't need
the dedicated fixed_func_tcs_shader state either.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: add si_create_passthrough_tcs
Qiang Yu [Wed, 18 May 2022 09:12:58 +0000 (17:12 +0800)]
radeonsi: add si_create_passthrough_tcs

For replacing si_create_fixed_func_tcs.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: support multi stage shader state creation in nir shaderlib
Qiang Yu [Wed, 18 May 2022 08:57:17 +0000 (16:57 +0800)]
radeonsi: support multi stage shader state creation in nir shaderlib

For creating tcs passthrough shader.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: use si_shader as parameter in si_get_nir_shader
Qiang Yu [Fri, 27 May 2022 09:32:45 +0000 (17:32 +0800)]
radeonsi: use si_shader as parameter in si_get_nir_shader

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradeonsi: deserialize nir binary in si_check_blend_dst_sampler_noop
Qiang Yu [Fri, 27 May 2022 09:24:41 +0000 (17:24 +0800)]
radeonsi: deserialize nir binary in si_check_blend_dst_sampler_noop

We can do this parse with original nir instead of shader key pass
applied nir in si_get_nir_shader.

This can free si_get_nir_shader to just use si_shader as parameter.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16705>

2 years agoradv: no need to do gs_alloc_req for newer chips in ngg vs/tes
Qiang Yu [Fri, 17 Jun 2022 07:36:08 +0000 (15:36 +0800)]
radv: no need to do gs_alloc_req for newer chips in ngg vs/tes

Copy from radeonsi.

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17130>

2 years agoac/llvm: conditionally check wave id in gs sendmsg
Qiang Yu [Wed, 15 Jun 2022 02:34:51 +0000 (10:34 +0800)]
ac/llvm: conditionally check wave id in gs sendmsg

nir lowering already call this with wave id check, no need to
check inside ac_build_sendmsg_gs_alloc_req again.

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17130>

2 years agoradv: Deal with derefs from opaque types in function parameters.
Bas Nieuwenhuizen [Mon, 13 Jun 2022 20:17:19 +0000 (22:17 +0200)]
radv: Deal with derefs from opaque types in function parameters.

Needs more copy propagation before nir_opt_derefs picks it up.

Note that the full general problem of opaque types stored in
intermediate variables is still open, but that seems like a whole
can of worms, and no sense to have gfxbench stay broken during the
time it takes to solve that.

Cc: mesa-stable
Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5945
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17012>

2 years agoAndroid.mk: Intermediate output paths may already be absolute
Alessandro Astone [Sat, 18 Jun 2022 16:28:26 +0000 (18:28 +0200)]
Android.mk: Intermediate output paths may already be absolute

That is the case when OUT_DIR_COMMON_BASE is set.
Only prefix paths with AOSP_ABSOLUTE_PATH if they're relative.

Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16674>

2 years agoAndroid.mk: Generate the dummy source in local-generated-sources-dir
Alessandro Astone [Sat, 18 Jun 2022 16:16:09 +0000 (18:16 +0200)]
Android.mk: Generate the dummy source in local-generated-sources-dir

A source file cannot be otherwise referenced by absolute path.
That happens when OUT_DIR_COMMON_BASE is set.

Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16674>

2 years agoAndroid.mk: Make mesa3d-lib work with absolute path meson outputs
Alessandro Astone [Sat, 18 Jun 2022 16:10:34 +0000 (18:10 +0200)]
Android.mk: Make mesa3d-lib work with absolute path meson outputs

LOCAL_PREBUILT_MODULE_FILE is the only variable that allows
specifying the absolute path to a prebuilt.
That happens when OUT_DIR_COMMON_BASE is set.

Since it does not have multilib variants, define two separate
libraries for multilib

Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16674>

2 years agoAndroid.mk: Cleanup mesa3d-lib
Alessandro Astone [Sat, 18 Jun 2022 14:20:37 +0000 (16:20 +0200)]
Android.mk: Cleanup mesa3d-lib

Properly cleanup variables before declaring a library.
Explicitly require library dependencies.

Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16674>