Skip to content

[AMDGPU][True16][MC] redo update vop2 mc test with update script #119263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 9, 2024
Merged

[AMDGPU][True16][MC] redo update vop2 mc test with update script #119263

merged 1 commit into from
Dec 9, 2024

Conversation

broxigarchen
Copy link
Contributor

@broxigarchen broxigarchen commented Dec 9, 2024 •
edited
Loading

This is a NFC change

The previous patch #116860 has an issue and is reverted in #119253.

Redo the patch here

@broxigarchen broxigarchen changed the title redo update vop2 mc test with update script [AMDGPU][True16][MC] redo update vop2 mc test with update script Dec 9, 2024
@broxigarchen broxigarchen marked this pull request as ready for review December 9, 2024 20:24
@broxigarchen broxigarchen requested a review from Sisyph December 9, 2024 20:24
@llvmbot llvmbot added backend:AMDGPU mc Machine (object) code labels Dec 9, 2024
@llvmbot
Copy link
Member

llvmbot commented Dec 9, 2024

@llvm/pr-subscribers-mc

Author: Brox Chen (broxigarchen)

Changes

This is NFC change

The previous patch #116860 is reverted in #119253.

Redo the patch

Patch is 1.57 MiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/119263.diff

12 Files Affected:

  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop2.s (+937-936)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop2_dpp16.s (+783-782)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop2_dpp8.s (+167-166)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp16_from_vop2.s (+730-730)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp8_from_vop2.s (+206-206)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop3_from_vop2.s (+797-797)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop2.s (+945-944)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop2_dpp16.s (+745-744)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop2_dpp8.s (+162-161)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop3_from_vop2.s (+824-824)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop3_from_vop2_dpp16.s (+772-772)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop3_from_vop2_dpp8.s (+283-283)
diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
index 0f2852fc531ed4..a89fbbacc1f503 100644
--- a/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
+++ b/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
@@ -1,2572 +1,2573 @@
+// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --version 5
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,+real-true16 -show-encoding %s | FileCheck --check-prefixes=GFX11,W32 %s
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64,+real-true16 -show-encoding %s | FileCheck --check-prefixes=GFX11,W64 %s
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,+real-true16 -filetype=null %s 2>&1 | FileCheck --check-prefix=W32-ERR --implicit-check-not=error: %s
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64,+real-true16 -filetype=null %s 2>&1 | FileCheck --check-prefix=W64-ERR --implicit-check-not=error: %s
 
 v_add_co_ci_u32_e32 v5, vcc_lo, v1, v2, vcc_lo
