fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/ir3/tests: Switch disasm test over to new decoder

Browse source 
Also, uncomment the `stc` test vectors (since the new decoder decodes
these properly) and comment out an instruction which looks suspiciously
like -6.0 in hex.

This also switches the parser back to `atomic.b.op` from `atomic.op.b`
which was a short-term workaround to make it easier for the legacy
disassembler.

Also switch the binary encoding for ldib to clear b0, because the new
disassembler warns about unexpected dontcare bits (which cases the
disasm to not match).

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7997>
This commit is contained in:
Rob Clark 2020-12-31 11:42:12 -08:00 • committed by Marge Bot
parent 704e49bae0
commit 01e8bd55de
3 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/freedreno/ir3/ir3_lexer.l
View file

@ -316,17 +316,17 @@ static int parse_w(const char *str)
"resinfo.b" return TOKEN(T_OP_RESINFO_B); "resinfo.b" return TOKEN(T_OP_RESINFO_B);
"ldib.b" return TOKEN(T_OP_LDIB_B); "ldib.b" return TOKEN(T_OP_LDIB_B);
"stib.b" return TOKEN(T_OP_STIB_B); "stib.b" return TOKEN(T_OP_STIB_B);
"atomic.add.b" return TOKEN(T_OP_ATOMIC_B_ADD); "atomic.b.add" return TOKEN(T_OP_ATOMIC_B_ADD);
"atomic.sub.b" return TOKEN(T_OP_ATOMIC_B_SUB); "atomic.b.sub" return TOKEN(T_OP_ATOMIC_B_SUB);
"atomic.xchg.b" return TOKEN(T_OP_ATOMIC_B_XCHG); "atomic.b.xchg" return TOKEN(T_OP_ATOMIC_B_XCHG);
"atomic.inc.b" return TOKEN(T_OP_ATOMIC_B_INC); "atomic.b.inc" return TOKEN(T_OP_ATOMIC_B_INC);
"atomic.dec.b" return TOKEN(T_OP_ATOMIC_B_DEC); "atomic.b.dec" return TOKEN(T_OP_ATOMIC_B_DEC);
"atomic.cmpxchg.b" return TOKEN(T_OP_ATOMIC_B_CMPXCHG); "atomic.b.cmpxchg" return TOKEN(T_OP_ATOMIC_B_CMPXCHG);
"atomic.min.b" return TOKEN(T_OP_ATOMIC_B_MIN); "atomic.b.min" return TOKEN(T_OP_ATOMIC_B_MIN);
"atomic.max.b" return TOKEN(T_OP_ATOMIC_B_MAX); "atomic.b.max" return TOKEN(T_OP_ATOMIC_B_MAX);
"atomic.and.b" return TOKEN(T_OP_ATOMIC_B_AND); "atomic.b.and" return TOKEN(T_OP_ATOMIC_B_AND);
"atomic.or.b" return TOKEN(T_OP_ATOMIC_B_OR); "atomic.b.or" return TOKEN(T_OP_ATOMIC_B_OR);
"atomic.xor.b" return TOKEN(T_OP_ATOMIC_B_XOR); "atomic.b.xor" return TOKEN(T_OP_ATOMIC_B_XOR);
"ldgb" return TOKEN(T_OP_LDGB); "ldgb" return TOKEN(T_OP_LDGB);
"stgb" return TOKEN(T_OP_STGB); "stgb" return TOKEN(T_OP_STGB);
"stib" return TOKEN(T_OP_STIB); "stib" return TOKEN(T_OP_STIB);

2
src/freedreno/ir3/meson.build
View file

