mesa.git
7 years agoi965: Add script to gen code for OA counter queries
Robert Bragg [Thu, 4 Jun 2015 12:55:37 +0000 (13:55 +0100)]
i965: Add script to gen code for OA counter queries

Avoiding lots of error prone boilerplate and easing our ability to add +
maintain support for multiple OA performance counter queries for each
generation:

This adds a python script to generate code for building up
performance_queries from the metric sets and counters described in
brw_oa_hsw.xml as well as functions to normalize each counter based on
the RPN expressions given.

Although the XML file currently only includes a single metric set, the
code generated assumes there could be many sets.

The metrics as described in XML get translated into C structures
which are registered in a brw->perfquery.oa_metrics_table hash table
keyed by the GUID of the metric set in XML.

v2: numerous python style improvements (Dylan)
v3: Makefile.am fixups (Emil)
v4: Pattern rule for codegen + orthogonal .c and .h rules (Robert)

Signed-off-by: Robert Bragg <robert@sixbynine.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
7 years agoi965: extend query/counter structs for OA queries
Robert Bragg [Thu, 4 Jun 2015 22:26:40 +0000 (23:26 +0100)]
i965: extend query/counter structs for OA queries

In preparation for generating code from brw_oa_hsw.xml for describing OA
performance counter queries this adds some OA specific members to
brw_perf_query that our generated code will initialize:

- The oa_metric_set_id is the ID we will pass to
  DRM_IOCTL_I915_PERF_OPEN, and is an ID got via sysfs under:
  /sys/class/drm/<card>/metrics/<guid/id

- The oa_format is the OA report layout we will request from the kernel

- The accumulator offsets determine where the different groups of A, B
  and C counters are located within an intermediate 64bit 'accumulator'
  buffer.

Additionally brw_perf_query_counter now has 64bit or float _read()
callback members for OA counters.

Signed-off-by: Robert Bragg <robert@sixbynine.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
7 years agoi965: brw_context.h additions for OA unit query codegen
Robert Bragg [Thu, 4 Jun 2015 22:27:36 +0000 (23:27 +0100)]
i965: brw_context.h additions for OA unit query codegen

In preparation for generating code from the XML performance counter meta
data, this makes some additions to brw_context.h for this code to be
able to reference.

It adds a brw->perfquery.oa_metrics_table hash table for indexing built
up query descriptions by the GUID that is expected to be advertised by
the kernel (via sysfs) to be able to use that query.

It adds an 'OA_COUNTERS' brw_query_kind to be assigned to queries built
up by generated code.

It adds a brw->perfquery.sys_vars structure to have a consistent place
to represent the different system variables like $EuCoresTotalCount and
$EuSlicesTotalCount that are referenced by OA counter normalization
equations.

  Although extending + referencing gen_device_info for these variables
  was considered, these are some of the (mostly minor) reasons for
  going with a dedicated structure:

  - Currently we only need this info for the performance_query backend
    and it might be a bit tedious to go back and initialize the state
    for pre-Haswell devinfo structures.
  - Considering the $SubsliceMask then the requirement for how multiple
    per-slice masks are packed only comes from how the variables are
    references by availability tests in XML, and might not be a good
    general representation for tracking subslice masks if another use
    case arises.
  - If we used gen_device_info then we'd likely want to avoid making
    assumptions about the C types during codegen and adding explicit
    casts, while that's not necessary with a dedicated struct with all
    members being uint64_t.
  - This structure and the code for initializing it is currently shared
    (just through copy & paste) with a few other projects dealing with
    OA counters, and that's been convenient so far.

Signed-off-by: Robert Bragg <robert@sixbynine.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
7 years agoi965: XML description of Haswell OA metric set
Robert Bragg [Thu, 4 Jun 2015 12:54:43 +0000 (13:54 +0100)]
i965: XML description of Haswell OA metric set

In preparation for exposing Gen Observation Architecture performance
counters via INTEL_performance_query this adds an XML description for an
initial 'Render Metrics Basic Gen7.5' query and corresponding counters.

The intention is to auto generate code for building a query from these
counters as well as the code for normalizing the individual counters.

Note that the upstream for this XML data is currently GPU Top:

  https://github.com/rib/gputop

The files are maintained under gputop-data/ and they are themselves
derived from files in an internal 'MDAPI XML' schema. There are scripts
under gputop-scripts/ and make rules in gputop-data/Makefile.xml for
maintaining these files.

Signed-off-by: Robert Bragg <robert@sixbynine.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
7 years agonv50/ir: check for origin insn in findOriginForTestWithZero
Pierre Moreau [Sat, 18 Feb 2017 17:51:50 +0000 (18:51 +0100)]
nv50/ir: check for origin insn in findOriginForTestWithZero

