[AMDGPU][MC] Corrected encoding of src0 for DS_GWS_* instructions

See bug 42599: https://bugs.llvm.org/show_bug.cgi?id=42599

Reviewers: artem.tamazov, arsenm

Differential Revision: https://reviews.llvm.org/D64716

llvm-svn: 366067

6 files changed, 66 insertions, 66 deletions

diff --git a/llvm/test/MC/AMDGPU/ds.s b/llvm/test/MC/AMDGPU/ds.s
index 1bb0597209e..70f52972a81 100644
--- a/llvm/test/MC/AMDGPU/ds.s
+++ b/llvm/test/MC/AMDGPU/ds.s
@@ -148,12 +148,12 @@ ds_max_f32 v2, v4
 // VI:   ds_max_f32 v2, v4 ; encoding: [0x00,0x00,0x26,0xd8,0x02,0x04,0x00,0x00]
 
 ds_gws_init v2 gds
-// SICI: ds_gws_init v2 gds ; encoding: [0x00,0x00,0x66,0xd8,0x00,0x02,0x00,0x00]
-// VI:   ds_gws_init v2 gds ; encoding: [0x00,0x00,0x33,0xd9,0x00,0x02,0x00,0x00]
+// SICI: ds_gws_init v2 gds ; encoding: [0x00,0x00,0x66,0xd8,0x02,0x00,0x00,0x00]
+// VI: ds_gws_init v2 gds ; encoding: [0x00,0x00,0x33,0xd9,0x02,0x00,0x00,0x00]
 
 ds_gws_init v3 offset:12345 gds
-// SICI: ds_gws_init v3 offset:12345 gds ; encoding: [0x39,0x30,0x66,0xd8,0x00,0x03,0x00,0x00]
-// VI:   ds_gws_init v3 offset:12345 gds ; encoding: [0x39,0x30,0x33,0xd9,0x00,0x03,0x00,0x00]
+// SICI: ds_gws_init v3 offset:12345 gds ; encoding: [0x39,0x30,0x66,0xd8,0x03,0x00,0x00,0x00]
+// VI: ds_gws_init v3 offset:12345 gds ; encoding: [0x39,0x30,0x33,0xd9,0x03,0x00,0x00,0x00]
 
 ds_gws_sema_v gds
 // SICI: ds_gws_sema_v gds ; encoding: [0x00,0x00,0x6a,0xd8,0x00,0x00,0x00,0x00]
@@ -164,16 +164,16 @@ ds_gws_sema_v offset:257 gds
 // VI:   ds_gws_sema_v offset:257 gds    ; encoding: [0x01,0x01,0x35,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v2 gds
-// SICI: ds_gws_sema_br v2 gds ; encoding: [0x00,0x00,0x6e,0xd8,0x00,0x02,0x00,0x00]
-// VI:   ds_gws_sema_br v2 gds ; encoding: [0x00,0x00,0x37,0xd9,0x00,0x02,0x00,0x00]
+// SICI: ds_gws_sema_br v2 gds ; encoding: [0x00,0x00,0x6e,0xd8,0x02,0x00,0x00,0x00]
+// VI: ds_gws_sema_br v2 gds ; encoding: [0x00,0x00,0x37,0xd9,0x02,0x00,0x00,0x00]
 
 ds_gws_sema_p gds
 // SICI: ds_gws_sema_p gds ; encoding: [0x00,0x00,0x72,0xd8,0x00,0x00,0x00,0x00]
 // VI:   ds_gws_sema_p gds ; encoding: [0x00,0x00,0x39,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v2 gds
-// SICI: ds_gws_barrier v2 gds ; encoding: [0x00,0x00,0x76,0xd8,0x00,0x02,0x00,0x00]
-// VI:   ds_gws_barrier v2 gds ; encoding: [0x00,0x00,0x3b,0xd9,0x00,0x02,0x00,0x00]
+// SICI: ds_gws_barrier v2 gds ; encoding: [0x00,0x00,0x76,0xd8,0x02,0x00,0x00,0x00]
+// VI: ds_gws_barrier v2 gds ; encoding: [0x00,0x00,0x3b,0xd9,0x02,0x00,0x00,0x00]
 
 ds_write_b8 v2, v4
 // SICI: ds_write_b8 v2, v4 ; encoding: [0x00,0x00,0x78,0xd8,0x02,0x04,0x00,0x00]
diff --git a/llvm/test/MC/AMDGPU/expressions.s b/llvm/test/MC/AMDGPU/expressions.s
index a6037a226b6..37fe08a52d1 100644
--- a/llvm/test/MC/AMDGPU/expressions.s
+++ b/llvm/test/MC/AMDGPU/expressions.s
@@ -233,7 +233,7 @@ s_mov_b32 s0, global
 
 // Use a token with the same name as a global
 ds_gws_init v2 gds
-// VI: ds_gws_init v2 gds ; encoding: [0x00,0x00,0x33,0xd9,0x00,0x02,0x00,0x00]
+// VI: ds_gws_init v2 gds ; encoding: [0x00,0x00,0x33,0xd9,0x02,0x00,0x00,0x00]
 
 // Use a global with the same name as a token
 s_mov_b32 s0, gds