-// W32: encoding: [0x01,0x05,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, v1, v2, vcc_lo ; encoding: [0x01,0x05,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, v255, v2, vcc_lo
-// W32: encoding: [0xff,0x05,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, v255, v2, vcc_lo ; encoding: [0xff,0x05,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, s1, v2, vcc_lo
-// W32: encoding: [0x01,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, s1, v2, vcc_lo ; encoding: [0x01,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, s105, v2, vcc_lo
-// W32: encoding: [0x69,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, s105, v2, vcc_lo ; encoding: [0x69,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, vcc_lo, v2, vcc_lo
-// W32: encoding: [0x6a,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, vcc_lo, v2, vcc_lo ; encoding: [0x6a,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, vcc_hi, v2, vcc_lo
-// W32: encoding: [0x6b,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, vcc_hi, v2, vcc_lo ; encoding: [0x6b,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, ttmp15, v2, vcc_lo
-// W32: encoding: [0x7b,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, ttmp15, v2, vcc_lo ; encoding: [0x7b,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, m0, v2, vcc_lo
-// W32: encoding: [0x7d,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, m0, v2, vcc_lo ; encoding: [0x7d,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, exec_lo, v2, vcc_lo
-// W32: encoding: [0x7e,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, exec_lo, v2, vcc_lo ; encoding: [0x7e,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, exec_hi, v2, vcc_lo
-// W32: encoding: [0x7f,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, exec_hi, v2, vcc_lo ; encoding: [0x7f,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, null, v2, vcc_lo
-// W32: encoding: [0x7c,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, null, v2, vcc_lo ; encoding: [0x7c,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, -1, v2, vcc_lo
-// W32: encoding: [0xc1,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, -1, v2, vcc_lo ; encoding: [0xc1,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, 0.5, v2, vcc_lo
-// W32: encoding: [0xf0,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, 0.5, v2, vcc_lo ; encoding: [0xf0,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, src_scc, v2, vcc_lo
-// W32: encoding: [0xfd,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, src_scc, v2, vcc_lo ; encoding: [0xfd,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v255, vcc_lo, 0xaf123456, v255, vcc_lo
-// W32: encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v255, vcc_lo, 0xaf123456, v255, vcc_lo ; encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, v1, v2, vcc
-// W64: encoding: [0x01,0x05,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, v1, v2, vcc ; encoding: [0x01,0x05,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, v255, v2, vcc
-// W64: encoding: [0xff,0x05,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, v255, v2, vcc ; encoding: [0xff,0x05,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, s1, v2, vcc
-// W64: encoding: [0x01,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, s1, v2, vcc ; encoding: [0x01,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, s105, v2, vcc
-// W64: encoding: [0x69,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, s105, v2, vcc ; encoding: [0x69,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, vcc_lo, v2, vcc
-// W64: encoding: [0x6a,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, vcc_lo, v2, vcc ; encoding: [0x6a,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, vcc_hi, v2, vcc
-// W64: encoding: [0x6b,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, vcc_hi, v2, vcc ; encoding: [0x6b,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, ttmp15, v2, vcc
-// W64: encoding: [0x7b,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, ttmp15, v2, vcc ; encoding: [0x7b,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, m0, v2, vcc
-// W64: encoding: [0x7d,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, m0, v2, vcc ; encoding: [0x7d,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, exec_lo, v2, vcc
-// W64: encoding: [0x7e,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, exec_lo, v2, vcc ; encoding: [0x7e,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, exec_hi, v2, vcc
-// W64: encoding: [0x7f,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, exec_hi, v2, vcc ; encoding: [0x7f,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, null, v2, vcc
-// W64: encoding: [0x7c,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, null, v2, vcc ; encoding: [0x7c,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, -1, v2, vcc
-// W64: encoding: [0xc1,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, -1, v2, vcc ; encoding: [0xc1,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, 0.5, v2, vcc
-// W64: encoding: [0xf0,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, 0.5, v2, vcc ; encoding: [0xf0,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, src_scc, v2, vcc
-// W64: encoding: [0xfd,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, src_scc, v2, vcc ; encoding: [0xfd,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v255, vcc, 0xaf123456, v255, vcc
-// W64: encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v255, vcc, 0xaf123456, v255, vcc ; encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_f16 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, v1, v2                ; encoding: [0x01,0x05,0x0a,0x64]
 
 v_add_f16 v5, v127, v2
-// GFX11: encoding: [0x7f,0x05,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, v127, v2              ; encoding: [0x7f,0x05,0x0a,0x64]
 
 v_add_f16 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, s1, v2                ; encoding: [0x01,0x04,0x0a,0x64]
 
 v_add_f16 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, s105, v2              ; encoding: [0x69,0x04,0x0a,0x64]
 
 v_add_f16 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, vcc_lo, v2            ; encoding: [0x6a,0x04,0x0a,0x64]
 
 v_add_f16 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, vcc_hi, v2            ; encoding: [0x6b,0x04,0x0a,0x64]
 
 v_add_f16 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, ttmp15, v2            ; encoding: [0x7b,0x04,0x0a,0x64]
 
 v_add_f16 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, m0, v2                ; encoding: [0x7d,0x04,0x0a,0x64]
 
 v_add_f16 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, exec_lo, v2           ; encoding: [0x7e,0x04,0x0a,0x64]
 
 v_add_f16 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, exec_hi, v2           ; encoding: [0x7f,0x04,0x0a,0x64]
 
 v_add_f16 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, null, v2              ; encoding: [0x7c,0x04,0x0a,0x64]
 
 v_add_f16 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, -1, v2                ; encoding: [0xc1,0x04,0x0a,0x64]
 
 v_add_f16 v5, 0.5, v2
-// GFX11: encoding: [0xf0,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, 0.5, v2               ; encoding: [0xf0,0x04,0x0a,0x64]
 
 v_add_f16 v5, src_scc, v2