Function arguments do not have an "origin" instruction, causing a
NULL-pointer dereference without this check.

Signed-off-by: Pierre Moreau <pierre.morrow@free.fr>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
7 years agomesa/main: make use of lookup_samplerobj_locked()
Samuel Pitoiset [Thu, 9 Mar 2017 09:50:14 +0000 (10:50 +0100)]
mesa/main: make use of lookup_samplerobj_locked()

There is no need to check sampler == 0 twice. This removes now
unused _mesa_lookup_samplerobj_locked().

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
7 years agomesa/main: inline {begin,end}_samplerobj_lookups()
Samuel Pitoiset [Thu, 9 Mar 2017 09:50:13 +0000 (10:50 +0100)]
mesa/main: inline {begin,end}_samplerobj_lookups()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
7 years agoglsl/blob: clear padding bytes
Grazvydas Ignotas [Thu, 2 Mar 2017 23:59:57 +0000 (01:59 +0200)]
glsl/blob: clear padding bytes

Since blob is intended for serializing data, it's not a good idea to
leave padding holes with uninitialized data, which may leak heap
contents and hurt compression if the blob is later compressed, like
done by shader cache. Clear it.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
7 years agoutil/disk_cache: fix size subtraction on 32bit
Grazvydas Ignotas [Thu, 9 Mar 2017 00:54:53 +0000 (02:54 +0200)]
util/disk_cache: fix size subtraction on 32bit

Negating size_t on 32bit produces a 32bit result. This was effectively
adding values close to UINT_MAX to the cache size (the files are usually
small) instead of intended subtraction.
Fixes 'make check' disk_cache failures on 32bit.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
7 years agoutil/disk_cache: fix compressed size calculation
Grazvydas Ignotas [Thu, 9 Mar 2017 00:54:52 +0000 (02:54 +0200)]
util/disk_cache: fix compressed size calculation

It incorrectly doubles the size on each iteration.

Fixes: 85a9b1b5 "util/disk_cache: compress individual cache entries"
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
7 years agoglsl: builtin: always return clones of the builtins
Lionel Landwerlin [Tue, 7 Mar 2017 18:37:58 +0000 (18:37 +0000)]
glsl: builtin: always return clones of the builtins

Builtins are created once and allocated using their own private ralloc
context. When reparenting IR that includes builtins, we might be steal
bits of builtins. This is problematic because these builtins might now
be freed when the shader that includes then last is disposed. This
might also lead to inconsistent ralloc trees/lists if shaders are
created on multiple threads.

Rather than including builtins directly into a shader's IR, we should
include clones of them in the ralloc context of the shader that
requires them. This fixes double free issues we've been seeing when
running shader-db on a big multicore (72 threads) server.

v2: Also rename _mesa_glsl_find_builtin_function_by_name() to better
    reflect how this function is used. (Ken)

v3: Rename ctx to mem_ctx (Ken)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
7 years agoi965: Delete render ring prelude.
Kenneth Graunke [Wed, 8 Mar 2017 00:12:00 +0000 (16:12 -0800)]
i965: Delete render ring prelude.

This was a hook I came up when trying to do the initial performance
counter work years ago.  Nothing's used it for a long time, and the
upcoming performance counter support doesn't want it either.

So, goodbye render ring prelude.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
7 years agoswr: s/uint/enum pipe_render_cond_flag/
Vinson Lee [Wed, 8 Mar 2017 22:56:04 +0000 (14:56 -0800)]
swr: s/uint/enum pipe_render_cond_flag/

Fix build error.

swr_context.cpp: In function ‘void swr_blit(pipe_context*, const pipe_blit_info*)’:
swr_context.cpp:336:44: error: invalid conversion from ‘uint {aka unsigned int}’ to ‘pipe_render_cond_flag’ [-fpermissive]
                                       ctx->render_cond_mode);
                                       ~~~~~^~~~~~~~~~~~~~~~

Fixes: b0d39384307d ("gallium: s/uint/enum pipe_render_cond_flag/ for set_render_condition()")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100133
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
7 years agoradv: Don't flush the CB before doing a fast clear eliminate.
Bas Nieuwenhuizen [Sun, 5 Mar 2017 16:17:06 +0000 (17:17 +0100)]
radv: Don't flush the CB before doing a fast clear eliminate.

The only way we write CMASK/DCC compressed textures through shaders
is fast clears and CMASK/DCC inits, which have their own flushes.
Hence the CB cache is always up to date.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Don't emit cache flushes on subpass switch.
Bas Nieuwenhuizen [Sun, 5 Mar 2017 14:52:28 +0000 (15:52 +0100)]
radv: Don't emit cache flushes on subpass switch.

