fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 10:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/hw: fix populating branch targets in isa_decode pre-pass

Browse source 
pre-pass ran with branch_labels being false which made it no-op.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9476>
This commit is contained in:
Danylo Piliaiev 2021-03-09 15:49:28 +02:00 • committed by Marge Bot
parent a2a8c6a36c
commit 1d70863c12
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/freedreno/.gitlab-ci/reference/fd-clouds.log
View file

@ -2220,6 +2220,7 @@ t4 write SP_FS_OBJ_START (a983)
:3:0167:0244[63869016x_40160008x] (ss)mad.f32 r5.z, r2.x, (neg)r3.y, r5.z
:2:0168:0245[4070080dx_000d0010x] (nop1) mul.f r3.y, r4.x, r3.y
:3:0169:0247[6389000dx_000d0008x] mad.f32 r3.y, r2.x, r4.z, r3.y
:1:0170:0248[280cc008x_00000006x] l170:
:1:0170:0248[280cc008x_00000006x] (jp)mov.u32u32 r2.x, r1.z
:0:0171:0249[00000200x_00000000x] (rpt2)nop
:2:0172:0252[42bb08f8x_20820008x] (nop3) cmps.s.ge p0.x, r2.x, 130
@ -3640,6 +3641,7 @@ t7 opcode: CP_LOAD_STATE6_FRAG (34) (4 dwords)
:3:0167:0244[63869016x_40160008x] (ss)mad.f32 r5.z, r2.x, (neg)r3.y, r5.z
:2:0168:0245[4070080dx_000d0010x] (nop1) mul.f r3.y, r4.x, r3.y
:3:0169:0247[6389000dx_000d0008x] mad.f32 r3.y, r2.x, r4.z, r3.y
:1:0170:0248[280cc008x_00000006x] l170:
:1:0170:0248[280cc008x_00000006x] (jp)mov.u32u32 r2.x, r1.z
:0:0171:0249[00000200x_00000000x] (rpt2)nop
:2:0172:0252[42bb08f8x_20820008x] (nop3) cmps.s.ge p0.x, r2.x, 130
@ -5480,6 +5482,7 @@ t7 opcode: CP_DRAW_INDX_OFFSET (38) (4 dwords)
:3:0167:0244[63869016x_40160008x] (ss)mad.f32 r5.z, r2.x, (neg)r3.y, r5.z
:2:0168:0245[4070080dx_000d0010x] (nop1) mul.f r3.y, r4.x, r3.y
:3:0169:0247[6389000dx_000d0008x] mad.f32 r3.y, r2.x, r4.z, r3.y
:1:0170:0248[280cc008x_00000006x] l170:
:1:0170:0248[280cc008x_00000006x] (jp)mov.u32u32 r2.x, r1.z
:0:0171:0249[00000200x_00000000x] (rpt2)nop
:2:0172:0252[42bb08f8x_20820008x] (nop3) cmps.s.ge p0.x, r2.x, 130

4
src/freedreno/isa/decode.c
View file

@ -673,7 +673,9 @@ decode(struct decode_state *state, void *bin, int sz)
void
isa_decode(void *bin, int sz, FILE *out, const struct isa_decode_options *options)
{
static const struct isa_decode_options default_options = {};
const struct isa_decode_options default_options = {
.branch_labels = options ? options->branch_labels : false
};
struct decode_state *state;
if (!options)