From: Dmitry Preobrazhensky <dmitry.preobrazhensky@amd.com>
Date: Mon, 15 Jul 2019 14:37:57 +0000 (+0000)
Subject: [AMDGPU][MC] Corrected encoding of src0 for DS_GWS_* instructions
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0599ccec633ab4fc876c39f2679aaf06432ad6d;p=llvm

[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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@366067 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/AMDGPU/DSInstructions.td b/lib/Target/AMDGPU/DSInstructions.td
index 93308e6d78a..e39f565fd22 100644
--- a/lib/Target/AMDGPU/DSInstructions.td
+++ b/lib/Target/AMDGPU/DSInstructions.td
@@ -38,6 +38,8 @@ class DS_Pseudo <string opName, dag outs, dag ins, string asmOps, list<dag> patt
   bits<1> has_data0 = 1;
   bits<1> has_data1 = 1;
 
+  bits<1> has_gws_data0 = 0; // data0 is encoded as addr
+
   bits<1> has_offset  = 1; // has "offset" that should be split to offset0,1
   bits<1> has_offset0 = 1;
   bits<1> has_offset1 = 1;
@@ -320,7 +322,7 @@ class DS_GWS_1D <string opName>
 : DS_GWS<opName,
   (ins VGPR_32:$data0, offset:$offset, gds:$gds), "$data0$offset gds"> {
 
-  let has_data0 = 1;
+  let has_gws_data0 = 1;
 }
 
 class DS_VOID <string opName> : DS_Pseudo<opName,
@@ -832,7 +834,7 @@ class Base_DS_Real_gfx6_gfx7_gfx10<bits<8> op, DS_Pseudo ps, int ef> :
   let Inst{17}    = !if(ps.has_gds, gds, ps.gdsValue);
   let Inst{25-18} = op;
   let Inst{31-26} = 0x36;
-  let Inst{39-32} = !if(ps.has_addr, addr, 0);
+  let Inst{39-32} = !if(ps.has_addr, addr, !if(ps.has_gws_data0, data0, 0));
   let Inst{47-40} = !if(ps.has_data0, data0, 0);
   let Inst{55-48} = !if(ps.has_data1, data1, 0);
   let Inst{63-56} = !if(ps.has_vdst, vdst, 0);
@@ -1051,7 +1053,7 @@ class DS_Real_vi <bits<8> op, DS_Pseudo ds> :
   let Inst{16}    = !if(ds.has_gds, gds, ds.gdsValue);
   let Inst{24-17} = op;
   let Inst{31-26} = 0x36; // ds prefix
-  let Inst{39-32} = !if(ds.has_addr, addr, 0);
+  let Inst{39-32} = !if(ds.has_addr, addr, !if(ds.has_gws_data0, data0, 0));
   let Inst{47-40} = !if(ds.has_data0, data0, 0);
   let Inst{55-48} = !if(ds.has_data1, data1, 0);
   let Inst{63-56} = !if(ds.has_vdst, vdst, 0);
diff --git a/test/MC/AMDGPU/ds.s b/test/MC/AMDGPU/ds.s
index 1bb0597209e..70f52972a81 100644
--- a/test/MC/AMDGPU/ds.s
+++ b/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/test/MC/AMDGPU/expressions.s b/test/MC/AMDGPU/expressions.s
index a6037a226b6..37fe08a52d1 100644
--- a/test/MC/AMDGPU/expressions.s
+++ b/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/test/MC/AMDGPU/gfx10_asm_all.s b/test/MC/AMDGPU/gfx10_asm_all.s
index 9f9407c0b8f..4916702dbcb 100644
--- a/test/MC/AMDGPU/gfx10_asm_all.s
+++ b/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/test/MC/AMDGPU/gfx7_asm_all.s b/test/MC/AMDGPU/gfx7_asm_all.s
index 80d6e2f7219..434c64b72ff 100644
--- a/test/MC/AMDGPU/gfx7_asm_all.s
+++ b/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/test/MC/AMDGPU/gfx8_asm_all.s b/test/MC/AMDGPU/gfx8_asm_all.s
index 9ae178a3a79..1f2de29cccb 100644
--- a/test/MC/AMDGPU/gfx8_asm_all.s
+++ b/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/test/MC/AMDGPU/gfx9_asm_all.s b/test/MC/AMDGPU/gfx9_asm_all.s
index 104e8ea3f03..fc4d8f438cc 100644
--- a/test/MC/AMDGPU/gfx9_asm_all.s
+++ b/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]
diff --git a/test/MC/Disassembler/AMDGPU/ds_vi.txt b/test/MC/Disassembler/AMDGPU/ds_vi.txt
index 7f0cb4a0088..094465776e1 100644
--- a/test/MC/Disassembler/AMDGPU/ds_vi.txt
+++ b/test/MC/Disassembler/AMDGPU/ds_vi.txt
@@ -81,11 +81,11 @@
 # VI:   ds_max_f32 v2, v4 ; encoding: [0x00,0x00,0x26,0xd8,0x02,0x04,0x00,0x00]
 0x00 0x00 0x26 0xd8 0x02 0x04 0x00 0x00
 