I think we should only flush right before an action (draw/dispatch etc.),
as otherwise it is too easy to issue redundant flushes.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Only flush for the needed stages, and before the flushes.
Bas Nieuwenhuizen [Wed, 8 Mar 2017 22:51:01 +0000 (23:51 +0100)]
radv: Only flush for the needed stages, and before the flushes.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Don't invalidate CB/DB for images that aren't modified outside CB/DB.
Bas Nieuwenhuizen [Wed, 8 Mar 2017 22:45:45 +0000 (23:45 +0100)]
radv: Don't invalidate CB/DB for images that aren't modified outside CB/DB.

Without stores, the only writes are fast clears, transfers and metadata
initialization, each of which have the appropiate invalidations already.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Flush more caches after writes.
Bas Nieuwenhuizen [Wed, 8 Mar 2017 20:36:55 +0000 (21:36 +0100)]
radv: Flush more caches after writes.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Don't flush for fixed-function reading.
Bas Nieuwenhuizen [Wed, 8 Mar 2017 20:34:53 +0000 (21:34 +0100)]
radv: Don't flush for fixed-function reading.

The data should always be in memory after a src flush.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Invalidate the correct caches for CB/DB dst barriers.
Bas Nieuwenhuizen [Wed, 8 Mar 2017 20:31:53 +0000 (21:31 +0100)]
radv: Invalidate the correct caches for CB/DB dst barriers.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Determine cache flushes per object.
Bas Nieuwenhuizen [Wed, 8 Mar 2017 20:25:00 +0000 (21:25 +0100)]
radv: Determine cache flushes per object.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agomesa/main: remove unused _mesa_new_texture_image()
Samuel Pitoiset [Wed, 8 Mar 2017 13:30:40 +0000 (14:30 +0100)]
mesa/main: remove unused _mesa_new_texture_image()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
7 years agoradv/ac: fixup texture coord to have right number of channels.
Dave Airlie [Wed, 8 Mar 2017 22:26:13 +0000 (08:26 +1000)]
radv/ac: fixup texture coord to have right number of channels.

Jason has patches to add validation to this area, this should fix
radv shaders.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agost/nine: pass NULL to ureg_get_tokens()
Timothy Arceri [Thu, 2 Mar 2017 23:12:09 +0000 (10:12 +1100)]
st/nine: pass NULL to ureg_get_tokens()

The number of tokens in never used and the pointer is NULL checked
so just pass NULL.

Reviewed-by: Axel Davy <axel.davy@ens.fr>
7 years agodocs: ARB_shader_atomic_counter_ops is enabled on i965/gen7+.
Matt Turner [Wed, 8 Mar 2017 21:57:20 +0000 (13:57 -0800)]
docs: ARB_shader_atomic_counter_ops is enabled on i965/gen7+.

