4 files changed, 129 insertions, 0 deletions

diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index db1cf5c7b79..3a0470c2ca1 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -609,6 +609,9 @@ barycentric("at_offset", [2])
 intrinsic("load_sample_pos_from_id", src_comp=[1], dest_comp=2,
           flags=[CAN_ELIMINATE, CAN_REORDER])
 
+# Loads what I believe is the primitive size, for scaling ij to pixel size:
+intrinsic("load_size_ir3", dest_comp=1, flags=[CAN_ELIMINATE, CAN_REORDER])
+
 # Load operations pull data from some piece of GPU memory.  All load
 # operations operate in terms of offsets into some piece of theoretical
 # memory.  Loads from externally visible memory (UBO and SSBO) simply take a
diff --git a/src/freedreno/ir3/ir3_nir.h b/src/freedreno/ir3/ir3_nir.h
index eefe5f32f8f..b60374410bc 100644
--- a/src/freedreno/ir3/ir3_nir.h
+++ b/src/freedreno/ir3/ir3_nir.h
@@ -39,6 +39,7 @@ bool ir3_nir_apply_trig_workarounds(nir_shader *shader);
 bool ir3_nir_lower_tg4_to_tex(nir_shader *shader);
 bool ir3_nir_lower_io_offsets(nir_shader *shader);
 bool ir3_nir_lower_load_barycentric_at_sample(nir_shader *shader);
+bool ir3_nir_lower_load_barycentric_at_offset(nir_shader *shader);
 bool ir3_nir_move_varying_inputs(nir_shader *shader);
 
 const nir_shader_compiler_options * ir3_get_compiler_options(struct ir3_compiler *compiler);
diff --git a/src/freedreno/ir3/ir3_nir_lower_load_barycentric_at_offset.c b/src/freedreno/ir3/ir3_nir_lower_load_barycentric_at_offset.c
new file mode 100644
index 00000000000..0277e2b3851
--- /dev/null
+++ b/src/freedreno/ir3/ir3_nir_lower_load_barycentric_at_offset.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2019 Google, Inc.
+ *
+ * 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 "ir3_nir.h"
+#include "compiler/nir/nir_builder.h"
+
+/**
+ * This pass lowers load_barycentric_at_offset to dsx.3d/dsy.3d and alu
+ * instructions.
+ */
+
+static nir_ssa_def *
+load(nir_builder *b, unsigned ncomp, nir_intrinsic_op op)
+{
+	nir_intrinsic_instr *load_size = nir_intrinsic_instr_create(b->shader, op);
+	load_size->num_components = ncomp;
+	nir_ssa_dest_init(&load_size->instr, &load_size->dest, ncomp, 32, NULL);
+	nir_builder_instr_insert(b, &load_size->instr);
+
+	return &load_size->dest.ssa;
+}
+
+static void
+lower_load_barycentric_at_offset(nir_builder *b, nir_intrinsic_instr *intr)
+{
+#define chan(var, c) nir_channel(b, var, c)
+
+	nir_ssa_def *off = intr->src[0].ssa;
+	nir_ssa_def *ij = load(b, 2, nir_intrinsic_load_barycentric_pixel);
+	nir_ssa_def *s  = load(b, 1, nir_intrinsic_load_size_ir3);
+
+	s = nir_frcp(b, s);
+
+	/* scaled ij with s as 3rd component: */
+	nir_ssa_def *sij = nir_vec3(b,
+			nir_fmul(b, chan(ij, 0), s),
+			nir_fmul(b, chan(ij, 1), s),
+			s);
+
+	nir_ssa_def *foo = nir_fddx(b, sij);
+	nir_ssa_def *bar = nir_fddy(b, sij);
+
+	nir_ssa_def *x, *y, *z, *i, *j;
+
+	x = nir_ffma(b, chan(off, 0), chan(foo, 0), chan(sij, 0));
+	y = nir_ffma(b, chan(off, 0), chan(foo, 1), chan(sij, 1));
+	z = nir_ffma(b, chan(off, 0), chan(foo, 2), chan(sij, 2));
+
+	x = nir_ffma(b, chan(off, 1), chan(bar, 0), x);
+	y = nir_ffma(b, chan(off, 1), chan(bar, 1), y);
+	z = nir_ffma(b, chan(off, 1), chan(bar, 2), z);
+
+	/* convert back into primitive space: */
+	z = nir_frcp(b, z);
+	i = nir_fmul(b, z, x);
+	j = nir_fmul(b, z, y);
+
+	ij = nir_vec2(b, i, j);
+
+	nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(ij));
+}
+
+bool
+ir3_nir_lower_load_barycentric_at_offset(nir_shader *shader)
+{
+	bool progress = false;
+
+	debug_assert(shader->info.stage == MESA_SHADER_FRAGMENT);
+
+	nir_foreach_function (function, shader) {
+		if (!function->impl)
+			continue;
+
+		nir_builder b;
+		nir_builder_init(&b, function->impl);
+
+		nir_foreach_block (block, function->impl) {
+			nir_foreach_instr_safe(instr, block) {
+				if (instr->type != nir_instr_type_intrinsic)
+					continue;
+
+				nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
+
+				if (intr->intrinsic != nir_intrinsic_load_barycentric_at_offset)
+					continue;
+
+				debug_assert(intr->src[0].is_ssa);
+				debug_assert(intr->dest.is_ssa);
+
+				b.cursor = nir_before_instr(instr);
+				lower_load_barycentric_at_offset(&b, intr);
+
+				progress = true;
+			}
+		}
+
+		if (progress) {
+			nir_metadata_preserve(function->impl,
+				nir_metadata_block_index | nir_metadata_dominance);
+		}
+	}
+
+	return progress;
+}
diff --git a/src/freedreno/ir3/meson.build b/src/freedreno/ir3/meson.build
index 2ef1e54962c..bf4d41b5444 100644
--- a/src/freedreno/ir3/meson.build
+++ b/src/freedreno/ir3/meson.build
@@ -52,6 +52,7 @@ libfreedreno_ir3_files = files(
   'ir3_nir.h',
   'ir3_nir_analyze_ubo_ranges.c',
   'ir3_nir_lower_load_barycentric_at_sample.c',
+  'ir3_nir_lower_load_barycentric_at_offset.c',
   'ir3_nir_lower_io_offsets.c',
   'ir3_nir_lower_tg4_to_tex.c',
   'ir3_nir_move_varying_inputs.c',