-# VI:   ds_gws_init v2 gds ; encoding: [0x00,0x00,0x33,0xd9,0x00,0x02,0x00,0x00]
-0x00 0x00 0x33 0xd9 0x00 0x02 0x00,0x00
+# VI:   ds_gws_init v2 gds ; encoding: [0x00,0x00,0x33,0xd9,0x02,0x00,0x00,0x00]
+0x00 0x00 0x33 0xd9 0x02 0x00 0x00,0x00
 
-# VI:   ds_gws_init v3 offset:12345 gds ; encoding: [0x39,0x30,0x33,0xd9,0x00,0x03,0x00,0x00]
-0x39 0x30 0x33 0xd9 0x00 0x03 0x00 0x00
+# VI:   ds_gws_init v3 offset:12345 gds ; encoding: [0x39,0x30,0x33,0xd9,0x03,0x00,0x00,0x00]
+0x39 0x30 0x33 0xd9 0x03 0x00 0x00 0x00
 
 # VI:   ds_gws_sema_v gds ; encoding: [0x00,0x00,0x35,0xd9,0x00,0x00,0x00,0x00]
 0x00 0x00 0x35 0xd9 0x00 0x00 0x00 0x00
@@ -93,14 +93,14 @@
 # VI:   ds_gws_sema_v offset:257 gds    ; encoding: [0x01,0x01,0x35,0xd9,0x00,0x00,0x00,0x00]
 0x01 0x01 0x35 0xd9 0x00 0x00 0x00 0x00
 
-# VI:   ds_gws_sema_br v2 gds ; encoding: [0x00,0x00,0x37,0xd9,0x00,0x02,0x00,0x00]
-0x00 0x00 0x37 0xd9 0x00 0x02 0x00 0x00
+# VI:   ds_gws_sema_br v2 gds ; encoding: [0x00,0x00,0x37,0xd9,0x02,0x00,0x00,0x00]
+0x00 0x00 0x37 0xd9 0x02 0x00 0x00 0x00
 
 # VI:   ds_gws_sema_p gds ; encoding: [0x00,0x00,0x39,0xd9,0x00,0x00,0x00,0x00]
 0x00 0x00 0x39 0xd9 0x00 0x00 0x00 0x00
 
-# VI:   ds_gws_barrier v2 gds ; encoding: [0x00,0x00,0x3b,0xd9,0x00,0x02,0x00,0x00]
-0x00 0x00 0x3b 0xd9 0x00 0x02 0x00 0x00
+# VI:   ds_gws_barrier v2 gds ; encoding: [0x00,0x00,0x3b,0xd9,0x02,0x00,0x00,0x00]
+0x00 0x00 0x3b 0xd9 0x02 0x00 0x00 0x00
 
 # VI:   ds_write_b8 v2, v4 ; encoding: [0x00,0x00,0x3c,0xd8,0x02,0x04,0x00,0x00]
 0x00 0x00 0x3c 0xd8 0x02 0x04 0x00 0x00
