2015-04-07 15:15:09 -07:00
|
|
|
/*
|
|
|
|
* Copyright © 2014 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "brw_nir.h"
|
2015-08-12 14:29:25 -07:00
|
|
|
#include "brw_shader.h"
|
2016-01-18 12:54:03 +02:00
|
|
|
#include "compiler/nir/glsl_to_nir.h"
|
|
|
|
#include "compiler/nir/nir_builder.h"
|
2015-04-07 15:15:09 -07:00
|
|
|
#include "program/prog_to_nir.h"
|
|
|
|
|
2015-12-09 02:37:52 -08:00
|
|
|
static bool
|
|
|
|
is_input(nir_intrinsic_instr *intrin)
|
|
|
|
{
|
|
|
|
return intrin->intrinsic == nir_intrinsic_load_input ||
|
|
|
|
intrin->intrinsic == nir_intrinsic_load_per_vertex_input;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
is_output(nir_intrinsic_instr *intrin)
|
|
|
|
{
|
|
|
|
return intrin->intrinsic == nir_intrinsic_load_output ||
|
|
|
|
intrin->intrinsic == nir_intrinsic_load_per_vertex_output ||
|
|
|
|
intrin->intrinsic == nir_intrinsic_store_output ||
|
|
|
|
intrin->intrinsic == nir_intrinsic_store_per_vertex_output;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* In many cases, we just add the base and offset together, so there's no
|
|
|
|
* reason to keep them separate. Sometimes, combining them is essential:
|
|
|
|
* if a shader only accesses part of a compound variable (such as a matrix
|
|
|
|
* or array), the variable's base may not actually exist in the VUE map.
|
|
|
|
*
|
|
|
|
* This pass adds constant offsets to instr->const_index[0], and resets
|
|
|
|
* the offset source to 0. Non-constant offsets remain unchanged - since
|
|
|
|
* we don't know what part of a compound variable is accessed, we allocate
|
|
|
|
* storage for the entire thing.
|
|
|
|
*/
|
|
|
|
struct add_const_offset_to_base_params {
|
2015-11-25 14:14:05 -08:00
|
|
|
nir_builder b;
|
2015-12-09 02:37:52 -08:00
|
|
|
nir_variable_mode mode;
|
2015-11-25 14:14:05 -08:00
|
|
|
};
|
|
|
|
|
2015-08-14 16:01:33 -07:00
|
|
|
static bool
|
2016-01-13 15:04:39 -08:00
|
|
|
add_const_offset_to_base_block(nir_block *block, void *closure)
|
2015-08-14 16:01:33 -07:00
|
|
|
{
|
2015-12-09 02:37:52 -08:00
|
|
|
struct add_const_offset_to_base_params *params = closure;
|
|
|
|
nir_builder *b = ¶ms->b;
|
2015-08-14 16:01:33 -07:00
|
|
|
|
2015-11-25 14:14:05 -08:00
|
|
|
nir_foreach_instr_safe(block, instr) {
|
2015-08-14 16:01:33 -07:00
|
|
|
if (instr->type != nir_instr_type_intrinsic)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
|
|
|
|
2015-12-09 02:37:52 -08:00
|
|
|
if ((params->mode == nir_var_shader_in && is_input(intrin)) ||
|
|
|
|
(params->mode == nir_var_shader_out && is_output(intrin))) {
|
|
|
|
nir_src *offset = nir_get_io_offset_src(intrin);
|
|
|
|
nir_const_value *const_offset = nir_src_as_const_value(*offset);
|
|
|
|
|
|
|
|
if (const_offset) {
|
|
|
|
intrin->const_index[0] += const_offset->u[0];
|
|
|
|
b->cursor = nir_before_instr(&intrin->instr);
|
|
|
|
nir_instr_rewrite_src(&intrin->instr, offset,
|
|
|
|
nir_src_for_ssa(nir_imm_int(b, 0)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
2016-01-13 15:04:39 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
add_const_offset_to_base(nir_shader *nir, nir_variable_mode mode)
|
|
|
|
{
|
|
|
|
struct add_const_offset_to_base_params params = { .mode = mode };
|
2015-12-09 02:37:52 -08:00
|
|
|
|
2016-01-13 15:04:39 -08:00
|
|
|
nir_foreach_function(nir, f) {
|
|
|
|
if (f->impl) {
|
|
|
|
nir_builder_init(¶ms.b, f->impl);
|
|
|
|
nir_foreach_block(f->impl, add_const_offset_to_base_block, ¶ms);
|
|
|
|
}
|
|
|
|
}
|
2015-12-09 02:37:52 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
remap_vs_attrs(nir_block *block, void *closure)
|
|
|
|
{
|
|
|
|
GLbitfield64 inputs_read = *((GLbitfield64 *) closure);
|
|
|
|
|
|
|
|
nir_foreach_instr(block, instr) {
|
|
|
|
if (instr->type != nir_instr_type_intrinsic)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
|
|
|
|
2015-08-14 16:01:33 -07:00
|
|
|
if (intrin->intrinsic == nir_intrinsic_load_input) {
|
|
|
|
/* Attributes come in a contiguous block, ordered by their
|
|
|
|
* gl_vert_attrib value. That means we can compute the slot
|
|
|
|
* number for an attribute by masking out the enabled attributes
|
|
|
|
* before it and counting the bits.
|
|
|
|
*/
|
2015-12-09 02:37:52 -08:00
|
|
|
int attr = intrin->const_index[0];
|
|
|
|
int slot = _mesa_bitcount_64(inputs_read & BITFIELD64_MASK(attr));
|
2015-11-25 14:14:05 -08:00
|
|
|
|
2015-08-14 16:01:33 -07:00
|
|
|
intrin->const_index[0] = 4 * slot;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-12-09 18:26:19 -08:00
|
|
|
static bool
|
|
|
|
remap_inputs_with_vue_map(nir_block *block, void *closure)
|
|
|
|
{
|
|
|
|
const struct brw_vue_map *vue_map = closure;
|
|
|
|
|
|
|
|
nir_foreach_instr(block, instr) {
|
|
|
|
if (instr->type != nir_instr_type_intrinsic)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
|
|
|
|
|
|
|
if (intrin->intrinsic == nir_intrinsic_load_input ||
|
|
|
|
intrin->intrinsic == nir_intrinsic_load_per_vertex_input) {
|
|
|
|
int vue_slot = vue_map->varying_to_slot[intrin->const_index[0]];
|
|
|
|
assert(vue_slot != -1);
|
|
|
|
intrin->const_index[0] = vue_slot;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-12-09 21:41:35 -08:00
|
|
|
struct remap_patch_urb_offsets_state {
|
|
|
|
nir_builder b;
|
|
|
|
struct brw_vue_map vue_map;
|
|
|
|
};
|
|
|
|
|
|
|
|
static bool
|
|
|
|
remap_patch_urb_offsets(nir_block *block, void *closure)
|
|
|
|
{
|
|
|
|
struct remap_patch_urb_offsets_state *state = closure;
|
|
|
|
|
|
|
|
nir_foreach_instr_safe(block, instr) {
|
|
|
|
if (instr->type != nir_instr_type_intrinsic)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
|
|
|
|
|
|
|
|
gl_shader_stage stage = state->b.shader->stage;
|
|
|
|
|
|
|
|
if ((stage == MESA_SHADER_TESS_CTRL && is_output(intrin)) ||
|
|
|
|
(stage == MESA_SHADER_TESS_EVAL && is_input(intrin))) {
|
|
|
|
int vue_slot = state->vue_map.varying_to_slot[intrin->const_index[0]];
|
|
|
|
assert(vue_slot != -1);
|
|
|
|
intrin->const_index[0] = vue_slot;
|
|
|
|
|
|
|
|
nir_src *vertex = nir_get_io_vertex_index_src(intrin);
|
|
|
|
if (vertex) {
|
|
|
|
nir_const_value *const_vertex = nir_src_as_const_value(*vertex);
|
|
|
|
if (const_vertex) {
|
|
|
|
intrin->const_index[0] += const_vertex->u[0] *
|
|
|
|
state->vue_map.num_per_vertex_slots;
|
|
|
|
} else {
|
|
|
|
state->b.cursor = nir_before_instr(&intrin->instr);
|
|
|
|
|
|
|
|
/* Multiply by the number of per-vertex slots. */
|
|
|
|
nir_ssa_def *vertex_offset =
|
|
|
|
nir_imul(&state->b,
|
|
|
|
nir_ssa_for_src(&state->b, *vertex, 1),
|
|
|
|
nir_imm_int(&state->b,
|
|
|
|
state->vue_map.num_per_vertex_slots));
|
|
|
|
|
|
|
|
/* Add it to the existing offset */
|
|
|
|
nir_src *offset = nir_get_io_offset_src(intrin);
|
|
|
|
nir_ssa_def *total_offset =
|
|
|
|
nir_iadd(&state->b, vertex_offset,
|
|
|
|
nir_ssa_for_src(&state->b, *offset, 1));
|
|
|
|
|
|
|
|
nir_instr_rewrite_src(&intrin->instr, offset,
|
|
|
|
nir_src_for_ssa(total_offset));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-08-26 03:07:29 -07:00
|
|
|
static void
|
2015-11-03 00:31:15 -08:00
|
|
|
brw_nir_lower_inputs(nir_shader *nir,
|
|
|
|
const struct brw_device_info *devinfo,
|
|
|
|
bool is_scalar)
|
2015-08-26 03:07:29 -07:00
|
|
|
{
|
2015-10-01 00:46:19 -07:00
|
|
|
switch (nir->stage) {
|
2015-08-14 15:15:11 -07:00
|
|
|
case MESA_SHADER_VERTEX:
|
|
|
|
/* Start with the location of the variable's base. */
|
|
|
|
foreach_list_typed(nir_variable, var, node, &nir->inputs) {
|
|
|
|
var->data.driver_location = var->data.location;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now use nir_lower_io to walk dereference chains. Attribute arrays
|
|
|
|
* are loaded as one vec4 per element (or matrix column), so we use
|
|
|
|
* type_size_vec4 here.
|
|
|
|
*/
|
|
|
|
nir_lower_io(nir, nir_var_shader_in, type_size_vec4);
|
2015-08-14 16:01:33 -07:00
|
|
|
|
2016-01-13 15:07:18 -08:00
|
|
|
/* This pass needs actual constants */
|
|
|
|
nir_opt_constant_folding(nir);
|
|
|
|
|
|
|
|
add_const_offset_to_base(nir, nir_var_shader_in);
|
|
|
|
|
2015-11-25 14:01:00 -08:00
|
|
|
if (is_scalar) {
|
|
|
|
/* Finally, translate VERT_ATTRIB_* values into the actual registers.
|
|
|
|
*
|
|
|
|
* Note that we can use nir->info.inputs_read instead of
|
|
|
|
* key->inputs_read since the two are identical aside from Gen4-5
|
|
|
|
* edge flag differences.
|
|
|
|
*/
|
2015-12-09 02:37:52 -08:00
|
|
|
GLbitfield64 inputs_read = nir->info.inputs_read;
|
2015-11-25 14:14:05 -08:00
|
|
|
|
2015-12-26 10:00:47 -08:00
|
|
|
nir_foreach_function(nir, function) {
|
|
|
|
if (function->impl) {
|
|
|
|
nir_foreach_block(function->impl, remap_vs_attrs, &inputs_read);
|
2015-11-25 14:01:00 -08:00
|
|
|
}
|
2015-08-14 16:01:33 -07:00
|
|
|
}
|
|
|
|
}
|
2015-08-14 15:15:11 -07:00
|
|
|
break;
|
2015-12-09 21:39:27 -08:00
|
|
|
case MESA_SHADER_TESS_CTRL:
|
2015-09-23 20:52:19 -07:00
|
|
|
case MESA_SHADER_GEOMETRY: {
|
2015-12-09 21:39:27 -08:00
|
|
|
if (!is_scalar && nir->stage == MESA_SHADER_GEOMETRY) {
|
2015-09-23 20:52:19 -07:00
|
|
|
foreach_list_typed(nir_variable, var, node, &nir->inputs) {
|
|
|
|
var->data.driver_location = var->data.location;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* The GLSL linker will have already matched up GS inputs and
|
|
|
|
* the outputs of prior stages. The driver does extend VS outputs
|
|
|
|
* in some cases, but only for legacy OpenGL or Gen4-5 hardware,
|
|
|
|
* neither of which offer geometry shader support. So we can
|
|
|
|
* safely ignore that.
|
|
|
|
*
|
|
|
|
* For SSO pipelines, we use a fixed VUE map layout based on variable
|
|
|
|
* locations, so we can rely on rendezvous-by-location to make this
|
|
|
|
* work.
|
|
|
|
*
|
|
|
|
* However, we need to ignore VARYING_SLOT_PRIMITIVE_ID, as it's not
|
|
|
|
* written by previous stages and shows up via payload magic.
|
|
|
|
*/
|
|
|
|
struct brw_vue_map input_vue_map;
|
|
|
|
GLbitfield64 inputs_read =
|
|
|
|
nir->info.inputs_read & ~VARYING_BIT_PRIMITIVE_ID;
|
|
|
|
brw_compute_vue_map(devinfo, &input_vue_map, inputs_read,
|
2015-12-09 21:42:21 -08:00
|
|
|
nir->info.separate_shader ||
|
|
|
|
nir->stage == MESA_SHADER_TESS_CTRL);
|
2015-09-23 20:52:19 -07:00
|
|
|
|
|
|
|
foreach_list_typed(nir_variable, var, node, &nir->inputs) {
|
2015-12-09 18:26:19 -08:00
|
|
|
var->data.driver_location = var->data.location;
|
2015-09-23 20:52:19 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Inputs are stored in vec4 slots, so use type_size_vec4(). */
|
|
|
|
nir_lower_io(nir, nir_var_shader_in, type_size_vec4);
|
2015-12-09 18:26:19 -08:00
|
|
|
|
|
|
|
/* This pass needs actual constants */
|
|
|
|
nir_opt_constant_folding(nir);
|
|
|
|
|
2016-01-13 15:04:39 -08:00
|
|
|
add_const_offset_to_base(nir, nir_var_shader_in);
|
|
|
|
|
2015-12-26 10:00:47 -08:00
|
|
|
nir_foreach_function(nir, function) {
|
|
|
|
if (function->impl) {
|
|
|
|
nir_foreach_block(function->impl, remap_inputs_with_vue_map,
|
2015-12-09 18:26:19 -08:00
|
|
|
&input_vue_map);
|
|
|
|
}
|
|
|
|
}
|
2015-10-01 00:46:19 -07:00
|
|
|
}
|
|
|
|
break;
|
2015-09-23 20:52:19 -07:00
|
|
|
}
|
2015-12-09 21:41:35 -08:00
|
|
|
case MESA_SHADER_TESS_EVAL: {
|
|
|
|
struct remap_patch_urb_offsets_state state;
|
|
|
|
brw_compute_tess_vue_map(&state.vue_map,
|
|
|
|
nir->info.inputs_read & ~VARYING_BIT_PRIMITIVE_ID,
|
|
|
|
nir->info.patch_inputs_read);
|
|
|
|
|
|
|
|
foreach_list_typed(nir_variable, var, node, &nir->inputs) {
|
|
|
|
var->data.driver_location = var->data.location;
|
|
|
|
}
|
|
|
|
|
|
|
|
nir_lower_io(nir, nir_var_shader_in, type_size_vec4);
|
|
|
|
|
|
|
|
/* This pass needs actual constants */
|
|
|
|
nir_opt_constant_folding(nir);
|
|
|
|
|
2016-01-13 15:04:39 -08:00
|
|
|
add_const_offset_to_base(nir, nir_var_shader_in);
|
|
|
|
|
2015-12-26 10:00:47 -08:00
|
|
|
nir_foreach_function(nir, function) {
|
|
|
|
if (function->impl) {
|
|
|
|
nir_builder_init(&state.b, function->impl);
|
|
|
|
nir_foreach_block(function->impl, remap_patch_urb_offsets, &state);
|
2015-12-09 21:41:35 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2015-08-14 15:15:11 -07:00
|
|
|
case MESA_SHADER_FRAGMENT:
|
2015-10-12 17:18:51 -07:00
|
|
|
assert(is_scalar);
|
2015-10-01 00:46:19 -07:00
|
|
|
nir_assign_var_locations(&nir->inputs, &nir->num_inputs,
|
2015-10-12 17:18:51 -07:00
|
|
|
type_size_scalar);
|
2015-10-01 00:46:19 -07:00
|
|
|
break;
|
2015-10-14 11:33:03 -07:00
|
|
|
case MESA_SHADER_COMPUTE:
|
|
|
|
/* Compute shaders have no inputs. */
|
|
|
|
assert(exec_list_is_empty(&nir->inputs));
|
|
|
|
break;
|
2015-08-14 15:15:11 -07:00
|
|
|
default:
|
|
|
|
unreachable("unsupported shader stage");
|
2015-10-01 00:46:19 -07:00
|
|
|
}
|
2015-08-26 03:07:29 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2015-12-09 21:41:35 -08:00
|
|
|
brw_nir_lower_outputs(nir_shader *nir,
|
|
|
|
const struct brw_device_info *devinfo,
|
|
|
|
bool is_scalar)
|
2015-08-26 03:07:29 -07:00
|
|
|
{
|
2015-10-15 15:17:19 -07:00
|
|
|
switch (nir->stage) {
|
|
|
|
case MESA_SHADER_VERTEX:
|
2015-12-09 21:39:27 -08:00
|
|
|
case MESA_SHADER_TESS_EVAL:
|
2015-10-15 15:17:19 -07:00
|
|
|
case MESA_SHADER_GEOMETRY:
|
|
|
|
if (is_scalar) {
|
|
|
|
nir_assign_var_locations(&nir->outputs, &nir->num_outputs,
|
i965: Fix scalar VS float[] and vec2[] output arrays.
The scalar VS backend has never handled float[] and vec2[] outputs
correctly (my original code was broken). Outputs need to be padded
out to vec4 slots.
In fs_visitor::nir_setup_outputs(), we tried to process each vec4 slot
by looping from 0 to ALIGN(type_size_scalar(type), 4) / 4. However,
this is wrong: type_size_scalar() for a float[2] would return 2, or
for vec2[2] it would return 4. This looked like a single slot, even
though in reality each array element would be stored in separate vec4
slots.
Because of this bug, outputs[] and output_components[] would not get
initialized for the second element's VARYING_SLOT, which meant
emit_urb_writes() would skip writing them. Nothing used those values,
and dead code elimination threw a party.
To fix this, we introduce a new type_size_vec4_times_4() function which
pads array elements correctly, but still counts in scalar components,
generating correct indices in store_output intrinsics.
Normally, varying packing avoids this problem by turning varyings into
vec4s. So this doesn't actually fix any Piglit or dEQP tests today.
However, if varying packing is disabled, things would be broken.
Tessellation shaders can't use varying packing, so this fixes various
tcs-input Piglit tests on a branch of mine.
v2: Shorten the implementation of type_size_4x to a single line (caught
by Connor Abbott), and rename it to type_size_vec4_times_4()
(renaming suggested by Jason Ekstrand). Use type_size_vec4
rather than using type_size_vec4_times_4 and then dividing by 4.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
2015-10-13 15:30:03 -07:00
|
|
|
type_size_vec4_times_4);
|
|
|
|
nir_lower_io(nir, nir_var_shader_out, type_size_vec4_times_4);
|
2015-10-15 15:17:19 -07:00
|
|
|
} else {
|
|
|
|
nir_foreach_variable(var, &nir->outputs)
|
|
|
|
var->data.driver_location = var->data.location;
|
|
|
|
}
|
|
|
|
break;
|
2015-12-09 21:41:35 -08:00
|
|
|
case MESA_SHADER_TESS_CTRL: {
|
|
|
|
struct remap_patch_urb_offsets_state state;
|
|
|
|
brw_compute_tess_vue_map(&state.vue_map, nir->info.outputs_written,
|
|
|
|
nir->info.patch_outputs_written);
|
|
|
|
|
|
|
|
nir_foreach_variable(var, &nir->outputs) {
|
|
|
|
var->data.driver_location = var->data.location;
|
|
|
|
}
|
|
|
|
|
|
|
|
nir_lower_io(nir, nir_var_shader_out, type_size_vec4);
|
|
|
|
|
|
|
|
/* This pass needs actual constants */
|
|
|
|
nir_opt_constant_folding(nir);
|
|
|
|
|
2016-01-13 15:04:39 -08:00
|
|
|
add_const_offset_to_base(nir, nir_var_shader_out);
|
|
|
|
|
2015-12-26 10:00:47 -08:00
|
|
|
nir_foreach_function(nir, function) {
|
|
|
|
if (function->impl) {
|
|
|
|
nir_builder_init(&state.b, function->impl);
|
|
|
|
nir_foreach_block(function->impl, remap_patch_urb_offsets, &state);
|
2015-12-09 21:41:35 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2015-10-15 15:17:19 -07:00
|
|
|
case MESA_SHADER_FRAGMENT:
|
|
|
|
nir_assign_var_locations(&nir->outputs, &nir->num_outputs,
|
|
|
|
type_size_scalar);
|
|
|
|
break;
|
|
|
|
case MESA_SHADER_COMPUTE:
|
|
|
|
/* Compute shaders have no outputs. */
|
|
|
|
assert(exec_list_is_empty(&nir->outputs));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
unreachable("unsupported shader stage");
|
2015-08-26 03:07:29 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-10 21:12:47 -08:00
|
|
|
static int
|
|
|
|
type_size_scalar_bytes(const struct glsl_type *type)
|
|
|
|
{
|
|
|
|
return type_size_scalar(type) * 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
type_size_vec4_bytes(const struct glsl_type *type)
|
|
|
|
{
|
|
|
|
return type_size_vec4(type) * 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
brw_nir_lower_uniforms(nir_shader *nir, bool is_scalar)
|
|
|
|
{
|
|
|
|
if (is_scalar) {
|
|
|
|
nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms,
|
|
|
|
type_size_scalar_bytes);
|
|
|
|
nir_lower_io(nir, nir_var_uniform, type_size_scalar_bytes);
|
|
|
|
} else {
|
|
|
|
nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms,
|
|
|
|
type_size_vec4_bytes);
|
|
|
|
nir_lower_io(nir, nir_var_uniform, type_size_vec4_bytes);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-18 16:33:41 -05:00
|
|
|
#define OPT(pass, ...) ({ \
|
|
|
|
bool this_progress = false; \
|
|
|
|
NIR_PASS(this_progress, nir, pass, ##__VA_ARGS__); \
|
|
|
|
if (this_progress) \
|
|
|
|
progress = true; \
|
|
|
|
this_progress; \
|
|
|
|
})
|
|
|
|
|
|
|
|
#define OPT_V(pass, ...) NIR_PASS_V(nir, pass, ##__VA_ARGS__)
|
2015-11-03 00:31:15 -08:00
|
|
|
|
2015-11-16 11:48:05 -08:00
|
|
|
static nir_shader *
|
2015-06-25 09:52:35 +02:00
|
|
|
nir_optimize(nir_shader *nir, bool is_scalar)
|
2015-04-07 15:15:09 -07:00
|
|
|
{
|
|
|
|
bool progress;
|
|
|
|
do {
|
|
|
|
progress = false;
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(nir_lower_vars_to_ssa);
|
2015-06-25 09:52:35 +02:00
|
|
|
|
|
|
|
if (is_scalar) {
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(nir_lower_alu_to_scalar);
|
2015-06-25 09:52:35 +02:00
|
|
|
}
|
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(nir_copy_prop);
|
2015-07-15 09:32:17 +02:00
|
|
|
|
|
|
|
if (is_scalar) {
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(nir_lower_phis_to_scalar);
|
2015-07-15 09:32:17 +02:00
|
|
|
}
|
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(nir_copy_prop);
|
|
|
|
OPT(nir_opt_dce);
|
|
|
|
OPT(nir_opt_cse);
|
|
|
|
OPT(nir_opt_peephole_select);
|
|
|
|
OPT(nir_opt_algebraic);
|
|
|
|
OPT(nir_opt_constant_folding);
|
|
|
|
OPT(nir_opt_dead_cf);
|
|
|
|
OPT(nir_opt_remove_phis);
|
|
|
|
OPT(nir_opt_undef);
|
2015-04-07 15:15:09 -07:00
|
|
|
} while (progress);
|
2015-11-16 11:48:05 -08:00
|
|
|
|
|
|
|
return nir;
|
2015-04-07 15:15:09 -07:00
|
|
|
}
|
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
/* Does some simple lowering and runs the standard suite of optimizations
|
|
|
|
*
|
|
|
|
* This is intended to be called more-or-less directly after you get the
|
|
|
|
* shader out of GLSL or some other source. While it is geared towards i965,
|
|
|
|
* it is not at all generator-specific except for the is_scalar flag. Even
|
|
|
|
* there, it is safe to call with is_scalar = false for a shader that is
|
|
|
|
* intended for the FS backend as long as nir_optimize is called again with
|
|
|
|
* is_scalar = true to scalarize everything prior to code gen.
|
|
|
|
*/
|
2015-04-07 15:15:09 -07:00
|
|
|
nir_shader *
|
2015-11-11 09:40:51 -08:00
|
|
|
brw_preprocess_nir(nir_shader *nir, bool is_scalar)
|
2015-04-07 15:15:09 -07:00
|
|
|
{
|
2015-11-11 09:40:51 -08:00
|
|
|
bool progress; /* Written by OPT and OPT_V */
|
|
|
|
(void)progress;
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
if (nir->stage == MESA_SHADER_GEOMETRY)
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(nir_lower_gs_intrinsics);
|
2015-08-05 09:16:59 -07:00
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
static const nir_lower_tex_options tex_options = {
|
|
|
|
.lower_txp = ~0,
|
|
|
|
};
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-11 10:46:09 -08:00
|
|
|
OPT(nir_lower_tex, &tex_options);
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(nir_normalize_cubemap_coords);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
OPT(nir_lower_global_vars_to_local);
|
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(nir_split_var_copies);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-16 11:48:05 -08:00
|
|
|
nir = nir_optimize(nir, is_scalar);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
i965: Use nir_lower_load_const_to_scalar().
I don't know why, but we never hooked up this pass Eric wrote.
Otherwise, you can end up with stupid scalarized code such as:
vec4 ssa_7 = load_const (0.0, 0.0, 0.0, 0.0)
vec4 ssa_8 = ...
vec1 ssa_9 = feq ssa_8, ssa_7
vec1 ssa_10 = feq ssa_8.y, ssa_7.y
vec1 ssa_11 = feq ssa_8, ssa_7.z
vec1 ssa_12 = feq ssa_8.y, ssa_7.w
ssa_8.xyxy == <0, 0, 0, 0> should only take two feq instructions.
shader-db on Skylake:
total instructions in shared programs: 9121153 -> 9120749 (-0.00%)
instructions in affected programs: 32421 -> 32017 (-1.25%)
helped: 277
HURT: 69
total cycles in shared programs: 69003364 -> 69000912 (-0.00%)
cycles in affected programs: 899186 -> 896734 (-0.27%)
helped: 313
HURT: 403
This also prevents regressions when disabling channel expressions.
v2: Don't call opt_cse afterwards (requested by Matt). It should
happen in the optimization loop below anyway.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
2016-01-21 16:37:20 -08:00
|
|
|
if (is_scalar) {
|
|
|
|
OPT_V(nir_lower_load_const_to_scalar);
|
|
|
|
}
|
|
|
|
|
2015-04-07 15:15:09 -07:00
|
|
|
/* Lower a bunch of stuff */
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(nir_lower_var_copies);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
|
|
|
/* Get rid of split copies */
|
2015-11-16 11:48:05 -08:00
|
|
|
nir = nir_optimize(nir, is_scalar);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
OPT(nir_remove_dead_variables);
|
|
|
|
|
|
|
|
return nir;
|
|
|
|
}
|
|
|
|
|
i965: Defer input lowering for tessellation stages until specialization.
With tessellation shaders and SSO, we won't be able to always decide on
VUE map layouts at LinkProgram time. Unfortunately, we have to delay it
until shader specialization time.
However, uniform lowering cannot be deferred - brw_codegen_*_prog()
reads nir->num_uniforms. Fortunately, we don't need to defer it -
uniform, system value, atomic, and sampler lowering can safely stay
where it is. This patch moves those to brw_lower_nir()'s only caller,
renames brw_lower_nir() to brw_nir_lower_io(), and introduces calls
to that.
For non-tessellation stages, I chose to call brw_nir_lower_io() from
brw_create_nir(), so it's still done at the same time. There's no
need to defer it, and doing it at LinkProgram time is nice.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2015-12-07 17:58:35 -08:00
|
|
|
/** Lower input and output loads and stores for i965. */
|
2015-11-11 09:40:51 -08:00
|
|
|
nir_shader *
|
i965: Defer input lowering for tessellation stages until specialization.
With tessellation shaders and SSO, we won't be able to always decide on
VUE map layouts at LinkProgram time. Unfortunately, we have to delay it
until shader specialization time.
However, uniform lowering cannot be deferred - brw_codegen_*_prog()
reads nir->num_uniforms. Fortunately, we don't need to defer it -
uniform, system value, atomic, and sampler lowering can safely stay
where it is. This patch moves those to brw_lower_nir()'s only caller,
renames brw_lower_nir() to brw_nir_lower_io(), and introduces calls
to that.
For non-tessellation stages, I chose to call brw_nir_lower_io() from
brw_create_nir(), so it's still done at the same time. There's no
need to defer it, and doing it at LinkProgram time is nice.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2015-12-07 17:58:35 -08:00
|
|
|
brw_nir_lower_io(nir_shader *nir,
|
|
|
|
const struct brw_device_info *devinfo,
|
|
|
|
bool is_scalar)
|
2015-11-11 09:40:51 -08:00
|
|
|
{
|
|
|
|
bool progress; /* Written by OPT and OPT_V */
|
|
|
|
(void)progress;
|
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(brw_nir_lower_inputs, devinfo, is_scalar);
|
2015-12-09 21:41:35 -08:00
|
|
|
OPT_V(brw_nir_lower_outputs, devinfo, is_scalar);
|
2015-10-19 11:57:51 -04:00
|
|
|
OPT_V(nir_lower_io, nir_var_all, is_scalar ? type_size_scalar : type_size_vec4);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
return nir_optimize(nir, is_scalar);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare the given shader for codegen
|
|
|
|
*
|
|
|
|
* This function is intended to be called right before going into the actual
|
|
|
|
* backend and is highly backend-specific. Also, once this function has been
|
|
|
|
* called on a shader, it will no longer be in SSA form so most optimizations
|
|
|
|
* will not work.
|
|
|
|
*/
|
|
|
|
nir_shader *
|
|
|
|
brw_postprocess_nir(nir_shader *nir,
|
|
|
|
const struct brw_device_info *devinfo,
|
|
|
|
bool is_scalar)
|
|
|
|
{
|
|
|
|
bool debug_enabled =
|
|
|
|
(INTEL_DEBUG & intel_debug_flag_for_shader_stage(nir->stage));
|
|
|
|
|
|
|
|
bool progress; /* Written by OPT and OPT_V */
|
|
|
|
(void)progress;
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
if (devinfo->gen >= 6) {
|
2015-04-07 15:15:09 -07:00
|
|
|
/* Try and fuse multiply-adds */
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(brw_nir_opt_peephole_ffma);
|
2015-04-07 15:15:09 -07:00
|
|
|
}
|
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(nir_opt_algebraic_late);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT(nir_lower_locals_to_regs);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(nir_lower_to_source_mods);
|
|
|
|
OPT(nir_copy_prop);
|
|
|
|
OPT(nir_opt_dce);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
|
|
|
if (unlikely(debug_enabled)) {
|
2015-06-10 01:46:13 -07:00
|
|
|
/* Re-index SSA defs so we print more sensible numbers. */
|
2015-12-26 10:00:47 -08:00
|
|
|
nir_foreach_function(nir, function) {
|
|
|
|
if (function->impl)
|
|
|
|
nir_index_ssa_defs(function->impl);
|
2015-06-10 01:46:13 -07:00
|
|
|
}
|
|
|
|
|
2015-04-07 15:15:09 -07:00
|
|
|
fprintf(stderr, "NIR (SSA form) for %s shader:\n",
|
2015-11-11 09:40:51 -08:00
|
|
|
_mesa_shader_stage_to_string(nir->stage));
|
2015-04-07 15:15:09 -07:00
|
|
|
nir_print_shader(nir, stderr);
|
|
|
|
}
|
|
|
|
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(nir_convert_from_ssa, true);
|
2015-04-07 15:15:09 -07:00
|
|
|
|
2015-06-16 22:58:15 +02:00
|
|
|
if (!is_scalar) {
|
2015-11-03 00:31:15 -08:00
|
|
|
OPT_V(nir_move_vec_src_uses_to_dest);
|
|
|
|
OPT(nir_lower_vec_to_movs);
|
2015-06-16 22:58:15 +02:00
|
|
|
}
|
|
|
|
|
2015-04-07 15:15:09 -07:00
|
|
|
/* This is the last pass we run before we start emitting stuff. It
|
|
|
|
* determines when we need to insert boolean resolves on Gen <= 5. We
|
|
|
|
* run it last because it stashes data in instr->pass_flags and we don't
|
|
|
|
* want that to be squashed by other NIR passes.
|
|
|
|
*/
|
2015-11-11 09:40:51 -08:00
|
|
|
if (devinfo->gen <= 5)
|
2015-04-07 15:15:09 -07:00
|
|
|
brw_nir_analyze_boolean_resolves(nir);
|
|
|
|
|
|
|
|
nir_sweep(nir);
|
|
|
|
|
|
|
|
if (unlikely(debug_enabled)) {
|
|
|
|
fprintf(stderr, "NIR (final form) for %s shader:\n",
|
2015-11-11 09:40:51 -08:00
|
|
|
_mesa_shader_stage_to_string(nir->stage));
|
2015-04-07 15:15:09 -07:00
|
|
|
nir_print_shader(nir, stderr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return nir;
|
|
|
|
}
|
2015-04-17 18:10:50 +02:00
|
|
|
|
2015-11-11 09:40:51 -08:00
|
|
|
nir_shader *
|
|
|
|
brw_create_nir(struct brw_context *brw,
|
|
|
|
const struct gl_shader_program *shader_prog,
|
|
|
|
const struct gl_program *prog,
|
|
|
|
gl_shader_stage stage,
|
|
|
|
bool is_scalar)
|
|
|
|
{
|
|
|
|
struct gl_context *ctx = &brw->ctx;
|
|
|
|
const struct brw_device_info *devinfo = brw->intelScreen->devinfo;
|
|
|
|
const nir_shader_compiler_options *options =
|
|
|
|
ctx->Const.ShaderCompilerOptions[stage].NirOptions;
|
|
|
|
bool progress;
|
|
|
|
nir_shader *nir;
|
|
|
|
|
|
|
|
/* First, lower the GLSL IR or Mesa IR to NIR */
|
|
|
|
if (shader_prog) {
|
|
|
|
nir = glsl_to_nir(shader_prog, stage, options);
|
|
|
|
} else {
|
|
|
|
nir = prog_to_nir(prog, options);
|
|
|
|
OPT_V(nir_convert_to_ssa); /* turn registers into SSA */
|
|
|
|
}
|
|
|
|
nir_validate_shader(nir);
|
|
|
|
|
|
|
|
(void)progress;
|
|
|
|
|
|
|
|
nir = brw_preprocess_nir(nir, is_scalar);
|
i965: Defer input lowering for tessellation stages until specialization.
With tessellation shaders and SSO, we won't be able to always decide on
VUE map layouts at LinkProgram time. Unfortunately, we have to delay it
until shader specialization time.
However, uniform lowering cannot be deferred - brw_codegen_*_prog()
reads nir->num_uniforms. Fortunately, we don't need to defer it -
uniform, system value, atomic, and sampler lowering can safely stay
where it is. This patch moves those to brw_lower_nir()'s only caller,
renames brw_lower_nir() to brw_nir_lower_io(), and introduces calls
to that.
For non-tessellation stages, I chose to call brw_nir_lower_io() from
brw_create_nir(), so it's still done at the same time. There's no
need to defer it, and doing it at LinkProgram time is nice.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2015-12-07 17:58:35 -08:00
|
|
|
|
|
|
|
OPT(nir_lower_system_values);
|
|
|
|
OPT_V(brw_nir_lower_uniforms, is_scalar);
|
|
|
|
|
|
|
|
if (shader_prog) {
|
|
|
|
OPT_V(nir_lower_samplers, shader_prog);
|
|
|
|
OPT_V(nir_lower_atomics, shader_prog);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nir->stage != MESA_SHADER_TESS_CTRL &&
|
|
|
|
nir->stage != MESA_SHADER_TESS_EVAL) {
|
|
|
|
nir = brw_nir_lower_io(nir, devinfo, is_scalar);
|
|
|
|
}
|
2015-11-11 09:40:51 -08:00
|
|
|
|
|
|
|
return nir;
|
|
|
|
}
|
|
|
|
|
2015-11-11 11:01:59 -08:00
|
|
|
nir_shader *
|
|
|
|
brw_nir_apply_sampler_key(nir_shader *nir,
|
|
|
|
const struct brw_device_info *devinfo,
|
|
|
|
const struct brw_sampler_prog_key_data *key_tex,
|
|
|
|
bool is_scalar)
|
|
|
|
{
|
|
|
|
nir_lower_tex_options tex_options = { 0 };
|
|
|
|
|
|
|
|
/* Iron Lake and prior require lowering of all rectangle textures */
|
|
|
|
if (devinfo->gen < 6)
|
|
|
|
tex_options.lower_rect = true;
|
|
|
|
|
|
|
|
/* Prior to Broadwell, our hardware can't actually do GL_CLAMP */
|
|
|
|
if (devinfo->gen < 8) {
|
|
|
|
tex_options.saturate_s = key_tex->gl_clamp_mask[0];
|
|
|
|
tex_options.saturate_t = key_tex->gl_clamp_mask[1];
|
|
|
|
tex_options.saturate_r = key_tex->gl_clamp_mask[2];
|
|
|
|
}
|
|
|
|
|
2015-11-11 18:41:37 -08:00
|
|
|
/* Prior to Haswell, we have to fake texture swizzle */
|
|
|
|
for (unsigned s = 0; s < MAX_SAMPLERS; s++) {
|
|
|
|
if (key_tex->swizzles[s] == SWIZZLE_NOOP)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
tex_options.swizzle_result |= (1 << s);
|
|
|
|
for (unsigned c = 0; c < 4; c++)
|
|
|
|
tex_options.swizzles[s][c] = GET_SWZ(key_tex->swizzles[s], c);
|
|
|
|
}
|
|
|
|
|
2015-11-11 11:01:59 -08:00
|
|
|
if (nir_lower_tex(nir, &tex_options)) {
|
|
|
|
nir_validate_shader(nir);
|
|
|
|
nir = nir_optimize(nir, is_scalar);
|
|
|
|
}
|
|
|
|
|
|
|
|
return nir;
|
|
|
|
}
|
|
|
|
|
2015-04-17 18:10:50 +02:00
|
|
|
enum brw_reg_type
|
|
|
|
brw_type_for_nir_type(nir_alu_type type)
|
|
|
|
{
|
|
|
|
switch (type) {
|
2015-05-15 09:14:47 -07:00
|
|
|
case nir_type_uint:
|
2015-04-17 18:10:50 +02:00
|
|
|
return BRW_REGISTER_TYPE_UD;
|
|
|
|
case nir_type_bool:
|
|
|
|
case nir_type_int:
|
|
|
|
return BRW_REGISTER_TYPE_D;
|
|
|
|
case nir_type_float:
|
|
|
|
return BRW_REGISTER_TYPE_F;
|
|
|
|
default:
|
|
|
|
unreachable("unknown type");
|
|
|
|
}
|
|
|
|
|
|
|
|
return BRW_REGISTER_TYPE_F;
|
|
|
|
}
|
2015-06-17 10:59:10 +02:00
|
|
|
|
|
|
|
/* Returns the glsl_base_type corresponding to a nir_alu_type.
|
|
|
|
* This is used by both brw_vec4_nir and brw_fs_nir.
|
|
|
|
*/
|
|
|
|
enum glsl_base_type
|
|
|
|
brw_glsl_base_type_for_nir_type(nir_alu_type type)
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case nir_type_float:
|
|
|
|
return GLSL_TYPE_FLOAT;
|
|
|
|
|
|
|
|
case nir_type_int:
|
|
|
|
return GLSL_TYPE_INT;
|
|
|
|
|
2015-05-15 09:14:47 -07:00
|
|
|
case nir_type_uint:
|
2015-06-17 10:59:10 +02:00
|
|
|
return GLSL_TYPE_UINT;
|
|
|
|
|
|
|
|
default:
|
|
|
|
unreachable("bad type");
|
|
|
|
}
|
|
|
|
}
|