diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-04-01 18:27:54 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-05 23:26:04 +0000 |
| commit | 069189ff0f2beb3dd9004a1e37b8cc0cdeac4f23 (patch) | |
| tree | 3ddac81f71cc40986a3d67d9d09288069468d2eb | |
| parent | 78ba6d50a42227812a3ba2b20f924f2d2cbf17db (diff) | |
pan/bit: Add FMA tests
Now that the earlier reg ctrl issue is fixed these should pass.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4458>
| -rw-r--r-- | src/panfrost/bifrost/test/bi_test_pack.c | 58 | ||||
| -rw-r--r-- | src/panfrost/bifrost/test/bit.h | 4 |
2 files changed, 60 insertions, 2 deletions
diff --git a/src/panfrost/bifrost/test/bi_test_pack.c b/src/panfrost/bifrost/test/bi_test_pack.c index 2755c0e879e..deb15cc171f 100644 --- a/src/panfrost/bifrost/test/bi_test_pack.c +++ b/src/panfrost/bifrost/test/bi_test_pack.c @@ -209,6 +209,43 @@ bit_fmod_helper(struct panfrost_device *dev, } } +static void +bit_fma_helper(struct panfrost_device *dev, + unsigned size, uint32_t *input, enum bit_debug debug) +{ + nir_alu_type T = nir_type_float | size; + + bi_instruction ins = { + .type = BI_FMA, + .src = { + BIR_INDEX_REGISTER | 0, + BIR_INDEX_REGISTER | 1, + BIR_INDEX_REGISTER | 2, + }, + .src_types = { T, T, T }, + .dest = BIR_INDEX_REGISTER | 3, + .dest_type = T, + }; + + for (unsigned outmod = 0; outmod < 4; ++outmod) { + for (unsigned inmod = 0; inmod < 8; ++inmod) { + ins.outmod = outmod; + ins.src_neg[0] = (inmod & 0x1); + ins.src_neg[1] = (inmod & 0x2); + ins.src_neg[2] = (inmod & 0x4); + + if (!bit_test_single(dev, &ins, input, true, debug)) { + fprintf(stderr, "FAIL: fma%u%s.%u\n", + size, + outmod ? bi_output_mod_name(outmod) : ".none", + inmod); + } + } + } +} + + + void bit_fmod(struct panfrost_device *dev, enum bit_debug debug) { @@ -228,3 +265,24 @@ bit_fmod(struct panfrost_device *dev, enum bit_debug debug) bit_fmod_helper(dev, BI_ADD, sz, true, input, debug); } } + +void +bit_fma(struct panfrost_device *dev, enum bit_debug debug) +{ + float input32[4] = { 0.2, 1.6, -3.5, 0.0 }; + + uint32_t input16[4] = { + _mesa_float_to_half(input32[0]) | (_mesa_float_to_half(-1.8) << 16), + _mesa_float_to_half(input32[1]) | (_mesa_float_to_half(0.6) << 16), + _mesa_float_to_half(input32[1]) | (_mesa_float_to_half(16.2) << 16), + 0 + }; + + for (unsigned sz = 16; sz <= 32; sz *= 2) { + uint32_t *input = + (sz == 16) ? input16 : + (uint32_t *) input32; + + bit_fma_helper(dev, sz, input, debug); + } +} diff --git a/src/panfrost/bifrost/test/bit.h b/src/panfrost/bifrost/test/bit.h index 8e6279cbc72..dabb5d69b81 100644 --- a/src/panfrost/bifrost/test/bit.h +++ b/src/panfrost/bifrost/test/bit.h @@ -69,8 +69,8 @@ bit_step(struct bit_state *s, bi_instruction *ins, bool FMA); /* Packing tests */ -void -bit_fmod(struct panfrost_device *dev, enum bit_debug debug); +void bit_fmod(struct panfrost_device *dev, enum bit_debug debug); +void bit_fma(struct panfrost_device *dev, enum bit_debug debug); #endif |