-// GFX11: encoding: [0xfd,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, src_scc, v2           ; encoding: [0xfd,0x04,0x0a,0x64]
 
 v_add_f16 v127, 0xfe0b, v127
-// GFX11: encoding: [0xff,0xfe,0xfe,0x64,0x0b,0xfe,0x00,0x00]
+// GFX11: v_add_f16_e32 v127, 0xfe0b, v127        ; encoding: [0xff,0xfe,0xfe,0x64,0x0b,0xfe,0x00,0x00]
 
 v_add_f32 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, v1, v2                ; encoding: [0x01,0x05,0x0a,0x06]
 
 v_add_f32 v5, v255, v2
-// GFX11: encoding: [0xff,0x05,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, v255, v2              ; encoding: [0xff,0x05,0x0a,0x06]
 
 v_add_f32 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, s1, v2                ; encoding: [0x01,0x04,0x0a,0x06]
 
 v_add_f32 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, s105, v2              ; encoding: [0x69,0x04,0x0a,0x06]
 
 v_add_f32 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, vcc_lo, v2            ; encoding: [0x6a,0x04,0x0a,0x06]
 
 v_add_f32 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, vcc_hi, v2            ; encoding: [0x6b,0x04,0x0a,0x06]
 
 v_add_f32 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, ttmp15, v2            ; encoding: [0x7b,0x04,0x0a,0x06]
 
 v_add_f32 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, m0, v2                ; encoding: [0x7d,0x04,0x0a,0x06]
 
 v_add_f32 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, exec_lo, v2           ; encoding: [0x7e,0x04,0x0a,0x06]
 
 v_add_f32 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, exec_hi, v2           ; encoding: [0x7f,0x04,0x0a,0x06]
 
 v_add_f32 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, null, v2              ; encoding: [0x7c,0x04,0x0a,0x06]
 
 v_add_f32 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, -1, v2                ; encoding: [0xc1,0x04,0x0a,0x06]
 
 v_add_f32 v5, 0.5, v2
-// GFX11: encoding: [0xf0,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, 0.5, v2               ; encoding: [0xf0,0x04,0x0a,0x06]
 
 v_add_f32 v5, src_scc, v2
-// GFX11: encoding: [0xfd,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, src_scc, v2           ; encoding: [0xfd,0x04,0x0a,0x06]
 
 v_add_f32 v255, 0xaf123456, v255
-// GFX11: encoding: [0xff,0xfe,0xff,0x07,0x56,0x34,0x12,0xaf]
+// GFX11: v_add_f32_e32 v255, 0xaf123456, v255    ; encoding: [0xff,0xfe,0xff,0x07,0x56,0x34,0x12,0xaf]
 
 v_add_nc_u32 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, v1, v2             ; encoding: [0x01,0x05,0x0a,0x4a]
 
 v_add_nc_u32 v5, v255, v2