This extension was enabled in commit 40dd45d0c6aa ("i965: Enable
ARB_shader_atomic_counter_ops") but the commit failed to update the
release notes or features.txt. The release notes ship has sailed, since
the commit was in 13.0.

7 years agovc4: Fix math with a condition flag set.
Eric Anholt [Wed, 8 Mar 2017 20:07:16 +0000 (12:07 -0800)]
vc4: Fix math with a condition flag set.

Math results land in r4, regardless of the condition.  To implement them,
we just need to ensure that the results are moved out of r4 (as often
happens anyway, the values is live across another math instruction), so
that we can attach the condition to the MOV.

Fixes dEQP-GLES2.functional.shaders.random.all_features.fragment.93 and a
couple others, that were assertion failing that their conditions hadn't
been handled during the QIR->QPU stage.

7 years agovc4: Fix register pressure cost estimates when a src appears twice.
Eric Anholt [Sat, 4 Mar 2017 01:03:44 +0000 (17:03 -0800)]
vc4: Fix register pressure cost estimates when a src appears twice.

This ended up confusing the scheduler for things like fabs (implemented as
fmaxabs x, x) or squaring a number, and it would try to avoid scheduling
them because it appeared more expensive than other instructions.

Fixes failure to register allocate in
dEQP-GLES2.functional.uniform_api.random.3 with almost no shader-db
effects (+.35% max temps)

7 years agovc4: Report to shader-db how many threads a fragment shader has.
Eric Anholt [Sat, 4 Mar 2017 00:37:50 +0000 (16:37 -0800)]
vc4: Report to shader-db how many threads a fragment shader has.

Doing instruction count analysis when we emit the thread switches that
will save us from tons of stalls is kind of missing the point.

7 years agoRevert "vc4: Lazily emit our FS/VS input loads."
Eric Anholt [Tue, 7 Mar 2017 02:04:12 +0000 (18:04 -0800)]
Revert "vc4: Lazily emit our FS/VS input loads."

This reverts commit 292c24ddac5acc35676424f05291c101fcd47b3e.  It broke a
lot of GLES2 deqp, and I see at least one problem that will require some
serious rework to fix.

7 years agoradeonsi: fix elimination of literal VS outputs
Marek Olšák [Mon, 6 Mar 2017 22:57:33 +0000 (23:57 +0100)]
radeonsi: fix elimination of literal VS outputs

broken when switched to the new intrinsics.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
7 years agoloader: Move non-error message to debug level
Fabio Estevam [Sat, 4 Mar 2017 22:07:27 +0000 (19:07 -0300)]
loader: Move non-error message to debug level

Currently when running mesa on imx6 the following loader warnings
are seen:

# kmscube -D /dev/dri/card1
MESA-LOADER: device is not located on the PCI bus
MESA-LOADER: device is not located on the PCI bus
MESA-LOADER: device is not located on the PCI bus
Using display 0x1920948 with EGL version 1.4

As this is not an error message, change it to debug level in
order to have a cleaner log output.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
7 years agoandroid: r600: fix libmesa_amd_common dependency
Mauro Rossi [Sun, 5 Mar 2017 21:23:24 +0000 (22:23 +0100)]
android: r600: fix libmesa_amd_common dependency

Adding libmesa_amd_common dependency and exporting its headers,
avoids the following building error:

external/mesa/src/gallium/drivers/r600/evergreen_compute.c:29:10: fatal error: 'ac_binary.h' file not found
         ^
1 error generated.

Fixes: 3bbbb63 "automake: r600: radeonsi: correctly manage libamd_common.la linking"
Fixes: 503fb13 "radeon/ac: switch to ac_shader_binary_config_start()"
v2 [Emil Velikov: drop unneeded LOCAL_EXPORT_C_INCLUDE_DIRS]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
7 years agogallium/targets: rework the empty targets removal
Emil Velikov [Sun, 5 Mar 2017 17:17:10 +0000 (17:17 +0000)]
gallium/targets: rework the empty targets removal

Earlier commit added extra tracking and we've attempted to remove the
vdpau/other folder if empty. V2 of said commit dropped the pipe
to /dev/null and the explicit "true" override.

Sadly both of those are needed since there's no guarantee that the
folder will be empty before we [mesa] make install.

Since we're bringing those two back, there's no need to track if we've
installed anything, and simply do "rm -d foo/ &>/dev/null || true"

Tested-by: Andy Furniss <adf.lists@gmail.com>
Reported-by: Andy Furniss <adf.lists@gmail.com>
Fixes: 1cd4fde053 ("gallium/targets: don't leave an empty target directory(ies)")
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
7 years agoutil/indices: minor clean-ups
Brian Paul [Sun, 5 Mar 2017 19:59:09 +0000 (12:59 -0700)]
util/indices: minor clean-ups

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agoradeonsi: s/uint/enum pipe_shader_type/
Brian Paul [Tue, 7 Mar 2017 02:05:00 +0000 (19:05 -0700)]
radeonsi: s/uint/enum pipe_shader_type/

This can probably be done in more places in the driver.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agogallium: s/uint/enum pipe_render_cond_flag/ for set_render_condition()
Brian Paul [Sun, 5 Mar 2017 20:07:28 +0000 (13:07 -0700)]
gallium: s/uint/enum pipe_render_cond_flag/ for set_render_condition()

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agogallium: s/uint/enum pipe_shader_type/ for set_constant_buffer()
Brian Paul [Sun, 5 Mar 2017 19:45:34 +0000 (12:45 -0700)]
gallium: s/uint/enum pipe_shader_type/ for set_constant_buffer()

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agogallium: s/unsigned/enum pipe_shader_type/ for get_compiler_options()
Brian Paul [Sun, 5 Mar 2017 19:35:22 +0000 (12:35 -0700)]
gallium: s/unsigned/enum pipe_shader_type/ for get_compiler_options()

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agovirgl: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:30:17 +0000 (12:30 -0700)]
virgl: s/unsigned/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agoswr: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:30:01 +0000 (12:30 -0700)]
swr: s/unsigned/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agosoftpipe: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:29:44 +0000 (12:29 -0700)]
softpipe: s/unsigned/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agollvmpipe: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:29:22 +0000 (12:29 -0700)]
llvmpipe: s/unsigned/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agofreedreno: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:29:07 +0000 (12:29 -0700)]
freedreno: s/unsigned/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agoetnaviv: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:28:51 +0000 (12:28 -0700)]
etnaviv: s/unsigned/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agodraw: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:18:06 +0000 (12:18 -0700)]
draw: s/unsigned/enum pipe_shader_type/

