diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
--- a/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
+++ b/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
@@ -37,11 +37,11 @@
 v_fmaak_f16 v5, v1, v2, 0x1121
 // GFX11: encoding: [0x01,0x05,0x0a,0x70,0x21,0x11,0x00,0x00]
 
-v_fmaak_f16 v255, v1, v2, 0x1121
-// GFX11: encoding: [0x01,0x05,0xfe,0x71,0x21,0x11,0x00,0x00]
+v_fmaak_f16 v127, v1, v2, 0x1121
+// GFX11: encoding: [0x01,0x05,0xfe,0x70,0x21,0x11,0x00,0x00]
 
-v_fmaak_f16 v5, v255, v2, 0x1121
-// GFX11: encoding: [0xff,0x05,0x0a,0x70,0x21,0x11,0x00,0x00]
+v_fmaak_f16 v5, v127, v2, 0x1121
+// GFX11: encoding: [0x7f,0x05,0x0a,0x70,0x21,0x11,0x00,0x00]
 
 v_fmaak_f16 v5, 0, v2, 0x1121
 // GFX11: encoding: [0x80,0x04,0x0a,0x70,0x21,0x11,0x00,0x00]
@@ -55,8 +55,8 @@
 v_fmaak_f16 v5, -4.0, v2, 0x1121
 // GFX11: encoding: [0xf7,0x04,0x0a,0x70,0x21,0x11,0x00,0x00]
 
-v_fmaak_f16 v5, v1, v255, 0x1121
-// GFX11: encoding: [0x01,0xff,0x0b,0x70,0x21,0x11,0x00,0x00]
+v_fmaak_f16 v5, v1, v127, 0x1121
+// GFX11: encoding: [0x01,0xff,0x0a,0x70,0x21,0x11,0x00,0x00]
 
 v_fmaak_f16 v5, v1, v2, 0xa1b1
 // GFX11: encoding: [0x01,0x05,0x0a,0x70,0xb1,0xa1,0x00,0x00]
@@ -103,11 +103,11 @@
 v_fmamk_f16 v5, v1, 0x1121, v3
 // GFX11: encoding: [0x01,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00]
 
-v_fmamk_f16 v255, v1, 0x1121, v3
-// GFX11: encoding: [0x01,0x07,0xfe,0x6f,0x21,0x11,0x00,0x00]
+v_fmamk_f16 v127, v1, 0x1121, v3
+// GFX11: encoding: [0x01,0x07,0xfe,0x6e,0x21,0x11,0x00,0x00]
 
-v_fmamk_f16 v5, v255, 0x1121, v3
-// GFX11: encoding: [0xff,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00]
+v_fmamk_f16 v5, v127, 0x1121, v3
+// GFX11: encoding: [0x7f,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00]
 
 v_fmamk_f16 v5, 0, 0x1121, v3
 // GFX11: encoding: [0x80,0x06,0x0a,0x6e,0x21,0x11,0x00,0x00]
@@ -124,8 +124,8 @@
 v_fmamk_f16 v5, v1, 0xa1b1, v3
 // GFX11: encoding: [0x01,0x07,0x0a,0x6e,0xb1,0xa1,0x00,0x00]
 
-v_fmamk_f16 v5, v1, 0x1121, v255
-// GFX11: encoding: [0x01,0xff,0x0b,0x6e,0x21,0x11,0x00,0x00]
+v_fmamk_f16 v5, v1, 0x1121, v127
+// GFX11: encoding: [0x01,0xff,0x0a,0x6e,0x21,0x11,0x00,0x00]
 
 v_pk_fmac_f16 v5, v1, v2
 // GFX11: encoding: [0x01,0x05,0x0a,0x78]
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop2.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop2.txt
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop2.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop2.txt
@@ -10,8 +10,8 @@
 # GFX11: v_fmaak_f32 v255, v1, v2, 0x11213141    ; encoding: [0x01,0x05,0xfe,0x5b,0x41,0x31,0x21,0x11]
 0x01,0x05,0xfe,0x5b,0x41,0x31,0x21,0x11
 
-# GFX11: v_fmaak_f16 v255, v1, v2, 0x1121        ; encoding: [0x01,0x05,0xfe,0x71,0x21,0x11,0x00,0x00]
-0x01,0x05,0xfe,0x71,0x21,0x11,0x00,0x00
+# GFX11: v_fmaak_f16 v127, v1, v2, 0x1121        ; encoding: [0x01,0x05,0xfe,0x70,0x21,0x11,0x00,0x00]
+0x01,0x05,0xfe,0x70,0x21,0x11,0x00,0x00
 
 # GFX11: v_fmaak_f32 v5, 0.5, v2, 0x11213141     ; encoding: [0xf0,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11]
 0xf0,0x04,0x0a,0x5a,0x41,0x31,0x21,0x11