diff --git a/llvm/test/MC/AMDGPU/gfx10_asm_all.s b/llvm/test/MC/AMDGPU/gfx10_asm_all.s
index 9f9407c0b8f..4916702dbcb 100644
--- a/llvm/test/MC/AMDGPU/gfx10_asm_all.s
+++ b/llvm/test/MC/AMDGPU/gfx10_asm_all.s
@@ -2462,25 +2462,25 @@ ds_gws_init v0 gds
 // GFX10: encoding: [0x00,0x00,0x66,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_init v255 gds
-// GFX10: encoding: [0x00,0x00,0x66,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x00,0x00,0x66,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_init v0 offset:0 gds
 // GFX10: encoding: [0x00,0x00,0x66,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_init v255 offset:0 gds
-// GFX10: encoding: [0x00,0x00,0x66,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x00,0x00,0x66,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_init v0 offset:4660 gds
 // GFX10: encoding: [0x34,0x12,0x66,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_init v255 offset:4660 gds
-// GFX10: encoding: [0x34,0x12,0x66,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x34,0x12,0x66,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_init v0 offset:65535 gds
 // GFX10: encoding: [0xff,0xff,0x66,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_init v255 offset:65535 gds
-// GFX10: encoding: [0xff,0xff,0x66,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0xff,0xff,0x66,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_v gds
 // GFX10: encoding: [0x00,0x00,0x6a,0xd8,0x00,0x00,0x00,0x00]
@@ -2498,25 +2498,25 @@ ds_gws_sema_br v0 gds
 // GFX10: encoding: [0x00,0x00,0x6e,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v255 gds
-// GFX10: encoding: [0x00,0x00,0x6e,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x00,0x00,0x6e,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_br v0 offset:0 gds
 // GFX10: encoding: [0x00,0x00,0x6e,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v255 offset:0 gds
-// GFX10: encoding: [0x00,0x00,0x6e,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x00,0x00,0x6e,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_br v0 offset:4660 gds
 // GFX10: encoding: [0x34,0x12,0x6e,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v255 offset:4660 gds
-// GFX10: encoding: [0x34,0x12,0x6e,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x34,0x12,0x6e,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_br v0 offset:65535 gds
 // GFX10: encoding: [0xff,0xff,0x6e,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v255 offset:65535 gds
-// GFX10: encoding: [0xff,0xff,0x6e,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0xff,0xff,0x6e,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_p gds
 // GFX10: encoding: [0x00,0x00,0x72,0xd8,0x00,0x00,0x00,0x00]
@@ -2534,25 +2534,25 @@ ds_gws_barrier v0 gds
 // GFX10: encoding: [0x00,0x00,0x76,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v255 gds
-// GFX10: encoding: [0x00,0x00,0x76,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x00,0x00,0x76,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_barrier v0 offset:0 gds
 // GFX10: encoding: [0x00,0x00,0x76,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v255 offset:0 gds
-// GFX10: encoding: [0x00,0x00,0x76,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x00,0x00,0x76,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_barrier v0 offset:4660 gds
 // GFX10: encoding: [0x34,0x12,0x76,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v255 offset:4660 gds
-// GFX10: encoding: [0x34,0x12,0x76,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0x34,0x12,0x76,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_barrier v0 offset:65535 gds
 // GFX10: encoding: [0xff,0xff,0x76,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v255 offset:65535 gds
-// GFX10: encoding: [0xff,0xff,0x76,0xd8,0x00,0xff,0x00,0x00]
+// GFX10: encoding: [0xff,0xff,0x76,0xd8,0xff,0x00,0x00,0x00]
 
 ds_write_b8 v0, v1
 // GFX10: encoding: [0x00,0x00,0x78,0xd8,0x00,0x01,0x00,0x00]
diff --git a/llvm/test/MC/AMDGPU/gfx7_asm_all.s b/llvm/test/MC/AMDGPU/gfx7_asm_all.s
index 80d6e2f7219..434c64b72ff 100644
--- a/llvm/test/MC/AMDGPU/gfx7_asm_all.s
+++ b/llvm/test/MC/AMDGPU/gfx7_asm_all.s
@@ -469,19 +469,19 @@ ds_gws_sema_release_all offset:4 gds
 // CHECK: [0x04,0x00,0x62,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x66,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x66,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_init v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x66,0xd8,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x66,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_init v1 gds
-// CHECK: [0x00,0x00,0x66,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x66,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:0 gds
-// CHECK: [0x00,0x00,0x66,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x66,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:4 gds
-// CHECK: [0x04,0x00,0x66,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x66,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_v offset:65535 gds
 // CHECK: [0xff,0xff,0x6a,0xd8,0x00,0x00,0x00,0x00]
@@ -496,19 +496,19 @@ ds_gws_sema_v offset:4 gds
 // CHECK: [0x04,0x00,0x6a,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x6e,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x6e,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x6e,0xd8,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x6e,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 gds