diff --git a/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt b/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt
index 464dc0cd14b..e564aff5958 100644
--- a/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt
+++ b/test/MC/Disassembler/AMDGPU/gfx10_dasm_all.txt
@@ -3578,14 +3578,14 @@
 # GFX10: ds_gws_barrier v0 offset:65535 gds ; encoding: [0xff,0xff,0x76,0xd8,0x00,0x00,0x00,0x00]
 0xff,0xff,0x76,0xd8,0x00,0x00,0x00,0x00
 
-# GFX10: ds_gws_barrier v255 gds         ; encoding: [0x00,0x00,0x76,0xd8,0x00,0xff,0x00,0x00]
-0x00,0x00,0x76,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_barrier v255 gds         ; encoding: [0x00,0x00,0x76,0xd8,0xff,0x00,0x00,0x00]
+0x00,0x00,0x76,0xd8,0xff,0x00,0x00,0x00
 
-# GFX10: ds_gws_barrier v255 offset:4660 gds ; encoding: [0x34,0x12,0x76,0xd8,0x00,0xff,0x00,0x00]
-0x34,0x12,0x76,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_barrier v255 offset:4660 gds ; encoding: [0x34,0x12,0x76,0xd8,0xff,0x00,0x00,0x00]
+0x34,0x12,0x76,0xd8,0xff,0x00,0x00,0x00
 
-# GFX10: ds_gws_barrier v255 offset:65535 gds ; encoding: [0xff,0xff,0x76,0xd8,0x00,0xff,0x00,0x00]
-0xff,0xff,0x76,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_barrier v255 offset:65535 gds ; encoding: [0xff,0xff,0x76,0xd8,0xff,0x00,0x00,0x00]
+0xff,0xff,0x76,0xd8,0xff,0x00,0x00,0x00
 
 # GFX10: ds_gws_init v0 gds              ; encoding: [0x00,0x00,0x66,0xd8,0x00,0x00,0x00,0x00]
 0x00,0x00,0x66,0xd8,0x00,0x00,0x00,0x00
@@ -3596,14 +3596,14 @@
 # GFX10: ds_gws_init v0 offset:65535 gds ; encoding: [0xff,0xff,0x66,0xd8,0x00,0x00,0x00,0x00]
 0xff,0xff,0x66,0xd8,0x00,0x00,0x00,0x00
 
-# GFX10: ds_gws_init v255 gds            ; encoding: [0x00,0x00,0x66,0xd8,0x00,0xff,0x00,0x00]
-0x00,0x00,0x66,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_init v255 gds            ; encoding: [0x00,0x00,0x66,0xd8,0xff,0x00,0x00,0x00]
+0x00,0x00,0x66,0xd8,0xff,0x00,0x00,0x00
 
-# GFX10: ds_gws_init v255 offset:4660 gds ; encoding: [0x34,0x12,0x66,0xd8,0x00,0xff,0x00,0x00]
-0x34,0x12,0x66,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_init v255 offset:4660 gds ; encoding: [0x34,0x12,0x66,0xd8,0xff,0x00,0x00,0x00]
+0x34,0x12,0x66,0xd8,0xff,0x00,0x00,0x00
 
-# GFX10: ds_gws_init v255 offset:65535 gds ; encoding: [0xff,0xff,0x66,0xd8,0x00,0xff,0x00,0x00]
-0xff,0xff,0x66,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_init v255 offset:65535 gds ; encoding: [0xff,0xff,0x66,0xd8,0xff,0x00,0x00,0x00]
+0xff,0xff,0x66,0xd8,0xff,0x00,0x00,0x00
 
 # GFX10: ds_gws_sema_br v0 gds           ; encoding: [0x00,0x00,0x6e,0xd8,0x00,0x00,0x00,0x00]
 0x00,0x00,0x6e,0xd8,0x00,0x00,0x00,0x00
