diff options
| author | Rob Clark <robdclark@chromium.org> | 2020-12-31 12:19:45 -0800 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-01-13 18:32:47 +0000 |
| commit | 11cba228fd5a7296088d42947e6ce014891f00fb (patch) | |
| tree | 33e7e18fa2b31d1302f8639a133f815406564779 | |
| parent | 5cae4779c2e2276da3720fdde136fbf623c3c983 (diff) | |
freedreno/ir3: Small resinfo disasm tweak
Add the 'type' field.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7997>
| -rw-r--r-- | src/freedreno/ir3/ir3_parser.y | 4 | ||||
| -rw-r--r-- | src/freedreno/ir3/tests/disasm.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/freedreno/ir3/ir3_parser.y b/src/freedreno/ir3/ir3_parser.y index 6467b4eea15..5676cd229b6 100644 --- a/src/freedreno/ir3/ir3_parser.y +++ b/src/freedreno/ir3/ir3_parser.y @@ -960,12 +960,12 @@ cat6_atomic_l: cat6_atomic_opc cat6_typed cat6_dim cat6_type '.' cat6_immed cat6_atomic: cat6_atomic_g | cat6_atomic_l -cat6_ibo_opc_1src: T_OP_RESINFO { new_instr(OPC_RESINFO)->cat6.type = TYPE_U32; } +cat6_ibo_opc_1src: T_OP_RESINFO { new_instr(OPC_RESINFO); } cat6_ibo_opc_ldgb: T_OP_LDGB { new_instr(OPC_LDGB); } cat6_ibo_opc_stgb: T_OP_STGB { new_instr(OPC_STGB); } -cat6_ibo: cat6_ibo_opc_1src cat6_dim dst_reg ',' 'g' '[' cat6_reg_or_immed ']' +cat6_ibo: cat6_ibo_opc_1src cat6_type cat6_dim dst_reg ',' 'g' '[' cat6_reg_or_immed ']' | cat6_ibo_opc_ldgb cat6_typed cat6_dim cat6_type '.' cat6_immed dst_reg ',' 'g' '[' cat6_reg_or_immed ']' ',' reg ',' reg | cat6_ibo_opc_stgb cat6_typed cat6_dim cat6_type '.' cat6_immed { dummy_dst(); } 'g' '[' cat6_reg_or_immed ']' ',' reg ',' cat6_reg_or_immed ',' reg diff --git a/src/freedreno/ir3/tests/disasm.c b/src/freedreno/ir3/tests/disasm.c index 12b8bd6e693..6deb47e3f7c 100644 --- a/src/freedreno/ir3/tests/disasm.c +++ b/src/freedreno/ir3/tests/disasm.c @@ -202,18 +202,18 @@ static const struct test { INSTR_6XX(c0260000_0063c300, "resinfo.b.untyped.2d.u32.1.imm.base0 r0.x, 0"), /* resinfo.u32.2d.mode4.base0 r0.x, 0 */ /* dEQP-GLES31.functional.image_load_store.2d.image_size.readonly_writeonly_32x32.txt */ - INSTR_5XX(c3e60000_00000200, "resinfo.2d r0.x, g[0]"), /* resinfo.u32.2d r0.x, 0 */ + INSTR_5XX(c3e60000_00000200, "resinfo.u32.2d r0.x, g[0]"), /* resinfo.u32.2d r0.x, 0 */ #if 0 /* TODO our encoding differs in b11 ('typed'), which seems to be a dontcare bit */ /* dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_writeonly_7 */ - INSTR_5XX(c3e60000_00000e00, "resinfo.4d r0.x, g[0]"), /* resinfo.u32.1dtype r0.x, 0 */ + INSTR_5XX(c3e60000_00000e00, "resinfo.u32.4d r0.x, g[0]"), /* resinfo.u32.1dtype r0.x, 0 */ /* dEQP-GLES31.functional.image_load_store.3d.image_size.readonly_writeonly_12x34x56 */ - INSTR_5XX(c3e60000_00000c00, "resinfo.3d r0.x, g[0]"), /* resinfo.u32.3d r0.x, 0 */ + INSTR_5XX(c3e60000_00000c00, "resinfo.u32.3d r0.x, g[0]"), /* resinfo.u32.3d r0.x, 0 */ #else /* dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_writeonly_7 */ - INSTR_5XX(c3e60000_00000600, "resinfo.4d r0.x, g[0]"), /* resinfo.u32.1dtype r0.x, 0 */ + INSTR_5XX(c3e60000_00000600, "resinfo.u32.4d r0.x, g[0]"), /* resinfo.u32.1dtype r0.x, 0 */ /* dEQP-GLES31.functional.image_load_store.2d.image_size.readonly_writeonly_32x32.txt */ - INSTR_5XX(c3e60000_00000400, "resinfo.3d r0.x, g[0]"), /* resinfo.u32.3d r0.x, 0 */ + INSTR_5XX(c3e60000_00000400, "resinfo.u32.3d r0.x, g[0]"), /* resinfo.u32.3d r0.x, 0 */ #endif /* ldgb */ |