fa6ffcc083
nir/copy_prop_vars: Re-order some logic in compare_derefs
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
c5d9a65944
nir: Remove deref chain support from split_per_member_structs
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
18175ab66f
nir: Remove deref chain support from opt_undef
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
aeb4bbfd1e
nir: Remove deref chain support from split_var_copies
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
636256cdc7
nir: Remove deref chain support from dead_variables
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
378d7cf3ba
nir: Remove deref chain support from propagate_invariant
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
c6a9c2b60b
nir: Remove deref chain support from lower_var_copies
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
fc59230a46
nir: Remove deref chain support from lower_drawpixels
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
d4dd2ca4a7
nir: Remove deref chain support from opt_peephole_select
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
54bfc0cbcf
nir: Remove deref chain support from lower_tex
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
a3589bb01f
nir: Remove deref chain support from lower_wpos_ytransform
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
3992665c52
nir: Remove deref chain support from lower_wpos_center
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
8a62db7712
nir: Remove deref chain support from lower_system_values
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
e5db1b951c
nir: Remove deref chain support from remove_unused_varyings
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
6bdd867968
nir: Delete lower_io_types
...
It's only used by the ir3 stand-alone compiler and Rob said we could
delete it.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
c6fc653232
nir: Remove deref chain support from lower_phis_to_scalar
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
47ffb893e6
nir: Convert lower_io to deref instructions
...
This deletes support for _var intrinsics and legacy deref chains in
favor of deref instructions. The internals are also reworked a bit to
use deref instructions directly.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
0d03c63e91
nir/lower_io: Convert atomic lowering to deref instructions
...
No one is currently using so we can make this change irrespective of
driver. We may use it again in i965 so it's best to pretend to keep it
working.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
c290e8c4b0
nir: Remove deref chain support from lower_global_vars_to_local
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
41c52c963a
nir: Remove deref chain support from lower_clamp_color_outputs
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
d2adc08abe
nir: Remove deref chain support from lower_alpha_test
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
81f29d6d33
nir: Remove deref chain support from lower_atomics
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
4b0ea65333
nir: Remove deref chain support from lower_clip_cull_distance_arrays
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
a42af8d0d6
nir: Remove deref chain support from lower_indirect_derefs
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
69866af357
nir: Rework gather_info to entirely use deref instructions
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
b1a18b8797
nir/vars_to_ssa: Rework to entirely use deref instructions
...
This commit reworks nir_lower_vars_to_ssa to use deref instructions and
deref paths internally instead of deref chains. We also drop support
for the old load/store/copy_var intrinsics.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
f747ff1969
nir/vars_to_ssa: Add an is_direct field to deref_node
...
This makes us build the is_direct parameter as the nodes are constructed
rather than as we walk the chain. This will be useful later.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
e1f0a1b029
broadcom/vc4: Remove deref chain support from nir_lower_txf_ms.
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
3d19f116ad
st,ir3,radeonsi: push lower_deref_instrs back into driver
...
vc4+vc5 is not really effected by the deref chain to deref instr
conversion, so it no longer needs this pass. For others, now that
all the passes mesa/st uses are using deref instructions, push the
lowering to deref chains back into driver.
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
3e8879be5c
nir/lower_samplers: remove legacy version
...
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
a20929fed2
nir: convert lower_samplers_as_deref to deref instructions
...
This also removes the legacy version of lower_samplers.
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
0bc15340be
mesa/st: re-enable lower_io_to_elements()
...
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
245ce114c9
nir: convert lower_io_arrays_to_elements to deref instructions
...
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
c409cfddcf
mesa/st/nir: convert lower_builtins to deref instructions
...
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
3859e0b4fe
mesa/st: temporarily disable lower_io_to_elements()
...
Not required for correctness, and makes the order of converting passes
to deref instructions hard to get right for both prog_to_nir and
glsl_to_nir cases.
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
c6009a1e8e
nir: convert lower_io_to_scalar to deref instructions
...
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
d143f6c856
move lower_deref_instrs
...
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
d7b0be48ef
nir: Use deref instructions in lower_constant_initializers
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
85f4149f8a
nir/builder: Use deref instructions for load/store/copy_var
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
3573570afe
radv: Disable lower_io_to_temporaries during deref changes.
...
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
75286c2d08
nir: Use derefs in nir_lower_samplers
...
We change glsl_to_nir to provide derefs for bot textures and samplers
while we're at it. This makes the lowering much easier since we only
either replace sources or remove them.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
36efae1d66
nir/lower_samplers: Clean up function arguments
...
This little refactor makes us stop passing stage around and puts the
builder as the first parameter to some functions.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
a6ebbbc594
nir/lower_samplers: split out _legacy version for deref chains
...
To simplify the transition, and make things bisectable, split out a
legacy copy or lower_samplers. This way the i965 and gallium drivers
can independently switch over to deref instructions.
Since the lower_samplers_as_deref pass is only used by gallium drivers,
it can be converted in lock-step with moving the lower_deref_instrs
pass, and so does not need a corresponding _legacy clone.
This legacy pass will be removed in a future commit.
Signed-off-by: Rob Clark <robdclark@gmail.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
3891c1906f
intel/blorp: Stop setting tex->texture/sampler
...
nir_tex_instr_create uses rzalloc so it's already NULL
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
606eb56ab9
intel/nir: Only lower load/store derefs
...
Everything else should already be handled.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
71cd9ebed9
intel/fs: Use image_deref intrinsics instead of image_var
...
Since we had to rewrite the deref walking loop anyway, I took the
opportunity to make it a bit clearer and more efficient. In particular,
in the AoA case, we will now emit one minmax instead of one per array
level.
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
032b845edf
anv/pipeline: Convert apply_pipeline_layout to deref instructions
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
43bb707fa4
anv/apply_pipeline_layout: Simplify extract_tex_src_plane
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
9fb36011d1
anv/pipeline: Convert lower_multiview to deref instructions
...
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com >
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
d57e724a45
anv/pipeline: Convert YCbCr lowering to deref instructiosn
...
Acked-by: Rob Clark <robdclark@gmail.com >
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl >
Acked-by: Dave Airlie <airlied@redhat.com >
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org >
2018-06-22 20:54:00 -07:00
Jason Ekstrand