freedreno/ci: Strip location from asserts
authorConnor Abbott <cwabbott0@gmail.com>
Tue, 27 Oct 2020 15:58:29 +0000 (16:58 +0100)
committerConnor Abbott <cwabbott0@gmail.com>
Thu, 19 Nov 2020 16:55:03 +0000 (17:55 +0100)
Let's not force everyone touching ir3.h to make random changes to the
reference output.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7386>

src/freedreno/.gitlab-ci/genoutput.sh
src/freedreno/.gitlab-ci/reference/crash.log

index 1d8ac85..30adc8a 100755 (executable)
@@ -27,13 +27,14 @@ asm=./install/bin/afuc-asm
 disasm=./install/bin/afuc-disasm
 
 # helper to filter out paths that can change depending on
-# who is building:
+# who is building and assert messages that can change
+# depending on unrelated code changes:
 basepath=`dirname $0`
 basepath=`dirname $basepath`
 basepath=`pwd $basepath`
 filter() {
        out=$1
-       grep -vF "$basepath" > $out
+       grep -vF "$basepath" | sed "s/.*: Assertion /Assertion /" > $out
 }
 
 #
index 5450dd5..502fa64 100644 (file)
@@ -3447,7 +3447,7 @@ shader-blocks:
        :5:0012:0026[a923bf8bx_81f95908x] (jp)samb.3d.a.p (u32)(xyzw)r34.w, hr33.x, hr43.x, s#15, t#64
        :1:0013:0027[3dda8123x_a0d91ccdx] (sy)(jp)(rpt1)cov.u8u16 (even)(pos_infinity)hr<a0.x + 35>, 0xa0d91ccd
 
-../src/freedreno/ir3/instr-a3xx.h:1016: is_cat6_legacy: Assertion `instr->cat6.opc == 0' failed.
+Assertion `instr->cat6.opc == 0' failed.
        -----------------------------------------------
        8192 (0x2000) bytes
        000000: a018c54a 0600e824 11fa09c3 edc6145b     |J...$.......[...|
@@ -4126,7 +4126,7 @@ shader-blocks:
        :2:0000:0000[40846422x_d81251c5x] (sat)(ul)sign.f r8.z, (neg)hc113.y
        :4:0001:0001[938a16e2x_520c369ax] (sy)(ss)(sat)(rpt2)unknown(4,28) hr56.z, -358
        :1:0002:0004[200a00c1x_094864d2x] cov.u16f16 hr<a0.x + 193>, 
-../src/freedreno/ir3/disasm-a3xx.c:184: regmask_get: Assertion `num < MAX_REG' failed.
+Assertion `num < MAX_REG' failed.
        -----------------------------------------------
        8192 (0x2000) bytes
        000000: d81251c5 40846422 520c369a 938a16e2     |.Q.."d.@.6.R....|