-// GFX11: encoding: [0xff,0x05,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, v255, v2           ; encoding: [0xff,0x05,0x0a,0x4a]
 
 v_add_nc_u32 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, s1, v2             ; encoding: [0x01,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, s105, v2           ; encoding: [0x69,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, vcc_lo, v2         ; encoding: [0x6a,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, vcc_hi, v2         ; encoding: [0x6b,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, ttmp15, v2         ; encoding: [0x7b,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, m0, v2             ; encoding: [0x7d,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, exec_lo, v2        ; encoding: [0x7e,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, exec_hi, v2        ; encoding: [0x7f,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, null, v2           ; encoding: [0x7c,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, -1, v2             ; encoding: [0xc1,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, 0.5, v2
-// GFX11: encoding: [0xf0,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, 0.5, v2            ; encoding: [0xf0,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, src_scc, v2
-// GFX11: encoding: [0xfd,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, src_scc, v2        ; encoding: [0xfd,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v255, 0xaf123456, v255
-// GFX11: encoding: [0xff,0xfe,0xff,0x4b,0x56,0x34,0x12,0xaf]
+// GFX11: v_add_nc_u32_e32 v255, 0xaf123456, v255 ; encoding: [0xff,0xfe,0xff,0x4b,0x56,0x34,0x12,0xaf]
 
 v_and_b32 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, v1, v2                ; encoding: [0x01,0x05,0x0a,0x36]
 
 v_and_b32 v5, v255, v2
-// GFX11: encoding: [0xff,0x05,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, v255, v2              ; encoding: [0xff,0x05,0x0a,0x36]
 
 v_and_b32 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, s1, v2                ; encoding: [0x01,0x04,0x0a,0x36]
 
 v_and_b32 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, s105, v2              ; encoding: [0x69,0x04,0x0a,0x36]
 
 v_and_b32 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, vcc_lo, v2            ; encoding: [0x6a,0x04,0x0a,0x36]
 
 v_and_b32 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, vcc_hi, v2            ; encoding: [0x6b,0x04,0x0a,0x36]
 
 v_and_b32 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, ttmp15, v2            ; encoding: [0x7b,0x04,0x0a,0x36]
 
 v_and_b32 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, m0, v2                ; encoding: [0x7d,0x04,0x0a,0x36]
 
 v_and_b32 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, exec_lo, v2           ; encoding: [0x7e,0x04,0x0a,0x36]
 
 v_and_b32 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, exec_hi, v2           ; encoding: [0x7f,0x04,0x0a,0x36]
 
 v_and_b32 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, null, v2              ; encoding: [0x7c,0x04,0x0a,0x36]
 
 v_and_b32 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, -1, v2                ; encoding: [0xc1,0x04,0x0a,0x36]
 
 v_and_b32 v5, 0.5, v2
-// GFX1...
[truncated]

@llvmbot
Copy link
Member

llvmbot commented Dec 9, 2024

@llvm/pr-subscribers-backend-amdgpu

Author: Brox Chen (broxigarchen)

Changes

This is NFC change

The previous patch #116860 is reverted in #119253.

Redo the patch

Patch is 1.57 MiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/119263.diff

12 Files Affected:

  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop2.s (+937-936)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop2_dpp16.s (+783-782)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop2_dpp8.s (+167-166)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp16_from_vop2.s (+730-730)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop3_dpp8_from_vop2.s (+206-206)
  • (modified) llvm/test/MC/AMDGPU/gfx11_asm_vop3_from_vop2.s (+797-797)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop2.s (+945-944)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop2_dpp16.s (+745-744)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop2_dpp8.s (+162-161)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop3_from_vop2.s (+824-824)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop3_from_vop2_dpp16.s (+772-772)
  • (modified) llvm/test/MC/AMDGPU/gfx12_asm_vop3_from_vop2_dpp8.s (+283-283)
diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
index 0f2852fc531ed4..a89fbbacc1f503 100644
--- a/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
+++ b/llvm/test/MC/AMDGPU/gfx11_asm_vop2.s
@@ -1,2572 +1,2573 @@
+// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --version 5
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,+real-true16 -show-encoding %s | FileCheck --check-prefixes=GFX11,W32 %s
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64,+real-true16 -show-encoding %s | FileCheck --check-prefixes=GFX11,W64 %s
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,+real-true16 -filetype=null %s 2>&1 | FileCheck --check-prefix=W32-ERR --implicit-check-not=error: %s
 // RUN: not llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64,+real-true16 -filetype=null %s 2>&1 | FileCheck --check-prefix=W64-ERR --implicit-check-not=error: %s
 
 v_add_co_ci_u32_e32 v5, vcc_lo, v1, v2, vcc_lo
-// W32: encoding: [0x01,0x05,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, v1, v2, vcc_lo ; encoding: [0x01,0x05,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, v255, v2, vcc_lo
-// W32: encoding: [0xff,0x05,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, v255, v2, vcc_lo ; encoding: [0xff,0x05,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, s1, v2, vcc_lo
-// W32: encoding: [0x01,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, s1, v2, vcc_lo ; encoding: [0x01,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, s105, v2, vcc_lo
-// W32: encoding: [0x69,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, s105, v2, vcc_lo ; encoding: [0x69,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, vcc_lo, v2, vcc_lo
-// W32: encoding: [0x6a,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, vcc_lo, v2, vcc_lo ; encoding: [0x6a,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, vcc_hi, v2, vcc_lo
-// W32: encoding: [0x6b,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, vcc_hi, v2, vcc_lo ; encoding: [0x6b,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, ttmp15, v2, vcc_lo
-// W32: encoding: [0x7b,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, ttmp15, v2, vcc_lo ; encoding: [0x7b,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, m0, v2, vcc_lo
-// W32: encoding: [0x7d,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, m0, v2, vcc_lo ; encoding: [0x7d,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, exec_lo, v2, vcc_lo
-// W32: encoding: [0x7e,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, exec_lo, v2, vcc_lo ; encoding: [0x7e,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, exec_hi, v2, vcc_lo
-// W32: encoding: [0x7f,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, exec_hi, v2, vcc_lo ; encoding: [0x7f,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, null, v2, vcc_lo
-// W32: encoding: [0x7c,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, null, v2, vcc_lo ; encoding: [0x7c,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, -1, v2, vcc_lo
-// W32: encoding: [0xc1,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, -1, v2, vcc_lo ; encoding: [0xc1,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, 0.5, v2, vcc_lo
-// W32: encoding: [0xf0,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, 0.5, v2, vcc_lo ; encoding: [0xf0,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc_lo, src_scc, v2, vcc_lo
-// W32: encoding: [0xfd,0x04,0x0a,0x40]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v5, vcc_lo, src_scc, v2, vcc_lo ; encoding: [0xfd,0x04,0x0a,0x40]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v255, vcc_lo, 0xaf123456, v255, vcc_lo
-// W32: encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
-// W64-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W32: v_add_co_ci_u32_e32 v255, vcc_lo, 0xaf123456, v255, vcc_lo ; encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
+// W64-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, v1, v2, vcc
-// W64: encoding: [0x01,0x05,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, v1, v2, vcc ; encoding: [0x01,0x05,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, v255, v2, vcc
-// W64: encoding: [0xff,0x05,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, v255, v2, vcc ; encoding: [0xff,0x05,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, s1, v2, vcc
-// W64: encoding: [0x01,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, s1, v2, vcc ; encoding: [0x01,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, s105, v2, vcc
-// W64: encoding: [0x69,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, s105, v2, vcc ; encoding: [0x69,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, vcc_lo, v2, vcc
-// W64: encoding: [0x6a,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, vcc_lo, v2, vcc ; encoding: [0x6a,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, vcc_hi, v2, vcc
-// W64: encoding: [0x6b,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, vcc_hi, v2, vcc ; encoding: [0x6b,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, ttmp15, v2, vcc
-// W64: encoding: [0x7b,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, ttmp15, v2, vcc ; encoding: [0x7b,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, m0, v2, vcc
-// W64: encoding: [0x7d,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, m0, v2, vcc ; encoding: [0x7d,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, exec_lo, v2, vcc
-// W64: encoding: [0x7e,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, exec_lo, v2, vcc ; encoding: [0x7e,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, exec_hi, v2, vcc
-// W64: encoding: [0x7f,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, exec_hi, v2, vcc ; encoding: [0x7f,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, null, v2, vcc
-// W64: encoding: [0x7c,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, null, v2, vcc ; encoding: [0x7c,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, -1, v2, vcc
-// W64: encoding: [0xc1,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, -1, v2, vcc ; encoding: [0xc1,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, 0.5, v2, vcc
-// W64: encoding: [0xf0,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, 0.5, v2, vcc ; encoding: [0xf0,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v5, vcc, src_scc, v2, vcc
-// W64: encoding: [0xfd,0x04,0x0a,0x40]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v5, vcc, src_scc, v2, vcc ; encoding: [0xfd,0x04,0x0a,0x40]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_co_ci_u32 v255, vcc, 0xaf123456, v255, vcc
-// W64: encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
-// W32-ERR: :[[@LINE-2]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// W64: v_add_co_ci_u32_e32 v255, vcc, 0xaf123456, v255, vcc ; encoding: [0xff,0xfe,0xff,0x41,0x56,0x34,0x12,0xaf]
+// W32-ERR: :[[@LINE-2]]:1: error: operands are not valid for this GPU or mode
 
 v_add_f16 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, v1, v2                ; encoding: [0x01,0x05,0x0a,0x64]
 
 v_add_f16 v5, v127, v2
-// GFX11: encoding: [0x7f,0x05,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, v127, v2              ; encoding: [0x7f,0x05,0x0a,0x64]
 
 v_add_f16 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, s1, v2                ; encoding: [0x01,0x04,0x0a,0x64]
 
 v_add_f16 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, s105, v2              ; encoding: [0x69,0x04,0x0a,0x64]
 
 v_add_f16 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, vcc_lo, v2            ; encoding: [0x6a,0x04,0x0a,0x64]
 
 v_add_f16 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, vcc_hi, v2            ; encoding: [0x6b,0x04,0x0a,0x64]
 
 v_add_f16 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, ttmp15, v2            ; encoding: [0x7b,0x04,0x0a,0x64]
 
 v_add_f16 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, m0, v2                ; encoding: [0x7d,0x04,0x0a,0x64]
 
 v_add_f16 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, exec_lo, v2           ; encoding: [0x7e,0x04,0x0a,0x64]
 
 v_add_f16 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, exec_hi, v2           ; encoding: [0x7f,0x04,0x0a,0x64]
 
 v_add_f16 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, null, v2              ; encoding: [0x7c,0x04,0x0a,0x64]
 
 v_add_f16 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, -1, v2                ; encoding: [0xc1,0x04,0x0a,0x64]
 
 v_add_f16 v5, 0.5, v2
-// GFX11: encoding: [0xf0,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, 0.5, v2               ; encoding: [0xf0,0x04,0x0a,0x64]
 
 v_add_f16 v5, src_scc, v2
-// GFX11: encoding: [0xfd,0x04,0x0a,0x64]
+// GFX11: v_add_f16_e32 v5, src_scc, v2           ; encoding: [0xfd,0x04,0x0a,0x64]
 
 v_add_f16 v127, 0xfe0b, v127
-// GFX11: encoding: [0xff,0xfe,0xfe,0x64,0x0b,0xfe,0x00,0x00]
+// GFX11: v_add_f16_e32 v127, 0xfe0b, v127        ; encoding: [0xff,0xfe,0xfe,0x64,0x0b,0xfe,0x00,0x00]
 
 v_add_f32 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, v1, v2                ; encoding: [0x01,0x05,0x0a,0x06]
 
 v_add_f32 v5, v255, v2
-// GFX11: encoding: [0xff,0x05,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, v255, v2              ; encoding: [0xff,0x05,0x0a,0x06]
 
 v_add_f32 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, s1, v2                ; encoding: [0x01,0x04,0x0a,0x06]
 
 v_add_f32 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, s105, v2              ; encoding: [0x69,0x04,0x0a,0x06]
 
 v_add_f32 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, vcc_lo, v2            ; encoding: [0x6a,0x04,0x0a,0x06]
 
 v_add_f32 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, vcc_hi, v2            ; encoding: [0x6b,0x04,0x0a,0x06]
 
 v_add_f32 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, ttmp15, v2            ; encoding: [0x7b,0x04,0x0a,0x06]
 
 v_add_f32 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, m0, v2                ; encoding: [0x7d,0x04,0x0a,0x06]
 
 v_add_f32 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, exec_lo, v2           ; encoding: [0x7e,0x04,0x0a,0x06]
 
 v_add_f32 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, exec_hi, v2           ; encoding: [0x7f,0x04,0x0a,0x06]
 
 v_add_f32 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, null, v2              ; encoding: [0x7c,0x04,0x0a,0x06]
 
 v_add_f32 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, -1, v2                ; encoding: [0xc1,0x04,0x0a,0x06]
 
 v_add_f32 v5, 0.5, v2
-// GFX11: encoding: [0xf0,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, 0.5, v2               ; encoding: [0xf0,0x04,0x0a,0x06]
 
 v_add_f32 v5, src_scc, v2
-// GFX11: encoding: [0xfd,0x04,0x0a,0x06]
+// GFX11: v_add_f32_e32 v5, src_scc, v2           ; encoding: [0xfd,0x04,0x0a,0x06]
 
 v_add_f32 v255, 0xaf123456, v255
-// GFX11: encoding: [0xff,0xfe,0xff,0x07,0x56,0x34,0x12,0xaf]
+// GFX11: v_add_f32_e32 v255, 0xaf123456, v255    ; encoding: [0xff,0xfe,0xff,0x07,0x56,0x34,0x12,0xaf]
 
 v_add_nc_u32 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, v1, v2             ; encoding: [0x01,0x05,0x0a,0x4a]
 
 v_add_nc_u32 v5, v255, v2
-// GFX11: encoding: [0xff,0x05,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, v255, v2           ; encoding: [0xff,0x05,0x0a,0x4a]
 
 v_add_nc_u32 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, s1, v2             ; encoding: [0x01,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, s105, v2           ; encoding: [0x69,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, vcc_lo, v2         ; encoding: [0x6a,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, vcc_hi, v2         ; encoding: [0x6b,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, ttmp15, v2         ; encoding: [0x7b,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, m0, v2             ; encoding: [0x7d,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, exec_lo, v2        ; encoding: [0x7e,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, exec_hi, v2        ; encoding: [0x7f,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, null, v2           ; encoding: [0x7c,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, -1, v2             ; encoding: [0xc1,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, 0.5, v2
-// GFX11: encoding: [0xf0,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, 0.5, v2            ; encoding: [0xf0,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v5, src_scc, v2
-// GFX11: encoding: [0xfd,0x04,0x0a,0x4a]
+// GFX11: v_add_nc_u32_e32 v5, src_scc, v2        ; encoding: [0xfd,0x04,0x0a,0x4a]
 
 v_add_nc_u32 v255, 0xaf123456, v255
-// GFX11: encoding: [0xff,0xfe,0xff,0x4b,0x56,0x34,0x12,0xaf]
+// GFX11: v_add_nc_u32_e32 v255, 0xaf123456, v255 ; encoding: [0xff,0xfe,0xff,0x4b,0x56,0x34,0x12,0xaf]
 
 v_and_b32 v5, v1, v2
-// GFX11: encoding: [0x01,0x05,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, v1, v2                ; encoding: [0x01,0x05,0x0a,0x36]
 
 v_and_b32 v5, v255, v2
-// GFX11: encoding: [0xff,0x05,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, v255, v2              ; encoding: [0xff,0x05,0x0a,0x36]
 
 v_and_b32 v5, s1, v2
-// GFX11: encoding: [0x01,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, s1, v2                ; encoding: [0x01,0x04,0x0a,0x36]
 
 v_and_b32 v5, s105, v2
-// GFX11: encoding: [0x69,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, s105, v2              ; encoding: [0x69,0x04,0x0a,0x36]
 
 v_and_b32 v5, vcc_lo, v2
-// GFX11: encoding: [0x6a,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, vcc_lo, v2            ; encoding: [0x6a,0x04,0x0a,0x36]
 
 v_and_b32 v5, vcc_hi, v2
-// GFX11: encoding: [0x6b,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, vcc_hi, v2            ; encoding: [0x6b,0x04,0x0a,0x36]
 
 v_and_b32 v5, ttmp15, v2
-// GFX11: encoding: [0x7b,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, ttmp15, v2            ; encoding: [0x7b,0x04,0x0a,0x36]
 
 v_and_b32 v5, m0, v2
-// GFX11: encoding: [0x7d,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, m0, v2                ; encoding: [0x7d,0x04,0x0a,0x36]
 
 v_and_b32 v5, exec_lo, v2
-// GFX11: encoding: [0x7e,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, exec_lo, v2           ; encoding: [0x7e,0x04,0x0a,0x36]
 
 v_and_b32 v5, exec_hi, v2
-// GFX11: encoding: [0x7f,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, exec_hi, v2           ; encoding: [0x7f,0x04,0x0a,0x36]
 
 v_and_b32 v5, null, v2
-// GFX11: encoding: [0x7c,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, null, v2              ; encoding: [0x7c,0x04,0x0a,0x36]
 
 v_and_b32 v5, -1, v2
-// GFX11: encoding: [0xc1,0x04,0x0a,0x36]
+// GFX11: v_and_b32_e32 v5, -1, v2                ; encoding: [0xc1,0x04,0x0a,0x36]
 
 v_and_b32 v5, 0.5, v2
-// GFX1...
[truncated]

@broxigarchen broxigarchen requested a review from arsenm December 9, 2024 20:25
@broxigarchen broxigarchen merged commit 8471541 into llvm:main Dec 9, 2024
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sisyph Sisyph Sisyph approved these changes

@arsenm arsenm Awaiting requested review from arsenm

Assignees
No one assigned
Labels
backend:AMDGPU mc Machine (object) code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@broxigarchen @llvmbot @Sisyph