-// CHECK: [0x00,0x00,0x6e,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x6e,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:0 gds
-// CHECK: [0x00,0x00,0x6e,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x6e,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:4 gds
-// CHECK: [0x04,0x00,0x6e,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x6e,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_p offset:65535 gds
 // CHECK: [0xff,0xff,0x72,0xd8,0x00,0x00,0x00,0x00]
@@ -523,19 +523,19 @@ ds_gws_sema_p offset:4 gds
 // CHECK: [0x04,0x00,0x72,0xd8,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x76,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x76,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x76,0xd8,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x76,0xd8,0xff,0x00,0x00,0x00]
 
 ds_gws_barrier v1 gds
-// CHECK: [0x00,0x00,0x76,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x76,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:0 gds
-// CHECK: [0x00,0x00,0x76,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x76,0xd8,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:4 gds
-// CHECK: [0x04,0x00,0x76,0xd8,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x76,0xd8,0x01,0x00,0x00,0x00]
 
 ds_write_b8 v1, v2 offset:65535
 // CHECK: [0xff,0xff,0x78,0xd8,0x01,0x02,0x00,0x00]
diff --git a/llvm/test/MC/AMDGPU/gfx8_asm_all.s b/llvm/test/MC/AMDGPU/gfx8_asm_all.s
index 9ae178a3a79..1f2de29cccb 100644
--- a/llvm/test/MC/AMDGPU/gfx8_asm_all.s
+++ b/llvm/test/MC/AMDGPU/gfx8_asm_all.s
@@ -2665,19 +2665,19 @@ ds_gws_sema_release_all offset:4 gds
 // CHECK: [0x04,0x00,0x31,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_init v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x33,0xd9,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x33,0xd9,0xff,0x00,0x00,0x00]
 
 ds_gws_init v1 gds
-// CHECK: [0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:0 gds
-// CHECK: [0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:4 gds
-// CHECK: [0x04,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_v offset:65535 gds
 // CHECK: [0xff,0xff,0x35,0xd9,0x00,0x00,0x00,0x00]
@@ -2692,19 +2692,19 @@ ds_gws_sema_v offset:4 gds
 // CHECK: [0x04,0x00,0x35,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x37,0xd9,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x37,0xd9,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 gds
-// CHECK: [0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:0 gds
-// CHECK: [0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:4 gds
-// CHECK: [0x04,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_p offset:65535 gds
 // CHECK: [0xff,0xff,0x39,0xd9,0x00,0x00,0x00,0x00]
@@ -2719,19 +2719,19 @@ ds_gws_sema_p offset:4 gds
 // CHECK: [0x04,0x00,0x39,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x3b,0xd9,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x3b,0xd9,0xff,0x00,0x00,0x00]
 
 ds_gws_barrier v1 gds
-// CHECK: [0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:0 gds
-// CHECK: [0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:4 gds
-// CHECK: [0x04,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_consume v5 offset:65535
 // CHECK: [0xff,0xff,0x7a,0xd9,0x00,0x00,0x00,0x05]
diff --git a/llvm/test/MC/AMDGPU/gfx9_asm_all.s b/llvm/test/MC/AMDGPU/gfx9_asm_all.s
index 104e8ea3f03..fc4d8f438cc 100644
--- a/llvm/test/MC/AMDGPU/gfx9_asm_all.s
+++ b/llvm/test/MC/AMDGPU/gfx9_asm_all.s
@@ -2834,19 +2834,19 @@ ds_gws_sema_release_all offset:4 gds
 // CHECK: [0x04,0x00,0x31,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_init v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x33,0xd9,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x33,0xd9,0xff,0x00,0x00,0x00]
 
 ds_gws_init v1 gds
-// CHECK: [0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:0 gds
-// CHECK: [0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_init v1 offset:4 gds
-// CHECK: [0x04,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_v offset:65535 gds
 // CHECK: [0xff,0xff,0x35,0xd9,0x00,0x00,0x00,0x00]
@@ -2861,19 +2861,19 @@ ds_gws_sema_v offset:4 gds
 // CHECK: [0x04,0x00,0x35,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x37,0xd9,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x37,0xd9,0xff,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 gds
-// CHECK: [0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:0 gds
-// CHECK: [0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_br v1 offset:4 gds
-// CHECK: [0x04,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_sema_p offset:65535 gds
 // CHECK: [0xff,0xff,0x39,0xd9,0x00,0x00,0x00,0x00]
@@ -2888,19 +2888,19 @@ ds_gws_sema_p offset:4 gds
 // CHECK: [0x04,0x00,0x39,0xd9,0x00,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:65535 gds
-// CHECK: [0xff,0xff,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0xff,0xff,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v255 offset:65535 gds
-// CHECK: [0xff,0xff,0x3b,0xd9,0x00,0xff,0x00,0x00]
+// CHECK: [0xff,0xff,0x3b,0xd9,0xff,0x00,0x00,0x00]
 
 ds_gws_barrier v1 gds
-// CHECK: [0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:0 gds
-// CHECK: [0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_gws_barrier v1 offset:4 gds
-// CHECK: [0x04,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
+// CHECK: [0x04,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
 
 ds_consume v5 offset:65535
 // CHECK: [0xff,0xff,0x7a,0xd9,0x00,0x00,0x00,0x05]