diff --git a/src/intel/compiler/brw_eu.cpp b/src/intel/compiler/brw_eu.cpp
index 51ae8cdc221..0027b0a3965 100644
--- a/src/intel/compiler/brw_eu.cpp
+++ b/src/intel/compiler/brw_eu.cpp
@@ -650,7 +650,7 @@ static const struct opcode_desc opcode_descs[] = {
    { BRW_OPCODE_FORK,     46,  "fork",    0,    0,    GEN6 },
    { BRW_OPCODE_GOTO,     46,  "goto",    0,    0,    GEN_GE(GEN8) },
    { BRW_OPCODE_POP,      47,  "pop",     2,    0,    GEN_LE(GEN5) },
-   { BRW_OPCODE_WAIT,     48,  "wait",    1,    0,    GEN_LT(GEN12) },
+   { BRW_OPCODE_WAIT,     48,  "wait",    0,    1,    GEN_LT(GEN12) },
    { BRW_OPCODE_SEND,     49,  "send",    1,    1,    GEN_LT(GEN12) },
    { BRW_OPCODE_SENDC,    50,  "sendc",   1,    1,    GEN_LT(GEN12) },
    { BRW_OPCODE_SEND,     49,  "send",    2,    1,    GEN_GE(GEN12) },
diff --git a/src/intel/tools/tests/gen7.5/wait.asm b/src/intel/tools/tests/gen7.5/wait.asm
index f94845cd8a1..7f81fcd2253 100644
--- a/src/intel/tools/tests/gen7.5/wait.asm
+++ b/src/intel/tools/tests/gen7.5/wait.asm
@@ -1,3 +1,3 @@
-wait(1)                         n0<0>.xUD                       { align16 WE_all 1N };
-wait(1)                         n0<0>.yUD                       { align16 WE_all 1N };
-wait(1)                         n0<0>.zUD                       { align16 WE_all 1N };
+wait(1)         n0<1>.xUD                                       { align16 WE_all 1N };
+wait(1)         n0<1>.yUD                                       { align16 WE_all 1N };
+wait(1)         n0<1>.zUD                                       { align16 WE_all 1N };
diff --git a/src/intel/tools/tests/gen7/wait.asm b/src/intel/tools/tests/gen7/wait.asm
index f94845cd8a1..7f81fcd2253 100644
--- a/src/intel/tools/tests/gen7/wait.asm
+++ b/src/intel/tools/tests/gen7/wait.asm
@@ -1,3 +1,3 @@
-wait(1)                         n0<0>.xUD                       { align16 WE_all 1N };
-wait(1)                         n0<0>.yUD                       { align16 WE_all 1N };
-wait(1)                         n0<0>.zUD                       { align16 WE_all 1N };
+wait(1)         n0<1>.xUD                                       { align16 WE_all 1N };
+wait(1)         n0<1>.yUD                                       { align16 WE_all 1N };
+wait(1)         n0<1>.zUD                                       { align16 WE_all 1N };
diff --git a/src/intel/tools/tests/gen8/wait.asm b/src/intel/tools/tests/gen8/wait.asm
index 14c0b678e64..864acd0a8e0 100644
--- a/src/intel/tools/tests/gen8/wait.asm
+++ b/src/intel/tools/tests/gen8/wait.asm
@@ -1,3 +1,3 @@
-wait(1)                         n0.0<0>UD                       { align1 WE_all 1N };
-wait(1)                         n0.1<0>UD                       { align1 WE_all 1N };
-wait(1)                         n0.2<0>UD                       { align1 WE_all 1N };
+wait(1)         n0<1>UD                                         { align1 WE_all 1N };
+wait(1)         n0.1<1>UD                                       { align1 WE_all 1N };
+wait(1)         n0.2<1>UD                                       { align1 WE_all 1N };
diff --git a/src/intel/tools/tests/gen9/wait.asm b/src/intel/tools/tests/gen9/wait.asm
index 14c0b678e64..864acd0a8e0 100644
--- a/src/intel/tools/tests/gen9/wait.asm
+++ b/src/intel/tools/tests/gen9/wait.asm
@@ -1,3 +1,3 @@
-wait(1)                         n0.0<0>UD                       { align1 WE_all 1N };
-wait(1)                         n0.1<0>UD                       { align1 WE_all 1N };
-wait(1)                         n0.2<0>UD                       { align1 WE_all 1N };
+wait(1)         n0<1>UD                                         { align1 WE_all 1N };
+wait(1)         n0.1<1>UD                                       { align1 WE_all 1N };
+wait(1)         n0.2<1>UD                                       { align1 WE_all 1N };