From 57c2cfb6080bce2222ef5f5ca72c444e878411bc Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Mon, 14 Oct 2019 17:19:19 +0100 Subject: [PATCH] aco: add a few missing checks in value numbering MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rhys Perry Reviewed-by: Daniel Schürmann --- src/amd/compiler/aco_opt_value_numbering.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/amd/compiler/aco_opt_value_numbering.cpp b/src/amd/compiler/aco_opt_value_numbering.cpp index e19f125e29f..fe094ebb219 100644 --- a/src/amd/compiler/aco_opt_value_numbering.cpp +++ b/src/amd/compiler/aco_opt_value_numbering.cpp @@ -191,7 +191,9 @@ struct InstrPred { /* this is fine since they are only used for vertex input fetches */ MTBUF_instruction* aM = static_cast(a); MTBUF_instruction* bM = static_cast(b); - return aM->dfmt == bM->dfmt && + return aM->can_reorder == bM->can_reorder && + aM->barrier == bM->barrier && + aM->dfmt == bM->dfmt && aM->nfmt == bM->nfmt && aM->offset == bM->offset && aM->offen == bM->offen && @@ -221,6 +223,7 @@ struct InstrPred { MIMG_instruction* aM = static_cast(a); MIMG_instruction* bM = static_cast(b); return aM->can_reorder && bM->can_reorder && + aM->barrier == bM->barrier && aM->dmask == bM->dmask && aM->unrm == bM->unrm && aM->glc == bM->glc && -- 2.30.2