and some s/uint/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agocso: s/unsigned/enum pipe_shader_type/
Brian Paul [Sun, 5 Mar 2017 19:16:39 +0000 (12:16 -0700)]
cso: s/unsigned/enum pipe_shader_type/

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agogallium: s/unsigned/enum pipe_shader_type/ for pipe_screen::get_shader_param()
Brian Paul [Sun, 5 Mar 2017 19:13:02 +0000 (12:13 -0700)]
gallium: s/unsigned/enum pipe_shader_type/ for pipe_screen::get_shader_param()

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
7 years agoanv: change BLOCK_POOL_MEMFD_SIZE to exactly 2GB
Tapani Pälli [Tue, 7 Mar 2017 09:17:42 +0000 (11:17 +0200)]
anv: change BLOCK_POOL_MEMFD_SIZE to exactly 2GB

This is what comment above definition says and change fixes issue with
32bit build where BLOCK_POOL_MEMFD_SIZE is used as ftruncate parameter
and constant currently gets converted from 4294967296 to 0.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
7 years agoRevert "configure.ac: Use PKG_CHECK_VAR for wayland-scanner."
Matt Turner [Wed, 8 Mar 2017 05:24:00 +0000 (21:24 -0800)]
Revert "configure.ac: Use PKG_CHECK_VAR for wayland-scanner."

This reverts commit 8a26e944399ae4d0fd662e5106f0b34f5ced462d.

7 years agoRevert "configure.ac: Use PKG_CHECK_VAR for libclc."
Matt Turner [Wed, 8 Mar 2017 05:23:57 +0000 (21:23 -0800)]
Revert "configure.ac: Use PKG_CHECK_VAR for libclc."

This reverts commit 706074cc96cec8bad6c3569fc53b0b3a05ad176f.

7 years agoi965: Remove use of deprecated drm_intel_aub routines
Chris Wilson [Fri, 7 Aug 2015 18:18:55 +0000 (19:18 +0100)]
i965: Remove use of deprecated drm_intel_aub routines

With mesa/drm commit cd2f91e18db087edf93fed828e568ee53b887860
Author: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date:   Fri Jul 31 10:47:50 2015 -0700

    intel: Drop aub dumping functionality

the drm_intel_aub routines are mere stubs and do nothing. Likewise
remove our invocations.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
7 years agospirv: Silence unused variable warnings in release mode
Jason Ekstrand [Tue, 7 Mar 2017 20:54:33 +0000 (12:54 -0800)]
spirv: Silence unused variable warnings in release mode

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
7 years agoanv: Make the framebuffer-renderpass format assert non-fatal
Jason Ekstrand [Tue, 7 Mar 2017 17:29:46 +0000 (09:29 -0800)]
anv: Make the framebuffer-renderpass format assert non-fatal

This should let Dota 2 run on debug builds though it will spew errors
like mad.  Hopefully, Valve will get this fixed sooner rather than
later.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
7 years agoanv: Drop the anv_validate block helper
Jason Ekstrand [Tue, 7 Mar 2017 17:25:14 +0000 (09:25 -0800)]
anv: Drop the anv_validate block helper

Over the course of driver development, we've come up with a number of
different schemes for adding giant blocks of asserts inside the driver.
This one is only being used once in anv_pipeline.c and the way it's
being used actually generates compiler warnings in release builds.  This
commit drops the anv_validate macro and just puts the contents of the
one validation function in side of a "#ifdef DEBUG" guard.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
7 years agoanv: Get rid of the stub() macros
Jason Ekstrand [Tue, 7 Mar 2017 17:19:29 +0000 (09:19 -0800)]
anv: Get rid of the stub() macros

Except for a few unimplemented things on gen7, we don't really have
stubs anymore so we should drop this.  This commit replaces the few gen7
stub() calls with explicitly labeled finishme's and makes the sparse
binding stuff silently no-op or return a FEATURE_NOT_PRESENT error.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
7 years agoanv: Remove a pointless finishme
Jason Ekstrand [Tue, 7 Mar 2017 17:14:34 +0000 (09:14 -0800)]
anv: Remove a pointless finishme

We've been supporting multiple shaders per module for some time now.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
7 years agoanv: Convert the HiZ finishme's to perf_warn
Jason Ekstrand [Tue, 7 Mar 2017 17:14:23 +0000 (09:14 -0800)]
anv: Convert the HiZ finishme's to perf_warn

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
7 years agoanv: Add a performance warning helper
Jason Ekstrand [Tue, 7 Mar 2017 17:13:15 +0000 (09:13 -0800)]
anv: Add a performance warning helper