@@ -3614,14 +3614,14 @@
 # GFX10: ds_gws_sema_br v0 offset:65535 gds ; encoding: [0xff,0xff,0x6e,0xd8,0x00,0x00,0x00,0x00]
 0xff,0xff,0x6e,0xd8,0x00,0x00,0x00,0x00
 
-# GFX10: ds_gws_sema_br v255 gds         ; encoding: [0x00,0x00,0x6e,0xd8,0x00,0xff,0x00,0x00]
-0x00,0x00,0x6e,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_sema_br v255 gds         ; encoding: [0x00,0x00,0x6e,0xd8,0xff,0x00,0x00,0x00]
+0x00,0x00,0x6e,0xd8,0xff,0x00,0x00,0x00
 
-# GFX10: ds_gws_sema_br v255 offset:4660 gds ; encoding: [0x34,0x12,0x6e,0xd8,0x00,0xff,0x00,0x00]
-0x34,0x12,0x6e,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_sema_br v255 offset:4660 gds ; encoding: [0x34,0x12,0x6e,0xd8,0xff,0x00,0x00,0x00]
+0x34,0x12,0x6e,0xd8,0xff,0x00,0x00,0x00
 
-# GFX10: ds_gws_sema_br v255 offset:65535 gds ; encoding: [0xff,0xff,0x6e,0xd8,0x00,0xff,0x00,0x00]
-0xff,0xff,0x6e,0xd8,0x00,0xff,0x00,0x00
+# GFX10: ds_gws_sema_br v255 offset:65535 gds ; encoding: [0xff,0xff,0x6e,0xd8,0xff,0x00,0x00,0x00]
+0xff,0xff,0x6e,0xd8,0xff,0x00,0x00,0x00
 
 # GFX10: ds_gws_sema_p  gds              ; encoding: [0x00,0x00,0x72,0xd8,0x00,0x00,0x00,0x00]
 0x00,0x00,0x72,0xd8,0x00,0x00,0x00,0x00
diff --git a/test/MC/Disassembler/AMDGPU/gfx8_dasm_all.txt b/test/MC/Disassembler/AMDGPU/gfx8_dasm_all.txt
index 2d36a09f534..64e8d17467b 100644
--- a/test/MC/Disassembler/AMDGPU/gfx8_dasm_all.txt
+++ b/test/MC/Disassembler/AMDGPU/gfx8_dasm_all.txt
@@ -2268,17 +2268,17 @@
 # CHECK: ds_gws_sema_release_all offset:4 gds    ; encoding: [0x04,0x00,0x31,0xd9,0x00,0x00,0x00,0x00]
 0x04,0x00,0x31,0xd9,0x00,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v1 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0x00,0x01,0x00,0x00]