@@ -52,14 +52,14 @@
 # GFX11: v_fmaak_f32 v5, v1, v255, 0x11213141    ; encoding: [0x01,0xff,0x0b,0x5a,0x41,0x31,0x21,0x11]
 0x01,0xff,0x0b,0x5a,0x41,0x31,0x21,0x11
 
-# GFX11: v_fmaak_f16 v5, v1, v255, 0x1121        ; encoding: [0x01,0xff,0x0b,0x70,0x21,0x11,0x00,0x00]
-0x01,0xff,0x0b,0x70,0x21,0x11,0x00,0x00
+# GFX11: v_fmaak_f16 v5, v1, v127, 0x1121        ; encoding: [0x01,0xff,0x0a,0x70,0x21,0x11,0x00,0x00]
+0x01,0xff,0x0a,0x70,0x21,0x11,0x00,0x00
 
 # GFX11: v_fmaak_f32 v5, v255, v2, 0x11213141    ; encoding: [0xff,0x05,0x0a,0x5a,0x41,0x31,0x21,0x11]
 0xff,0x05,0x0a,0x5a,0x41,0x31,0x21,0x11
 
-# GFX11: v_fmaak_f16 v5, v255, v2, 0x1121        ; encoding: [0xff,0x05,0x0a,0x70,0x21,0x11,0x00,0x00]
-0xff,0x05,0x0a,0x70,0x21,0x11,0x00,0x00
+# GFX11: v_fmaak_f16 v5, v127, v2, 0x1121        ; encoding: [0x7f,0x05,0x0a,0x70,0x21,0x11,0x00,0x00]
+0x7f,0x05,0x0a,0x70,0x21,0x11,0x00,0x00
 
 # GFX11: v_fmac_f16_e32 v5, 0x1234, v2           ; encoding: [0xff,0x04,0x0a,0x6c,0x34,0x12,0x00,0x00]
 0xff,0x04,0x0a,0x6c,0x34,0x12,0x00,0x00
@@ -76,8 +76,8 @@
 # GFX11: v_fmamk_f32 v255, v1, 0x11213141, v3    ; encoding: [0x01,0x07,0xfe,0x59,0x41,0x31,0x21,0x11]
 0x01,0x07,0xfe,0x59,0x41,0x31,0x21,0x11
 
-# GFX11: v_fmamk_f16 v255, v1, 0x1121, v3        ; encoding: [0x01,0x07,0xfe,0x6f,0x21,0x11,0x00,0x00]
-0x01,0x07,0xfe,0x6f,0x21,0x11,0x00,0x00
+# GFX11: v_fmamk_f16 v127, v1, 0x1121, v3        ; encoding: [0x01,0x07,0xfe,0x6e,0x21,0x11,0x00,0x00]
+0x01,0x07,0xfe,0x6e,0x21,0x11,0x00,0x00
 
 # GFX11: v_fmamk_f32 v5, 0, 0x11213141, v3       ; encoding: [0x80,0x06,0x0a,0x58,0x41,0x31,0x21,0x11]
 0x80,0x06,0x0a,0x58,0x41,0x31,0x21,0x11
@@ -109,8 +109,8 @@
 # GFX11: v_fmamk_f32 v5, v1, 0x11213141, v3      ; encoding: [0x01,0x07,0x0a,0x58,0x41,0x31,0x21,0x11]
 0x01,0x07,0x0a,0x58,0x41,0x31,0x21,0x11
 
-# GFX11: v_fmamk_f16 v5, v1, 0x1121, v255        ; encoding: [0x01,0xff,0x0b,0x6e,0x21,0x11,0x00,0x00]
-0x01,0xff,0x0b,0x6e,0x21,0x11,0x00,0x00
+# GFX11: v_fmamk_f16 v5, v1, 0x1121, v127        ; encoding: [0x01,0xff,0x0a,0x6e,0x21,0x11,0x00,0x00]
+0x01,0xff,0x0a,0x6e,0x21,0x11,0x00,0x00
 
 # GFX11: v_fmamk_f16 v5, v1, 0x1121, v3          ; encoding: [0x01,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00]
 0x01,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00
@@ -124,8 +124,8 @@
 # GFX11: v_fmamk_f32 v5, v255, 0x11213141, v3    ; encoding: [0xff,0x07,0x0a,0x58,0x41,0x31,0x21,0x11]
 0xff,0x07,0x0a,0x58,0x41,0x31,0x21,0x11
 
-# GFX11: v_fmamk_f16 v5, v255, 0x1121, v3        ; encoding: [0xff,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00]
-0xff,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00
+# GFX11: v_fmamk_f16 v5, v127, 0x1121, v3        ; encoding: [0x7f,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00]
+0x7f,0x07,0x0a,0x6e,0x21,0x11,0x00,0x00
 
 # GFX11: v_pk_fmac_f16 v255, v1, v2              ; encoding: [0x01,0x05,0xfe,0x79]
 0x01,0x05,0xfe,0x79