From d1530a3f3b1625baa42e84cba9844b6eb4ac76ce Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Thu, 13 Jan 2022 12:51:52 +0100 Subject: [PATCH] Revert "nir/algebraic: distribute fmul(fadd(a, b), c) when b and c are constants" This reverts commit a1af902531122464b0f4eb66a7c4bf207a8a69f1. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5423 Reviewed-by: Rhys Perry Part-of: --- src/compiler/nir/nir_opt_algebraic.py | 2 -- src/freedreno/ci/traces-freedreno.yml | 22 +++++++++---------- .../drivers/llvmpipe/ci/traces-llvmpipe.yml | 4 ++-- .../drivers/radeonsi/ci/traces-radeonsi.yml | 14 ++++++------ src/gallium/drivers/virgl/ci/traces-virgl.yml | 8 +++---- src/panfrost/ci/traces-panfrost.yml | 8 +++---- 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 8c6cd77ffb9..5f8757c1651 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -488,8 +488,6 @@ optimizations.extend([ # (a + #b) * #c => (a * #c) + (#b * #c) (('imul', ('iadd(is_used_once)', a, '#b'), '#c'), ('iadd', ('imul', a, c), ('imul', b, c))), - (('~fmul', ('fadd(is_used_once)', a, '#b'), '#c'), ('fadd', ('fmul', a, c), ('fmul', b, c)), - '!options->avoid_ternary_with_two_constants'), # ((a + #b) + c) * #d => ((a + c) * #d) + (#b * #d) (('imul', ('iadd(is_used_once)', ('iadd(is_used_once)', a, '#b'), c), '#d'), diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml index 1f14596abfe..ac51671fc2e 100644 --- a/src/freedreno/ci/traces-freedreno.yml +++ b/src/freedreno/ci/traces-freedreno.yml @@ -45,9 +45,9 @@ traces: # checksum: 4b707f385256b380c936186db8c251cb # 1 minute - device: freedreno-a530 - checksum: 130dbeac42683b46fed4b268c5aad984 + checksum: a71d62bb2c0fabeca41468628777b441 - device: freedreno-a630 - checksum: 139861e52f9425b4adb7c0b90b885f91 + checksum: 339dce29ae08569652438116829510c7 - path: xonotic/xonotic-keybench-high.trace expectations: # Skipped since it's long on a530. @@ -327,9 +327,9 @@ traces: #- device: freedreno-a306 # checksum: 0c57ccc3989b75a940b28ea1cc09cb0d - device: freedreno-a530 - checksum: 4715d72a7958f2fd5a387c16b3a01579 + checksum: bc19f0f58935fdb348f401396e6845e1 - device: freedreno-a630 - checksum: 1e397c5c34c9c50350a8db1a060a6bbb + checksum: f546f840e916ab0f11f8df0e4eee584d - path: glmark2/shading:shading=blinn-phong-inf.trace expectations: - device: freedreno-a306 @@ -422,7 +422,7 @@ traces: - path: gputest/gimark.trace expectations: - device: freedreno-a630 - checksum: dd8fb768033d09f6edc98b4cfff02c6f + checksum: e58167bd8eeb8952facbc00ff0449135 - path: gputest/pixmark-julia-fp32.trace expectations: - device: freedreno-a630 @@ -452,11 +452,11 @@ traces: - path: gputest/plot3d.trace expectations: - device: freedreno-a306 - checksum: 302943895dbdd7730958fb0175f23b7f + checksum: f6ecd9b8afc692b0cdb459b9b30db8d4 - device: freedreno-a530 - checksum: 755aa5b521237ddf9fea3181d2ba2b75 + checksum: 4faafe5fab0d8ec6d7b549c94f663c92 - device: freedreno-a630 - checksum: 302aec1ced68e22182460b617b0f2aef + checksum: 0a6a16c394a413f02ec2ebcc3251e366 # Note: Requires GL4 for tess. - path: gputest/tessmark.trace expectations: @@ -473,9 +473,9 @@ traces: - path: humus/AmbientAperture.trace expectations: - device: freedreno-a306 - checksum: 3d9243cbd0659cb58b16cade2be3f2c2 + checksum: 8d4c52f0af9c09710d358f24c73fae3c - device: freedreno-a530 - checksum: c55c1ba5683306980956b5f89563f343 + checksum: aab5c853e383e1cda56663d65f6925ad - device: freedreno-a630 checksum: 83fd7bce0fc1e1f30bd143b7d30ca890 - path: humus/CelShading.trace @@ -551,7 +551,7 @@ traces: expectations: # a306/a530 would need higher GL version to run - device: freedreno-a630 - checksum: e93cf9682c9ca5ed6a6effe5b7fdd386 + checksum: 0e32ca8fc815a7250f38a07faeafb21b - path: pathfinder/canvas_text_v2.trace expectations: # a306/a530 would need higher GL version to run diff --git a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml index 5ac27101d8e..4167b29eef7 100644 --- a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml +++ b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml @@ -129,7 +129,7 @@ traces: - path: bgfx/39-assao.rdc expectations: - device: gl-vmware-llvmpipe - checksum: bc6f44e63010db07e7ba588b216e38b1 + checksum: 5d9c6dd6399db34ac81951cd7152ec1c - path: bgfx/40-svt.rdc expectations: - device: gl-vmware-llvmpipe @@ -153,7 +153,7 @@ traces: - path: gputest/pixmark-piano.trace expectations: - device: gl-vmware-llvmpipe - checksum: 4262587e893cf98c61a8467a15677181 + checksum: b580ae01560380461a103975cab77393 - path: gputest/triangle.trace expectations: - device: gl-vmware-llvmpipe diff --git a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml index e5bc92cb581..39892161a3d 100644 --- a/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml +++ b/src/gallium/drivers/radeonsi/ci/traces-radeonsi.yml @@ -21,11 +21,11 @@ traces: - path: pathfinder/demo.trace expectations: - device: gl-radeonsi-stoney - checksum: 8ff636268dfa0d54b6f15d70d15e354d + checksum: c81c85f9b247dd1b06c3dd5b669cc283 - path: pathfinder/canvas_moire.trace expectations: - device: gl-radeonsi-stoney - checksum: 505b9cad6e65c13463a0786944f8b679 + checksum: 78dd2357ad6e5ffc049a75bfb11c5497 - path: pathfinder/canvas_text_v2.trace expectations: - device: gl-radeonsi-stoney @@ -129,7 +129,7 @@ traces: - path: glmark2/refract.trace expectations: - device: gl-radeonsi-stoney - checksum: 41d105bdd10a354f6d161c67f715b7f9 + checksum: 9d0a2d2fce0b80a265fbcee5107c9e82 - path: glmark2/shading:shading=blinn-phong-inf.trace expectations: - device: gl-radeonsi-stoney @@ -169,11 +169,11 @@ traces: - path: godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc expectations: - device: gl-radeonsi-stoney - checksum: 4df1fbfc346851fe9e086a0708afde21 + checksum: 02f654ad77c0c1106e1b31e1c86c93bb - path: gputest/gimark.trace expectations: - device: gl-radeonsi-stoney - checksum: 52f76e6db877111845990ee128552082 + checksum: 4442dbd44a9704c499da4817fffce306 - path: gputest/pixmark-julia-fp32.trace expectations: - device: gl-radeonsi-stoney @@ -189,7 +189,7 @@ traces: - path: gputest/plot3d.trace expectations: - device: gl-radeonsi-stoney - checksum: a62be186a3e0a33ecbd520edd3873eb1 + checksum: 667078b0f51ac8e0469ef9a20326c616 - path: gputest/tessmark.trace expectations: - device: gl-radeonsi-stoney @@ -197,7 +197,7 @@ traces: - path: humus/AmbientAperture.trace expectations: - device: gl-radeonsi-stoney - checksum: 7ad498c94dcfbf22ef56f115648be86d + checksum: 664ea58a62b27737b7d0ae9e86ab85c0 - path: humus/CelShading.trace expectations: - device: gl-radeonsi-stoney diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml index 3563378e79b..1b9d70c941a 100644 --- a/src/gallium/drivers/virgl/ci/traces-virgl.yml +++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml @@ -17,11 +17,11 @@ traces: - path: gputest/furmark.trace expectations: - device: gl-virgl - checksum: d5682aaa762a4849f0cae1692623bdcb + checksum: a38d4c123d13c5ccd3a86f0663fe1aab - path: gputest/pixmark-piano.trace expectations: - device: gl-virgl - checksum: 1bcded27a6ba04fe0f76ff997b98dbc3 + checksum: b580ae01560380461a103975cab77393 - path: gputest/triangle.trace expectations: - device: gl-virgl @@ -121,7 +121,7 @@ traces: - path: glmark2/refract.trace expectations: - device: gl-virgl - checksum: b1332df324d0fc1db22b362231d3ed01 + checksum: cdadfee0518b964433d80c01329ec191 - path: glmark2/shading:shading=blinn-phong-inf.trace expectations: - device: gl-virgl @@ -178,7 +178,7 @@ traces: - path: gputest/plot3d.trace expectations: - device: gl-virgl - checksum: a1af286874f7060171cb3ca2e765c448 + checksum: 7e818a6070005056700e5ef8590a3f8e # Times out # - path: gputest/tessmark.trace # expectations: diff --git a/src/panfrost/ci/traces-panfrost.yml b/src/panfrost/ci/traces-panfrost.yml index 2c909c9ea99..e63d03dfd43 100644 --- a/src/panfrost/ci/traces-panfrost.yml +++ b/src/panfrost/ci/traces-panfrost.yml @@ -5,7 +5,7 @@ traces: - path: behdad-glyphy/glyphy.trace expectations: - device: gl-panfrost-t860 - checksum: b6cd8d92987530edcfc36a933c9b07f6 + checksum: 22bf5262745fd47c5c5eadb93d7cc420 - path: glmark2/desktop:windows=4:effect=blur:blur-radius=5:passes=1:separable=true.trace expectations: - device: gl-panfrost-t860 @@ -158,7 +158,7 @@ traces: - path: glmark2/refract.trace expectations: - device: gl-panfrost-t860 - checksum: e520a0071fd940be1401aea2bec97709 + checksum: 6557deca1a47a7a77723658ea579ac63 - path: glmark2/shading:shading=blinn-phong-inf.trace expectations: - device: gl-panfrost-t860 @@ -209,11 +209,11 @@ traces: - path: gputest/plot3d.trace expectations: - device: gl-panfrost-t860 - checksum: e73715f3b6a4f1609eaf5432af03714e + checksum: a34223830866a42747db199b04c5e1be - path: humus/AmbientAperture.trace expectations: - device: gl-panfrost-t860 - checksum: b0d4a64e0907f817161b2a0e85af7a9a + checksum: e4c0b930ef99f14305e1ade7f1779c09 - path: humus/CelShading.trace expectations: - device: gl-panfrost-t860