-0xff,0xff,0x33,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_init v1 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0x01,0x00,0x00,0x00]
+0xff,0xff,0x33,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v255 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0x00,0xff,0x00,0x00]
-0xff,0xff,0x33,0xd9,0x00,0xff,0x00,0x00
+# CHECK: ds_gws_init v255 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0xff,0x00,0x00,0x00]
+0xff,0xff,0x33,0xd9,0xff,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v1 gds    ; encoding: [0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
-0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_init v1 gds    ; encoding: [0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
+0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v1 offset:4 gds    ; encoding: [0x04,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
-0x04,0x00,0x33,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_init v1 offset:4 gds    ; encoding: [0x04,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
+0x04,0x00,0x33,0xd9,0x01,0x00,0x00,0x00
 
 # CHECK: ds_gws_sema_v offset:65535 gds    ; encoding: [0xff,0xff,0x35,0xd9,0x00,0x00,0x00,0x00]
 0xff,0xff,0x35,0xd9,0x00,0x00,0x00,0x00
@@ -2289,17 +2289,17 @@
 # CHECK: ds_gws_sema_v offset:4 gds    ; encoding: [0x04,0x00,0x35,0xd9,0x00,0x00,0x00,0x00]
 0x04,0x00,0x35,0xd9,0x00,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v1 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0x00,0x01,0x00,0x00]
-0xff,0xff,0x37,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_sema_br v1 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0x01,0x00,0x00,0x00]
+0xff,0xff,0x37,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v255 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0x00,0xff,0x00,0x00]
-0xff,0xff,0x37,0xd9,0x00,0xff,0x00,0x00
+# CHECK: ds_gws_sema_br v255 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0xff,0x00,0x00,0x00]
+0xff,0xff,0x37,0xd9,0xff,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v1 gds    ; encoding: [0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
-0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_sema_br v1 gds    ; encoding: [0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
+0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v1 offset:4 gds    ; encoding: [0x04,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
-0x04,0x00,0x37,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_sema_br v1 offset:4 gds    ; encoding: [0x04,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
+0x04,0x00,0x37,0xd9,0x01,0x00,0x00,0x00
 
 # CHECK: ds_gws_sema_p offset:65535 gds    ; encoding: [0xff,0xff,0x39,0xd9,0x00,0x00,0x00,0x00]
 0xff,0xff,0x39,0xd9,0x00,0x00,0x00,0x00
@@ -2310,17 +2310,17 @@
 # CHECK: ds_gws_sema_p offset:4 gds    ; encoding: [0x04,0x00,0x39,0xd9,0x00,0x00,0x00,0x00]
 0x04,0x00,0x39,0xd9,0x00,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v1 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0x00,0x01,0x00,0x00]
-0xff,0xff,0x3b,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_barrier v1 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0x01,0x00,0x00,0x00]
+0xff,0xff,0x3b,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v255 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0x00,0xff,0x00,0x00]
-0xff,0xff,0x3b,0xd9,0x00,0xff,0x00,0x00
+# CHECK: ds_gws_barrier v255 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0xff,0x00,0x00,0x00]
+0xff,0xff,0x3b,0xd9,0xff,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v1 gds    ; encoding: [0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
-0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_barrier v1 gds    ; encoding: [0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
+0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v1 offset:4 gds    ; encoding: [0x04,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
-0x04,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_barrier v1 offset:4 gds    ; encoding: [0x04,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
+0x04,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00
 
 # CHECK: ds_consume v5 offset:65535    ; encoding: [0xff,0xff,0x7a,0xd9,0x00,0x00,0x00,0x05]
 0xff,0xff,0x7a,0xd9,0x00,0x00,0x00,0x05
diff --git a/test/MC/Disassembler/AMDGPU/gfx9_dasm_all.txt b/test/MC/Disassembler/AMDGPU/gfx9_dasm_all.txt
index 566852b9e32..31dcaf5c141 100644
--- a/test/MC/Disassembler/AMDGPU/gfx9_dasm_all.txt
+++ b/test/MC/Disassembler/AMDGPU/gfx9_dasm_all.txt
@@ -2412,17 +2412,17 @@
 # CHECK: ds_gws_sema_release_all offset:4 gds    ; encoding: [0x04,0x00,0x31,0xd9,0x00,0x00,0x00,0x00]
 0x04,0x00,0x31,0xd9,0x00,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v1 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0x00,0x01,0x00,0x00]
-0xff,0xff,0x33,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_init v1 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0x01,0x00,0x00,0x00]
+0xff,0xff,0x33,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v255 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0x00,0xff,0x00,0x00]
-0xff,0xff,0x33,0xd9,0x00,0xff,0x00,0x00
+# CHECK: ds_gws_init v255 offset:65535 gds    ; encoding: [0xff,0xff,0x33,0xd9,0xff,0x00,0x00,0x00]
+0xff,0xff,0x33,0xd9,0xff,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v1 gds    ; encoding: [0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
-0x00,0x00,0x33,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_init v1 gds    ; encoding: [0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
+0x00,0x00,0x33,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_init v1 offset:4 gds    ; encoding: [0x04,0x00,0x33,0xd9,0x00,0x01,0x00,0x00]
-0x04,0x00,0x33,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_init v1 offset:4 gds    ; encoding: [0x04,0x00,0x33,0xd9,0x01,0x00,0x00,0x00]
+0x04,0x00,0x33,0xd9,0x01,0x00,0x00,0x00
 
 # CHECK: ds_gws_sema_v offset:65535 gds    ; encoding: [0xff,0xff,0x35,0xd9,0x00,0x00,0x00,0x00]
 0xff,0xff,0x35,0xd9,0x00,0x00,0x00,0x00
@@ -2433,17 +2433,17 @@
 # CHECK: ds_gws_sema_v offset:4 gds    ; encoding: [0x04,0x00,0x35,0xd9,0x00,0x00,0x00,0x00]
 0x04,0x00,0x35,0xd9,0x00,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v1 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0x00,0x01,0x00,0x00]
-0xff,0xff,0x37,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_sema_br v1 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0x01,0x00,0x00,0x00]
+0xff,0xff,0x37,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v255 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0x00,0xff,0x00,0x00]
-0xff,0xff,0x37,0xd9,0x00,0xff,0x00,0x00
+# CHECK: ds_gws_sema_br v255 offset:65535 gds    ; encoding: [0xff,0xff,0x37,0xd9,0xff,0x00,0x00,0x00]
+0xff,0xff,0x37,0xd9,0xff,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v1 gds    ; encoding: [0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
-0x00,0x00,0x37,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_sema_br v1 gds    ; encoding: [0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
+0x00,0x00,0x37,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_sema_br v1 offset:4 gds    ; encoding: [0x04,0x00,0x37,0xd9,0x00,0x01,0x00,0x00]
-0x04,0x00,0x37,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_sema_br v1 offset:4 gds    ; encoding: [0x04,0x00,0x37,0xd9,0x01,0x00,0x00,0x00]
+0x04,0x00,0x37,0xd9,0x01,0x00,0x00,0x00
 
 # CHECK: ds_gws_sema_p offset:65535 gds    ; encoding: [0xff,0xff,0x39,0xd9,0x00,0x00,0x00,0x00]
 0xff,0xff,0x39,0xd9,0x00,0x00,0x00,0x00
@@ -2454,17 +2454,17 @@
 # CHECK: ds_gws_sema_p offset:4 gds    ; encoding: [0x04,0x00,0x39,0xd9,0x00,0x00,0x00,0x00]
 0x04,0x00,0x39,0xd9,0x00,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v1 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0x00,0x01,0x00,0x00]
-0xff,0xff,0x3b,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_barrier v1 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0x01,0x00,0x00,0x00]
+0xff,0xff,0x3b,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v255 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0x00,0xff,0x00,0x00]
-0xff,0xff,0x3b,0xd9,0x00,0xff,0x00,0x00
+# CHECK: ds_gws_barrier v255 offset:65535 gds    ; encoding: [0xff,0xff,0x3b,0xd9,0xff,0x00,0x00,0x00]
+0xff,0xff,0x3b,0xd9,0xff,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v1 gds    ; encoding: [0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
-0x00,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_barrier v1 gds    ; encoding: [0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
+0x00,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00
 
-# CHECK: ds_gws_barrier v1 offset:4 gds    ; encoding: [0x04,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00]
-0x04,0x00,0x3b,0xd9,0x00,0x01,0x00,0x00
+# CHECK: ds_gws_barrier v1 offset:4 gds    ; encoding: [0x04,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00]
+0x04,0x00,0x3b,0xd9,0x01,0x00,0x00,0x00
 
 # CHECK: ds_consume v5 offset:65535    ; encoding: [0xff,0xff,0x7a,0xd9,0x00,0x00,0x00,0x05]
 0xff,0xff,0x7a,0xd9,0x00,0x00,0x00,0x05