This acts identically to anv_finishme except that it only dumps out
these nice log messages if you run with INTEL_DEBUG=perf.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
7 years agost/mesa: don't propagate uniforms when restoring from cache
Timothy Arceri [Fri, 3 Mar 2017 05:59:48 +0000 (16:59 +1100)]
st/mesa: don't propagate uniforms when restoring from cache

We will have already loaded the uniforms when the parameter list
was restored from cache.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agoradv: remove duplicate initialization of alphaToOne feature
Damien Grassart [Sun, 5 Mar 2017 23:56:20 +0000 (00:56 +0100)]
radv: remove duplicate initialization of alphaToOne feature

Fixes a GCC warning when compiling with -Wextra:
radv_device.c:463:47: warning: initialized field overwritten [-Woverride-init]

Signed-off-by: Damien Grassart <damien@grassart.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: disable mip point pre clamping.
Dave Airlie [Tue, 7 Mar 2017 05:08:42 +0000 (05:08 +0000)]
radv: disable mip point pre clamping.

No idea what this does, but disabling it fixes a bunch
of failing CTS tests in the lod area, so let's go with that.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv/ac: fix multiple descriptor sets with dynamic buffers
Fredrik Höglund [Tue, 7 Mar 2017 00:53:22 +0000 (01:53 +0100)]
radv/ac: fix multiple descriptor sets with dynamic buffers

The dynamic_offset_offset in the descriptor set binding layout is
relative to the dynamic_offset_start for the set in the pipeline
layout.

Cc: 17.0 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Fredrik Höglund <fredrik@kde.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
7 years agoradv: fix the size of the dynamic_buffers array
Fredrik Höglund [Tue, 7 Mar 2017 00:53:21 +0000 (01:53 +0100)]
radv: fix the size of the dynamic_buffers array

A buffer descriptor is 16 bytes, not 16 dwords.

Signed-off-by: Fredrik Höglund <fredrik@kde.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
7 years agoradv: fix the dynamic buffer index in vkCmdBindDescriptorSets
Fredrik Höglund [Tue, 7 Mar 2017 00:53:20 +0000 (01:53 +0100)]
radv: fix the dynamic buffer index in vkCmdBindDescriptorSets

This fixes the wrong dynamic buffer descriptors being updated when
firstSet > 0.

Cc: 17.0 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Fredrik Höglund <fredrik@kde.org>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
7 years agoconfigure.ac: Ensure libomxil-bellagio exists before invoking pkg-config.
Matt Turner [Mon, 6 Mar 2017 18:49:05 +0000 (10:49 -0800)]
configure.ac: Ensure libomxil-bellagio exists before invoking pkg-config.

