diff --git a/src/freedreno/.gitlab-ci/reference/crash.log b/src/freedreno/.gitlab-ci/reference/crash.log index 1affb9220e0..31ea67d25b7 100644 --- a/src/freedreno/.gitlab-ci/reference/crash.log +++ b/src/freedreno/.gitlab-ci/reference/crash.log @@ -3435,7 +3435,7 @@ shader-blocks: size: 2048 :0:0000:0000[0600e824x_a018c54ax] no match: 0600e824a018c54a :7:0001:0001[edc6145bx_11fa09c3x] no match: edc6145b11fa09c3 - :2:0002:0002[41440087x_008c504ax] ceil.f hr33.w, (neg)hc18.z ; dontcare bits in ceil.f: 40000008c0000 + :2:0002:0002[41440087x_008c504ax] ceil.f hr33.w, (neg)hc18.z ; dontcare bits in ceil.f: 00040000008c0000 :0:0003:0003[14183488x_d5c04509x] no match: 14183488d5c04509 :5:0004:0004[a52373bdx_8ff7c071x] no match: a52373bd8ff7c071 :1:0005:0005[39301c43x_1d826d16x] no match: 39301c431d826d16 @@ -4114,11 +4114,11 @@ shader-blocks: - type: A6XX_HLSQ_INST_RAM - bank: 0 size: 2048 - :2:0000:0000[40846422x_d81251c5x] (sat)(ul)sign.f r8.z, (neg)hc113.y ; dontcare bits in sign.f: 40000d8120000 + :2:0000:0000[40846422x_d81251c5x] (sat)(ul)sign.f r8.z, (neg)hc113.y ; dontcare bits in sign.f: 00040000d8120000 :4:0001:0001[938a16e2x_520c369ax] no match: 938a16e2520c369a :1:0002:0002[200a00c1x_094864d2x] no match: 200a00c1094864d2 :2:0003:0003[44109084x_4a201507x] no match: 441090844a201507 - :4:0004:0004[882fadabx_14a391b1x] (jp)(sat)(rpt1)(ul)rsq hr42.w, (abs)(r)hc108.y ; dontcare bits in rsq: f800014a30000 + :4:0004:0004[882fadabx_14a391b1x] (jp)(sat)(rpt1)(ul)rsq hr42.w, (abs)(r)hc108.y ; dontcare bits in rsq: 000f800014a30000 :3:0005:0006[6060f068x_7106601ax] no match: 6060f0687106601a ----------------------------------------------- 8192 (0x2000) bytes @@ -4638,12 +4638,12 @@ shader-blocks: size: 2048 :0:0000:0000[00000000x_00003002x] nop :0:0001:0001[00000000x_00000000x] nop - :6:0002:0002[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 0xdf vs 0x0, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0x1 vs 0x0 - :6:0003:0003[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 0xdf vs 0x0, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0x1 vs 0x0 - :6:0004:0004[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 0xdf vs 0x0, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0x1 vs 0x0 - :6:0005:0005[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 0xdf vs 0x0, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0x1 vs 0x0 - :6:0006:0006[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 0xdf vs 0x0, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0x1 vs 0x0 - :6:0007:0007[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 0xdf vs 0x0, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0x1 vs 0x0 + :6:0002:0002[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: 00000000000000ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 00000000000000df vs 0000000000000000, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0000000000000001 vs 0000000000000000 + :6:0003:0003[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: 00000000000000ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 00000000000000df vs 0000000000000000, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0000000000000001 vs 0000000000000000 + :6:0004:0004[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: 00000000000000ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 00000000000000df vs 0000000000000000, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0000000000000001 vs 0000000000000000 + :6:0005:0005[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: 00000000000000ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 00000000000000df vs 0000000000000000, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0000000000000001 vs 0000000000000000 + :6:0006:0006[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: 00000000000000ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 00000000000000df vs 0000000000000000, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0000000000000001 vs 0000000000000000 + :6:0007:0007[deadbeefx_deadbeefx] (sy)(jp)atomic.xor.typed.4d.u8.4.l r59.w, l[r45.z], -34 ; dontcare bits in atomic.xor: 00000000000000ee, WARNING: unexpected bits[41:48] in #instruction-cat6-a3xx-atomic: 00000000000000df vs 0000000000000000, WARNING: unexpected bits[53:53] in #instruction-cat6-a3xx-atomic: 0000000000000001 vs 0000000000000000 ----------------------------------------------- 8192 (0x2000) bytes 000000: 00003002 00000000 00000000 00000000 |.0..............| diff --git a/src/freedreno/isa/decode.c b/src/freedreno/isa/decode.c index 636317f049e..05d5d5b26cb 100644 --- a/src/freedreno/isa/decode.c +++ b/src/freedreno/isa/decode.c @@ -300,7 +300,7 @@ find_bitset(struct decode_state *state, const struct isa_bitset **bitsets, } if (match && (match->dontcare & val)) { - decode_error(state, "dontcare bits in %s: %"PRIx64, + decode_error(state, "dontcare bits in %s: %016"PRIx64, match->name, (match->dontcare & val)); } @@ -374,7 +374,7 @@ find_display(struct decode_scope *scope, const struct isa_bitset *bitset) uint64_t val = extract_field(scope, f); if (val != f->val) { decode_error(scope->state, "WARNING: unexpected " - "bits[%u:%u] in %s: 0x%"PRIx64" vs 0x%"PRIx64, + "bits[%u:%u] in %s: %016"PRIx64" vs %016"PRIx64, f->low, f->high, bitset->name, val, f->val); } @@ -403,7 +403,7 @@ display_bitset_field(struct decode_scope *scope, const struct isa_field *field, { const struct isa_bitset *b = find_bitset(scope->state, field->bitsets, val); if (!b) { - decode_error(scope->state, "no match: FIELD: '%s.%s': 0x%"PRIx64, + decode_error(scope->state, "no match: FIELD: '%s.%s': %016"PRIx64, scope->bitset->name, field->name, val); return; }