@ -120,7 +120,7 @@ test('ir3_disasm',
executable( executable(
'ir3_disasm', 'ir3_disasm',
'tests/disasm.c', 'tests/disasm.c',
link_with: libfreedreno_ir3, link_with: [libfreedreno_ir3, libir3decode],
dependencies: [idep_mesautil, idep_nir], dependencies: [idep_mesautil, idep_nir],
include_directories: [inc_freedreno, inc_include, inc_src, inc_gallium], include_directories: [inc_freedreno, inc_include, inc_src, inc_gallium],
), ),

26
src/freedreno/ir3/tests/disasm.c
View file

@ -35,12 +35,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "util/macros.h" #include "util/macros.h"
#include "disasm.h"
#include "ir3.h" #include "ir3.h"
#include "ir3_assembler.h" #include "ir3_assembler.h"
#include "ir3_shader.h" #include "ir3_shader.h"
#include "isa/isa.h"
#define INSTR_5XX(i, d, ...) { .gpu_id = 540, .instr = #i, .expected = d, __VA_ARGS__ } #define INSTR_5XX(i, d, ...) { .gpu_id = 540, .instr = #i, .expected = d, __VA_ARGS__ }
#define INSTR_6XX(i, d, ...) { .gpu_id = 630, .instr = #i, .expected = d, __VA_ARGS__ } #define INSTR_6XX(i, d, ...) { .gpu_id = 630, .instr = #i, .expected = d, __VA_ARGS__ }
@ -140,7 +141,8 @@ static const struct test {
INSTR_5XX(c6e60000_00010600, "ldgb.untyped.4d.u32.1 r0.x, g[0], r1.x, r0.x"), INSTR_5XX(c6e60000_00010600, "ldgb.untyped.4d.u32.1 r0.x, g[0], r1.x, r0.x"),
INSTR_5XX(d7660204_02000a01, "(sy)stib.typed.2d.u32.1 g[1], r0.x, r0.z, r1.x"), INSTR_5XX(d7660204_02000a01, "(sy)stib.typed.2d.u32.1 g[1], r0.x, r0.z, r1.x"),
INSTR_6XX(c0c00000_00000000, "stg.f16 g[hr0.x], hr0.x, hr0.x", .parse_fail=true), // TODO is this a real instruction? Or float -6.0 ?
// INSTR_6XX(c0c00000_00000000, "stg.f16 g[hr0.x], hr0.x, hr0.x", .parse_fail=true),
/* dEQP-GLES31.functional.tessellation.invariance.outer_edge_symmetry.isolines_equal_spacing_ccw */ /* dEQP-GLES31.functional.tessellation.invariance.outer_edge_symmetry.isolines_equal_spacing_ccw */
INSTR_6XX(c0d20906_02800004, "stg.f32 g[r1.x+r1.z], r0.z, 2"), /* stg.a.f32 g[r1.x+(r1.z<<2)], r0.z, 2 */ INSTR_6XX(c0d20906_02800004, "stg.f32 g[r1.x+r1.z], r0.z, 2"), /* stg.a.f32 g[r1.x+(r1.z<<2)], r0.z, 2 */
INSTR_6XX(c0da052e_01800042, "stg.s32 g[r0.z+r11.z], r8.y, 1"), /* stg.a.s32 g[r0.z+(r11.z<<2)], r8.y, 1 */ INSTR_6XX(c0da052e_01800042, "stg.s32 g[r0.z+r11.z], r8.y, 1"), /* stg.a.s32 g[r0.z+(r11.z<<2)], r8.y, 1 */
@ -159,15 +161,10 @@ static const struct test {
INSTR_6XX(c0060006_0181800f, "ldg.u32 r1.z, g[r1.z+7], 1"), INSTR_6XX(c0060006_0181800f, "ldg.u32 r1.z, g[r1.z+7], 1"),
INSTR_6XX(c0060006_01818001, "ldg.u32 r1.z, g[r1.z], 1"), INSTR_6XX(c0060006_01818001, "ldg.u32 r1.z, g[r1.z], 1"),
/* TODO: We don't support disasm of stc yet and produce a stgb instead
* (same as their disasm does for other families. They're used as part
* uniforms setup, followed by a shpe and then a load of the constant that
* was stored in the dynamic part of the shader.
*/
/* dEQP-GLES3.functional.ubo.random.basic_arrays.0 */ /* dEQP-GLES3.functional.ubo.random.basic_arrays.0 */
/* INSTR_6XX(c7020020_01800000, "stc c[32], r0.x, 1"), */ INSTR_6XX(c7020020_01800000, "stc c[32], r0.x, 1", .parse_fail=true),
/* dEQP-VK.image.image_size.cube_array.readonly_writeonly_1x1x12 */ /* dEQP-VK.image.image_size.cube_array.readonly_writeonly_1x1x12 */
/* INSTR_6XX(c7060020_03800000, "stc c[32], r0.x, 3"), */ INSTR_6XX(c7060020_03800000, "stc c[32], r0.x, 3", .parse_fail=true),
/* dEQP-VK.image.image_size.cube_array.readonly_writeonly_1x1x12 */ /* dEQP-VK.image.image_size.cube_array.readonly_writeonly_1x1x12 */
INSTR_6XX(c0260200_03676100, "stib.b.untyped.1d.u32.3.imm.base0 r0.x, r0.w, 1"), /* stib.untyped.u32.1d.3.mode4.base0 r0.x, r0.w, 1 */ INSTR_6XX(c0260200_03676100, "stib.b.untyped.1d.u32.3.imm.base0 r0.x, r0.w, 1"), /* stib.untyped.u32.1d.3.mode4.base0 r0.x, r0.w, 1 */
@ -297,9 +294,9 @@ static const struct test {
INSTR_6XX(d5c60003_03008001, "(sy)atomic.max.untyped.1d.u32.1.l r0.w, l[r0.z], r0.w"), INSTR_6XX(d5c60003_03008001, "(sy)atomic.max.untyped.1d.u32.1.l r0.w, l[r0.z], r0.w"),
/* Bindless atomic: */ /* Bindless atomic: */
INSTR_6XX(c03a0003_01640001, "atomic.add.b.untyped.1d.s32.1.imm r0.w, r0.y, 0"), /* atomic.b.add.g.s32.1d.mode0.base0 r0.w,r0.y,0 */ INSTR_6XX(c03a0003_01640001, "atomic.b.add.untyped.1d.s32.1.imm r0.w, r0.y, 0"), /* atomic.b.add.g.s32.1d.mode0.base0 r0.w,r0.y,0 */
INSTR_6XX(c03a0003_01660001, "atomic.and.b.untyped.1d.s32.1.imm r0.w, r0.y, 0"), /* atomic.b.and.g.s32.1d.mode0.base0 r0.w,r0.y,0 */ INSTR_6XX(c03a0003_01660001, "atomic.b.and.untyped.1d.s32.1.imm r0.w, r0.y, 0"), /* atomic.b.and.g.s32.1d.mode0.base0 r0.w,r0.y,0 */
INSTR_6XX(c0360000_0365c801, "atomic.max.b.typed.1d.u32.1.imm r0.x, r0.w, 0"), /* atomic.b.max.g.u32.1d.mode0.base0 r0.x,r0.w,0 */ INSTR_6XX(c0360000_0365c801, "atomic.b.max.typed.1d.u32.1.imm r0.x, r0.w, 0"), /* atomic.b.max.g.u32.1d.mode0.base0 r0.x,r0.w,0 */
/* dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.fragment.sampler2d */ /* dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.fragment.sampler2d */
INSTR_6XX(a0c01f04_0cc00005, "sam (f32)(xyzw)r1.x, r0.z, s#6, t#6"), INSTR_6XX(a0c01f04_0cc00005, "sam (f32)(xyzw)r1.x, r0.z, s#6, t#6"),
@ -351,7 +348,10 @@ main(int argc, char **argv)
strtoll(&test->instr[9], NULL, 16), strtoll(&test->instr[9], NULL, 16),
strtoll(&test->instr[0], NULL, 16), strtoll(&test->instr[0], NULL, 16),
}; };
disasm_a3xx(code, ARRAY_SIZE(code), 0, fdisasm, test->gpu_id); isa_decode(code, 8, fdisasm, &(struct isa_decode_options){
.gpu_id = test->gpu_id,
.show_errors = true,
});
fflush(fdisasm); fflush(fdisasm);
trim(disasm_output); trim(disasm_output);