I was already tired of seeing the message

    Package libomxil-bellagio was not found in the pkg-config search path.
    Perhaps you should add the directory containing `libomxil-bellagio.pc'
    to the PKG_CONFIG_PATH environment variable
    No package 'libomxil-bellagio' found

on every configure, but I just got a distro bug reported where the user
was confused by this message and thought it indicated a bug.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
7 years agoconfigure.ac: Ensure libva is enabled before invoking pkg-config.
Matt Turner [Mon, 6 Mar 2017 18:42:30 +0000 (10:42 -0800)]
configure.ac: Ensure libva is enabled before invoking pkg-config.

PKG_CHECK_VAR can only check --variable=$NAME, so it cannot handle
modversion.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
7 years agoconfigure.ac: Use PKG_CHECK_VAR for libclc.
Matt Turner [Mon, 6 Mar 2017 18:42:10 +0000 (10:42 -0800)]
configure.ac: Use PKG_CHECK_VAR for libclc.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
7 years agoconfigure.ac: Use PKG_CHECK_VAR for wayland-scanner.
Matt Turner [Mon, 6 Mar 2017 18:20:10 +0000 (10:20 -0800)]
configure.ac: Use PKG_CHECK_VAR for wayland-scanner.

Available since pkg-config-0.28 and pkgconf-0.8.10.

The removal of the AC_PATH_PROG is intentional. Use pkg-config.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
7 years agoconfigure.ac: Fix error message in radeon_llvm_check().
Matt Turner [Mon, 6 Mar 2017 17:17:19 +0000 (09:17 -0800)]
configure.ac: Fix error message in radeon_llvm_check().

It printed the version of LLVM ($1):

   configure: error: 3.6.0 requires libelf when using llvm

instead of the driver name ($2):

   configure: error: r600 requires libelf when using llvm

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Tobias Droste <tdroste@gmx.de>
7 years agobuild: Replace NEED_RADEON_LLVM with HAVE_GALLIUM_LLVM.
Matt Turner [Mon, 6 Mar 2017 17:35:33 +0000 (09:35 -0800)]
build: Replace NEED_RADEON_LLVM with HAVE_GALLIUM_LLVM.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
7 years agoradv: Use the subresource range in HTILE initialization.
Bas Nieuwenhuizen [Tue, 7 Mar 2017 00:07:02 +0000 (01:07 +0100)]
radv: Use the subresource range in HTILE initialization.

v2: fix levelCount assert.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Use winsys HTILE info.
Bas Nieuwenhuizen [Mon, 6 Mar 2017 23:58:04 +0000 (00:58 +0100)]
radv: Use winsys HTILE info.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoradv/amdgpu: Let addrlib calculate the HTILE parameters.
Bas Nieuwenhuizen [Mon, 6 Mar 2017 23:37:46 +0000 (00:37 +0100)]
radv/amdgpu: Let addrlib calculate the HTILE parameters.

Still not sure we can support miptrees when sampling from
HTILE enabled textures.

Added the tcCompatible winsys stuff while I'm at it.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
7 years agoamd/common: document PREDICATION OP 3 as 64-bit bool.
Dave Airlie [Wed, 1 Mar 2017 19:40:09 +0000 (05:40 +1000)]
amd/common: document PREDICATION OP 3 as 64-bit bool.

This just documents some info for possible future use.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: handle z offset for 3d image <-> buffer copies.
Dave Airlie [Tue, 7 Mar 2017 00:30:01 +0000 (00:30 +0000)]
radv: handle z offset for 3d image <-> buffer copies.

This fixes:
dEQP-VK.pipeline.render_to_image.3d.huge.depth.r8g8b8a8_unorm

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: move fast clear before resolve into own loop.
Dave Airlie [Mon, 6 Mar 2017 23:31:48 +0000 (23:31 +0000)]
radv: move fast clear before resolve into own loop.

Don't fast clear inside the meta loop as things get
confused, fixes a crash in:
dEQP-VK.api.copy_and_blit.resolve_image.whole_array_image.2_bit

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv: Disable HTILE for textures with multiple layers/levels.
Bas Nieuwenhuizen [Mon, 6 Mar 2017 22:23:57 +0000 (23:23 +0100)]
radv: Disable HTILE for textures with multiple layers/levels.

It has issues and the fix I'm working on is too complicated for stable,
so disable for now.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
CC: 13.0 17.0 <mesa-stable@lists.freedesktop.org>
7 years agoradv: Properly handle destroying NULL devices and instances
Dave Airlie [Mon, 6 Mar 2017 05:40:16 +0000 (15:40 +1000)]
radv: Properly handle destroying NULL devices and instances

Ported from anv:
3d33a23e anv: Properly handle destroying NULL devices and instances

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv/ac: introduce i1true/i1false to context.
Dave Airlie [Mon, 6 Mar 2017 02:24:59 +0000 (12:24 +1000)]
radv/ac: introduce i1true/i1false to context.

This uses these in a few places, and fixes one or two
cases which were using da as 32-bit instead of bool.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv/ac: handle Z export using new builder.
Dave Airlie [Mon, 6 Mar 2017 00:06:11 +0000 (10:06 +1000)]
radv/ac: handle Z export using new builder.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradv/ac: move to using common ac_get_image_intr_name.
Dave Airlie [Sun, 5 Mar 2017 22:37:54 +0000 (08:37 +1000)]
radv/ac: move to using common ac_get_image_intr_name.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradeonsi/ac: move get_image_intr_name to common
Dave Airlie [Sun, 5 Mar 2017 22:37:22 +0000 (08:37 +1000)]
radeonsi/ac: move get_image_intr_name to common

This code is used in radv, so move to common build code.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agogallium/util: remove unused header from u_queue.c
Timothy Arceri [Mon, 6 Mar 2017 00:58:29 +0000 (11:58 +1100)]
gallium/util: remove unused header from u_queue.c

Reviewed-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: remove unused pipe_thread_destroy()
Timothy Arceri [Mon, 6 Mar 2017 00:58:28 +0000 (11:58 +1100)]
gallium/util: remove unused pipe_thread_destroy()

Reviewed-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_thread_wait() with thrd_join()
Timothy Arceri [Mon, 6 Mar 2017 00:58:27 +0000 (11:58 +1100)]
gallium/util: replace pipe_thread_wait() with thrd_join()

Replace done using:
find ./src -type f -exec sed -i -- \
's:pipe_thread_wait(\([^)]*\)):thrd_join(\1, NULL):g' {} \;

Reviewed-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: remove PIPE_THREAD_ROUTINE()
Timothy Arceri [Mon, 6 Mar 2017 00:58:26 +0000 (11:58 +1100)]
gallium/util: remove PIPE_THREAD_ROUTINE()

This was made unnecessary with fd33a6bcd7f12.

This was mostly done with:
find ./src -type f -exec sed -i -- \
's:PIPE_THREAD_ROUTINE(\([^,]*\), \([^)]*\)):int\n\1(void \*\2):g' {} \;

With some small manual tidy ups.

Reviewed-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_condvar with cnd_t
Timothy Arceri [Sun, 5 Mar 2017 23:41:39 +0000 (10:41 +1100)]
gallium/util: replace pipe_condvar with cnd_t

pipe_condvar was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_thread with thrd_t
Timothy Arceri [Sun, 5 Mar 2017 01:39:49 +0000 (12:39 +1100)]
gallium/util: replace pipe_thread with thrd_t

pipe_thread was made unnecessary with fd33a6bcd7f12.

V2: fix compile error in u_queue.c

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_mutex_unlock() with mtx_unlock()
Timothy Arceri [Sun, 5 Mar 2017 01:32:06 +0000 (12:32 +1100)]
gallium/util: replace pipe_mutex_unlock() with mtx_unlock()

pipe_mutex_unlock() was made unnecessary with fd33a6bcd7f12.

Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_unlock(\([^)]*\)):mtx_unlock(\&\1):g' {} \;

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_mutex_lock() with mtx_lock()
Timothy Arceri [Sun, 5 Mar 2017 01:12:30 +0000 (12:12 +1100)]
gallium/util: replace pipe_mutex_lock() with mtx_lock()

replace pipe_mutex_lock() was made unnecessary with fd33a6bcd7f12.

Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_lock(\([^)]*\)):mtx_lock(\&\1):g' {} \;

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_mutex_destroy() with mtx_destroy()
Timothy Arceri [Sun, 5 Mar 2017 01:32:04 +0000 (12:32 +1100)]
gallium/util: replace pipe_mutex_destroy() with mtx_destroy()

pipe_mutex_destroy() was made unnecessary with fd33a6bcd7f12.

Replace was done with:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_destroy(\([^)]*\)):mtx_destroy(\&\1):g' {} \;

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_mutex_init() with mtx_init()
Timothy Arceri [Sun, 5 Mar 2017 01:00:15 +0000 (12:00 +1100)]
gallium/util: replace pipe_mutex_init() with mtx_init()

pipe_mutex_init() was made unnecessary with fd33a6bcd7f12.

Replace was done using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_init(\([^)]*\)):(void) mtx_init(\&\1, mtx_plain):g' {} \;

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: remove pipe_static_mutex()
Timothy Arceri [Sun, 5 Mar 2017 01:32:02 +0000 (12:32 +1100)]
gallium/util: remove pipe_static_mutex()

This was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_mutex with mtx_t
Timothy Arceri [Sun, 5 Mar 2017 01:32:01 +0000 (12:32 +1100)]
gallium/util: replace pipe_mutex with mtx_t

pipe_mutex was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_condvar_broadcast() with cnd_broadcast()
Timothy Arceri [Sat, 4 Mar 2017 23:41:33 +0000 (10:41 +1100)]
gallium/util: replace pipe_condvar_broadcast() with cnd_broadcast()

pipe_condvar_broadcast() was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_condvar_signal() with cnd_signal()
Timothy Arceri [Sat, 4 Mar 2017 23:41:32 +0000 (10:41 +1100)]
gallium/util: replace pipe_condvar_signal() with cnd_signal()

pipe_condvar_signal() was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_condvar_wait() with cnd_wait()
Timothy Arceri [Sat, 4 Mar 2017 23:41:31 +0000 (10:41 +1100)]
gallium/util: replace pipe_condvar_wait() with cnd_wait()

pipe_condvar_wait() was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_condvar_destroy() with cnd_destroy()
Timothy Arceri [Sat, 4 Mar 2017 23:41:30 +0000 (10:41 +1100)]
gallium/util: replace pipe_condvar_destroy() with cnd_destroy()

pipe_condvar_destroy() was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agogallium/util: replace pipe_condvar_init() with cnd_init()
Timothy Arceri [Sat, 4 Mar 2017 23:41:29 +0000 (10:41 +1100)]
gallium/util: replace pipe_condvar_init() with cnd_init()

pipe_condvar_init() was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agost/dri: reduce dri_fill_st_options() params
Marek Olšák [Mon, 6 Mar 2017 04:03:17 +0000 (15:03 +1100)]
st/dri: reduce dri_fill_st_options() params

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>