From 0c215813f7d67a43a7b3f68aeb261da660e61b4f Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 8 Nov 2021 14:52:03 -0500 Subject: [PATCH] pan/bi: Test dual texture fusing These patterns are quite tricky, so let's make sure we're testing adequately. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/meson.build | 1 + .../bifrost/test/test-dual-texture.cpp | 211 ++++++++++++++++++ 2 files changed, 212 insertions(+) create mode 100644 src/panfrost/bifrost/test/test-dual-texture.cpp diff --git a/src/panfrost/bifrost/meson.build b/src/panfrost/bifrost/meson.build index c2d5d8e6199..1bd2c9371db 100644 --- a/src/panfrost/bifrost/meson.build +++ b/src/panfrost/bifrost/meson.build @@ -149,6 +149,7 @@ if with_tests 'bifrost_tests', files( 'test/test-constant-fold.cpp', + 'test/test-dual-texture.cpp', 'test/test-optimizer.cpp', 'test/test-pack-formats.cpp', 'test/test-packing.cpp', diff --git a/src/panfrost/bifrost/test/test-dual-texture.cpp b/src/panfrost/bifrost/test/test-dual-texture.cpp new file mode 100644 index 00000000000..7ac62675354 --- /dev/null +++ b/src/panfrost/bifrost/test/test-dual-texture.cpp @@ -0,0 +1,211 @@ +/* + * Copyright (C) 2021 Collabora, Ltd. + * + * 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 "compiler.h" +#include "bi_test.h" +#include "bi_builder.h" + +#include + +#define CASE(shader_stage, instr, expected) do { \ + bi_builder *A = bit_builder(mem_ctx); \ + bi_builder *B = bit_builder(mem_ctx); \ + { \ + bi_builder *b = A; \ + bi_index u = bi_temp(b->shader); \ + bi_index v = bi_temp(b->shader); \ + A->shader->stage = MESA_SHADER_ ## shader_stage; \ + instr; \ + } \ + { \ + bi_builder *b = B; \ + bi_index u = bi_temp(b->shader); \ + bi_index v = bi_temp(b->shader); \ + B->shader->stage = MESA_SHADER_ ## shader_stage; \ + expected; \ + } \ + bi_opt_fuse_dual_texture(A->shader); \ + if (!bit_shader_equal(A->shader, B->shader)) { \ + ADD_FAILURE(); \ + fprintf(stderr, "Optimization produce unexpected result"); \ + fprintf(stderr, " Actual:\n"); \ + bi_print_shader(A->shader, stderr); \ + fprintf(stderr, "Expected:\n"); \ + bi_print_shader(B->shader, stderr); \ + fprintf(stderr, "\n"); \ + } \ +} while(0) + +#define NEGCASE(stage, instr) CASE(stage, instr, instr) + +class DualTexture : public testing::Test { +protected: + DualTexture() { + mem_ctx = ralloc_context(NULL); + + reg = bi_register(0); + x = bi_register(4); + y = bi_register(8); + + } + + ~DualTexture() { + ralloc_free(mem_ctx); + } + + void *mem_ctx; + + bi_index reg, x, y; +}; + + +TEST_F(DualTexture, FuseDualTexFragment) +{ + CASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 1); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0xF9F00144), false, 4, 4); + }); +} + +TEST_F(DualTexture, FuseDualTexKernel) +{ + CASE(KERNEL, { + bi_texs_2d_f32_to(b, x, u, v, true, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, true, 1, 1); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0xF9F00144), true, 4, 4); + }); +} + +TEST_F(DualTexture, FuseDualTexVertex) +{ + CASE(VERTEX, { + bi_texs_2d_f32_to(b, x, u, v, true, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, true, 1, 1); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0xF9F00144), true, 4, 4); + }); +} + +TEST_F(DualTexture, DontFuseDualTexWrongStage) +{ + NEGCASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, true, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, true, 1, 1); + }); + + NEGCASE(KERNEL, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 1); + }); + + NEGCASE(VERTEX, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 1); + }); +} + +TEST_F(DualTexture, FuseDualTexMaximumIndex) +{ + CASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 2, 2); + bi_texs_2d_f32_to(b, y, u, v, false, 3, 3); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0xF9F003E6), false, 4, 4); + }); +} + +TEST_F(DualTexture, FuseDualTexMixedIndex) +{ + CASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 3, 2); + bi_texs_2d_f32_to(b, y, u, v, false, 2, 3); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0xF9F003A7), false, 4, 4); + }); +} + +TEST_F(DualTexture, DontFuseDualTexOutOfBounds) +{ + NEGCASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 4, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 1); + }); + + NEGCASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 4); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 1); + }); + + NEGCASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 4, 1); + }); + + NEGCASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 4); + }); +} + +TEST_F(DualTexture, FuseDualTexFP16) +{ + CASE(FRAGMENT, { + bi_texs_2d_f16_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f16_to(b, y, u, v, false, 1, 1); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0xF1E00144), false, 2, 2); + }); +} + +TEST_F(DualTexture, FuseDualTexMixedSize) +{ + CASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f16_to(b, y, u, v, false, 1, 1); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0XF9E00144), false, 4, 2); + }); + + CASE(FRAGMENT, { + bi_texs_2d_f16_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 1); + }, { + bi_texc_to(b, x, y, bi_null(), u, v, bi_imm_u32(0xF1F00144), false, 2, 4); + }); +} + +TEST_F(DualTexture, DontFuseMixedCoordinates) +{ + NEGCASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, bi_neg(u), v, false, 0, 0); + bi_texs_2d_f32_to(b, y, u, v, false, 1, 1); + }); + + NEGCASE(FRAGMENT, { + bi_texs_2d_f32_to(b, x, u, v, false, 0, 0); + bi_texs_2d_f32_to(b, y, v, u, false, 1, 1); + }); +}