From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 29 Jun 2019 04:59:55 +0000 (-0400)
Subject: ac: remove unused AC_WAIT_EXP
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14450c8c41f9510ed7232198b968ead8f2eb7751;p=mesa.git

ac: remove unused AC_WAIT_EXP

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
---

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index b22c95c7a80..63891855e07 100644
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -2872,14 +2872,11 @@ void ac_build_waitcnt(struct ac_llvm_context *ctx, unsigned wait_flags)
 		return;
 
 	unsigned lgkmcnt = 63;
-	unsigned expcnt = 7;
 	unsigned vmcnt = ctx->chip_class >= GFX9 ? 63 : 15;
 	unsigned vscnt = 63;
 
 	if (wait_flags & AC_WAIT_LGKM)
 		lgkmcnt = 0;
-	if (wait_flags & AC_WAIT_EXP)
-		expcnt = 0;
 	if (wait_flags & AC_WAIT_VLOAD)
 		vmcnt = 0;
 
@@ -2891,7 +2888,7 @@ void ac_build_waitcnt(struct ac_llvm_context *ctx, unsigned wait_flags)
 	}
 
 	unsigned simm16 = (lgkmcnt << 8) |
-			  (expcnt << 4) |
+			  (7 << 4) | /* expcnt */
 			  (vmcnt & 0xf) |
 			  ((vmcnt >> 4) << 14);
 
diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h
index 18c9a27b068..7f6139e5cdd 100644
--- a/src/amd/common/ac_llvm_build.h
+++ b/src/amd/common/ac_llvm_build.h
@@ -44,9 +44,8 @@ enum {
 };
 
 #define AC_WAIT_LGKM	(1 << 0) /* LDS, GDS, constant, message */
-#define AC_WAIT_EXP	(1 << 1) /* exports */
-#define AC_WAIT_VLOAD	(1 << 2) /* VMEM load/sample instructions */
-#define AC_WAIT_VSTORE	(1 << 3) /* VMEM store instructions */
+#define AC_WAIT_VLOAD	(1 << 1) /* VMEM load/sample instructions */
+#define AC_WAIT_VSTORE	(1 << 2) /* VMEM store instructions */
 
 struct ac_llvm_flow;