From baa405f02a1338becfb760c8850ba56d9becabe3 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Thu, 4 Nov 2021 14:33:09 -0700 Subject: pan/bi: Use gtest for test-constant-fold Reviewed-by: Dylan Baker Reviewed-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/meson.build | 15 +- src/panfrost/bifrost/test/test-constant-fold.c | 124 -------------- src/panfrost/bifrost/test/test-constant-fold.cpp | 203 +++++++++++++++++++++++ 3 files changed, 204 insertions(+), 138 deletions(-) delete mode 100644 src/panfrost/bifrost/test/test-constant-fold.c create mode 100644 src/panfrost/bifrost/test/test-constant-fold.cpp diff --git a/src/panfrost/bifrost/meson.build b/src/panfrost/bifrost/meson.build index 909c7b797ee..09fe662c17a 100644 --- a/src/panfrost/bifrost/meson.build +++ b/src/panfrost/bifrost/meson.build @@ -142,25 +142,12 @@ libpanfrost_bifrost = static_library( ) if with_tests - test( - 'bifrost_constant_fold', - executable( - 'bifrost_constant_fold_test', - files('test/test-constant-fold.c'), - c_args : [c_msvc_compat_args, no_override_init_args], - gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mesa], - dependencies: [idep_nir, idep_bi_opcodes_h, idep_bi_builder_h], - link_with : [libpanfrost_bifrost], - ), - suite : ['panfrost'], - ) - test( 'bifrost_tests', executable( 'bifrost_tests', files( + 'test/test-constant-fold.cpp', 'test/test-optimizer.cpp', 'test/test-pack-formats.cpp', 'test/test-packing.cpp', diff --git a/src/panfrost/bifrost/test/test-constant-fold.c b/src/panfrost/bifrost/test/test-constant-fold.c deleted file mode 100644 index 73d4da82646..00000000000 --- a/src/panfrost/bifrost/test/test-constant-fold.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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" - -#define CASE(instr, expected) do { \ - bool _unsupported = false; \ - uint32_t _value = bi_fold_constant(instr, &_unsupported); \ - if (_unsupported) { \ - fprintf(stderr, "Constant folding failed:\n"); \ - bi_print_instr(instr, stderr); \ - fprintf(stderr, "\n"); \ - } else if (_value == (expected)) { \ - nr_pass++; \ - } else { \ - fprintf(stderr, "Got %" PRIx32 ", expected %" PRIx32 "\n", _value, expected); \ - bi_print_instr(instr, stderr); \ - fprintf(stderr, "\n"); \ - nr_fail++; \ - } \ -} while(0) - -#define NEGCASE(instr) do { \ - bool _unsupported = false; \ - bi_fold_constant(instr, &_unsupported); \ - if (_unsupported) { \ - nr_pass++; \ - } else { \ - fprintf(stderr, "Should not have constant folded:\n"); \ - bi_print_instr(instr, stderr); \ - fprintf(stderr, "\n"); \ - nr_fail++; \ - } \ -} while(0) - -int -main(int argc, const char **argv) -{ - unsigned nr_fail = 0, nr_pass = 0; - void *ralloc_ctx = ralloc_context(NULL); - bi_builder *b = bit_builder(ralloc_ctx); - bi_index zero = bi_fau(BIR_FAU_IMMEDIATE | 0, false); - bi_index reg = bi_register(0); - - /* Swizzles should be constant folded */ - CASE(bi_swz_v2i16_to(b, reg, bi_imm_u32(0xCAFEBABE)), 0xCAFEBABE); - CASE(bi_swz_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), false, false)), - 0xBABEBABE); - CASE(bi_swz_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, false)), - 0xBABECAFE); - CASE(bi_swz_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, true)), - 0xCAFECAFE); - - /* Vector constructions should be constant folded */ - CASE(bi_mkvec_v2i16_to(b, reg, bi_imm_u16(0xCAFE), bi_imm_u16(0xBABE)), 0xBABECAFE); - CASE(bi_mkvec_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, true), - bi_imm_u16(0xBABE)), 0xBABECAFE); - CASE(bi_mkvec_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, true), - bi_swz_16(bi_imm_u32(0xCAFEBABE), false, false)), 0xBABECAFE); - - { - bi_index u32 = bi_imm_u32(0xCAFEBABE); - - bi_index a = bi_byte(u32, 0); /* 0xBE */ - bi_index c = bi_byte(u32, 2); /* 0xFE */ - - CASE(bi_mkvec_v4i8_to(b, reg, a, a, a, a), 0xBEBEBEBE); - CASE(bi_mkvec_v4i8_to(b, reg, a, c, a, c), 0xFEBEFEBE); - CASE(bi_mkvec_v4i8_to(b, reg, c, a, c, a), 0xBEFEBEFE); - CASE(bi_mkvec_v4i8_to(b, reg, c, c, c, c), 0xFEFEFEFE); - } - - /* Limited shifts required for texturing */ - CASE(bi_lshift_or_i32_to(b, reg, bi_imm_u32(0xCAFE), bi_imm_u32(0xA0000), bi_imm_u8(4)), (0xCAFE << 4) | 0xA0000); - NEGCASE(bi_lshift_or_i32_to(b, reg, bi_imm_u32(0xCAFE), bi_not(bi_imm_u32(0xA0000)), bi_imm_u8(4))); - NEGCASE(bi_lshift_or_i32_to(b, reg, bi_not(bi_imm_u32(0xCAFE)), bi_imm_u32(0xA0000), bi_imm_u8(4))); - { - bi_instr *I = bi_lshift_or_i32_to(b, reg, bi_imm_u32(0xCAFE), bi_imm_u32(0xA0000), bi_imm_u8(4)); - I->not_result = true; - NEGCASE(I); - } - - /* Limited rounding needed for texturing */ - CASE(bi_f32_to_u32_to(b, reg, bi_imm_f32(15.0), BI_ROUND_NONE), 15); - CASE(bi_f32_to_u32_to(b, reg, bi_imm_f32(15.9), BI_ROUND_NONE), 15); - CASE(bi_f32_to_u32_to(b, reg, bi_imm_f32(-20.4), BI_ROUND_NONE), 0); - NEGCASE(bi_f32_to_u32_to(b, reg, bi_imm_f32(-20.4), BI_ROUND_RTP)); - NEGCASE(bi_f32_to_u32_to(b, reg, bi_imm_f32(-20.4), BI_ROUND_RTZ)); - - /* Instructions with non-constant sources cannot be constant folded */ - NEGCASE(bi_swz_v2i16_to(b, reg, bi_temp(b->shader))); - NEGCASE(bi_mkvec_v2i16_to(b, reg, bi_temp(b->shader), bi_temp(b->shader))); - NEGCASE(bi_mkvec_v2i16_to(b, reg, bi_temp(b->shader), bi_imm_u32(0xDEADBEEF))); - NEGCASE(bi_mkvec_v2i16_to(b, reg, bi_imm_u32(0xDEADBEEF), bi_temp(b->shader))); - - /* Other operations should not be constant folded */ - NEGCASE(bi_fma_f32_to(b, reg, zero, zero, zero, BI_ROUND_NONE)); - NEGCASE(bi_fadd_f32_to(b, reg, zero, zero, BI_ROUND_NONE)); - - ralloc_free(ralloc_ctx); - TEST_END(nr_pass, nr_fail); -} diff --git a/src/panfrost/bifrost/test/test-constant-fold.cpp b/src/panfrost/bifrost/test/test-constant-fold.cpp new file mode 100644 index 00000000000..941c3e02648 --- /dev/null +++ b/src/panfrost/bifrost/test/test-constant-fold.cpp @@ -0,0 +1,203 @@ +/* + * 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 + +static std::string +to_string(const bi_instr *I) { + char *cstr = NULL; + size_t size = 0; + FILE *f = open_memstream(&cstr, &size); + bi_print_instr(I, f); + fclose(f); + auto str = std::string(cstr); + free(cstr); + return str; +} + +static testing::AssertionResult +constant_fold_pred(const char *I_expr, + const char *expected_expr, + bi_instr *I, + uint32_t expected) +{ + bool unsupported = false; + uint32_t v = bi_fold_constant(I, &unsupported); + if (unsupported) { + return testing::AssertionFailure() + << "Constant fold unsupported for instruction \n\n" + << " " << to_string(I); + } else if (v != expected) { + return testing::AssertionFailure() + << "Unexpected result when constant folding instruction\n\n" + << " " << to_string(I) << "\n" + << " Actual: " << v << "\n" + << "Expected: " << expected << "\n"; + } else { + return testing::AssertionSuccess(); + } +} + +#define EXPECT_FOLD(i, e) EXPECT_PRED_FORMAT2(constant_fold_pred, i, e) + + +static testing::AssertionResult +not_constant_fold_pred(const char *I_expr, bi_instr *I) +{ + bool unsupported = false; + uint32_t v = bi_fold_constant(I, &unsupported); + if (unsupported) { + return testing::AssertionSuccess(); + } else { + return testing::AssertionFailure() + << "Instruction\n\n" + << " " << to_string(I) << "\n" + << "shouldn't have constant folded, but folded to: " << v; + } +} + +#define EXPECT_NOT_FOLD(i) EXPECT_PRED_FORMAT1(not_constant_fold_pred, i) + + +class ConstantFold : public testing::Test { +protected: + ConstantFold() { + mem_ctx = ralloc_context(NULL); + b = bit_builder(mem_ctx); + } + ~ConstantFold() { + ralloc_free(mem_ctx); + } + + void *mem_ctx; + bi_builder *b; +}; + +TEST_F(ConstantFold, Swizzles) +{ + bi_index reg = bi_register(0); + + EXPECT_FOLD( + bi_swz_v2i16_to(b, reg, bi_imm_u32(0xCAFEBABE)), + 0xCAFEBABE); + + EXPECT_FOLD( + bi_swz_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), false, false)), + 0xBABEBABE); + + EXPECT_FOLD( + bi_swz_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, false)), + 0xBABECAFE); + + EXPECT_FOLD( + bi_swz_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, true)), + 0xCAFECAFE); +} + +TEST_F(ConstantFold, VectorConstructions2i16) +{ + bi_index reg = bi_register(0); + + EXPECT_FOLD( + bi_mkvec_v2i16_to(b, reg, bi_imm_u16(0xCAFE), + bi_imm_u16(0xBABE)), + 0xBABECAFE); + + EXPECT_FOLD( + bi_mkvec_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, true), + bi_imm_u16(0xBABE)), + 0xBABECAFE); + + EXPECT_FOLD( + bi_mkvec_v2i16_to(b, reg, bi_swz_16(bi_imm_u32(0xCAFEBABE), true, true), + bi_swz_16(bi_imm_u32(0xCAFEBABE), false, false)), + 0xBABECAFE); +} + +TEST_F(ConstantFold, VectorConstructions4i8) +{ + bi_index reg = bi_register(0); + bi_index u32 = bi_imm_u32(0xCAFEBABE); + + bi_index a = bi_byte(u32, 0); /* 0xBE */ + bi_index c = bi_byte(u32, 2); /* 0xFE */ + + EXPECT_FOLD(bi_mkvec_v4i8_to(b, reg, a, a, a, a), 0xBEBEBEBE); + EXPECT_FOLD(bi_mkvec_v4i8_to(b, reg, a, c, a, c), 0xFEBEFEBE); + EXPECT_FOLD(bi_mkvec_v4i8_to(b, reg, c, a, c, a), 0xBEFEBEFE); + EXPECT_FOLD(bi_mkvec_v4i8_to(b, reg, c, c, c, c), 0xFEFEFEFE); +} + +TEST_F(ConstantFold, LimitedShiftsForTexturing) +{ + bi_index reg = bi_register(0); + + EXPECT_FOLD( + bi_lshift_or_i32_to(b, reg, bi_imm_u32(0xCAFE), bi_imm_u32(0xA0000), bi_imm_u8(4)), + (0xCAFE << 4) | 0xA0000); + + EXPECT_NOT_FOLD( + bi_lshift_or_i32_to(b, reg, bi_imm_u32(0xCAFE), bi_not(bi_imm_u32(0xA0000)), bi_imm_u8(4))); + + EXPECT_NOT_FOLD( + bi_lshift_or_i32_to(b, reg, bi_not(bi_imm_u32(0xCAFE)), bi_imm_u32(0xA0000), bi_imm_u8(4))); + + bi_instr *I = bi_lshift_or_i32_to(b, reg, bi_imm_u32(0xCAFE), bi_imm_u32(0xA0000), bi_imm_u8(4)); + I->not_result = true; + EXPECT_NOT_FOLD(I); +} + +TEST_F(ConstantFold, LimitedRoundingForTexturing) +{ + bi_index reg = bi_register(0); + + EXPECT_FOLD(bi_f32_to_u32_to(b, reg, bi_imm_f32(15.0), BI_ROUND_NONE), 15); + EXPECT_FOLD(bi_f32_to_u32_to(b, reg, bi_imm_f32(15.9), BI_ROUND_NONE), 15); + EXPECT_FOLD(bi_f32_to_u32_to(b, reg, bi_imm_f32(-20.4), BI_ROUND_NONE), 0); + + EXPECT_NOT_FOLD(bi_f32_to_u32_to(b, reg, bi_imm_f32(-20.4), BI_ROUND_RTP)); + EXPECT_NOT_FOLD(bi_f32_to_u32_to(b, reg, bi_imm_f32(-20.4), BI_ROUND_RTZ)); +} + +TEST_F(ConstantFold, NonConstantSourcesCannotBeFolded) +{ + bi_index reg = bi_register(0); + + EXPECT_NOT_FOLD(bi_swz_v2i16_to(b, reg, bi_temp(b->shader))); + EXPECT_NOT_FOLD(bi_mkvec_v2i16_to(b, reg, bi_temp(b->shader), bi_temp(b->shader))); + EXPECT_NOT_FOLD(bi_mkvec_v2i16_to(b, reg, bi_temp(b->shader), bi_imm_u32(0xDEADBEEF))); + EXPECT_NOT_FOLD(bi_mkvec_v2i16_to(b, reg, bi_imm_u32(0xDEADBEEF), bi_temp(b->shader))); +} + +TEST_F(ConstantFold, OtherOperationsShouldNotFold) +{ + bi_index zero = bi_fau(bir_fau(BIR_FAU_IMMEDIATE | 0), false); + bi_index reg = bi_register(0); + + EXPECT_NOT_FOLD(bi_fma_f32_to(b, reg, zero, zero, zero, BI_ROUND_NONE)); + EXPECT_NOT_FOLD(bi_fadd_f32_to(b, reg, zero, zero, BI_ROUND_NONE)); +} -- cgit v1.2.3