Skip to content

[AMDGPU] Make gfx11 vop1 disassembler tests use strict-whitespace #84078

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
Mar 6, 2024
Merged

[AMDGPU] Make gfx11 vop1 disassembler tests use strict-whitespace #84078

merged 1 commit into from
Mar 6, 2024

Conversation

Sisyph
Copy link
Contributor

@Sisyph Sisyph commented Mar 5, 2024

NFC.
The whitespace needs to be consistently formatted in some manner. Might as well use -strict-whitespace as the standard.
Adds -strict-whitespace to RUN lines and adjust CHECK line space padding accordingly.

Also test REAL16 and FAKE16 CHECK lines with wave64.

@Sisyph Sisyph requested review from jayfoad, kosarev and rampitec March 5, 2024 22:19
@llvmbot llvmbot added backend:AMDGPU mc Machine (object) code labels Mar 5, 2024
@llvmbot
Copy link
Member

llvmbot commented Mar 5, 2024 •
edited
Loading

@llvm/pr-subscribers-mc

@llvm/pr-subscribers-backend-amdgpu

Author: Joe Nash (Sisyph)

Changes

NFC.
The whitespace needs to be consistently formatted in some manner. Might as well use -strict-whitespace as the standard.
Adds -strict-whitespace to RUN lines and adjust CHECK line space padding accordingly.

Also test REAL16 and FAKE16 CHECK lines with wave64.

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

2 Files Affected:

  • (modified) llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop1.txt (+214-214)
  • (modified) llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop3_from_vop1.txt (+200-198)
diff --git a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop1.txt b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop1.txt
index c8f7bf8dc01df6..b176a57d70f867 100644
--- a/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop1.txt
+++ b/llvm/test/MC/Disassembler/AMDGPU/gfx11_dasm_vop1.txt
@@ -1,7 +1,7 @@
-# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+real-true16 -disassemble -show-encoding < %s | FileCheck -check-prefixes=GFX11,GFX11-REAL16 %s
-# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=-real-true16 -disassemble -show-encoding < %s | FileCheck -check-prefixes=GFX11,GFX11-FAKE16 %s
-# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+real-true16,-WavefrontSize32,+WavefrontSize64 -disassemble -show-encoding < %s | FileCheck -check-prefix=GFX11 %s
-# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=-real-true16,-WavefrontSize32,+WavefrontSize64 -disassemble -show-encoding < %s | FileCheck -check-prefix=GFX11 %s
+# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+real-true16 -disassemble -show-encoding < %s | FileCheck -strict-whitespace -check-prefixes=GFX11,GFX11-REAL16 %s
+# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=-real-true16 -disassemble -show-encoding < %s | FileCheck -strict-whitespace -check-prefixes=GFX11,GFX11-FAKE16 %s
+# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=+real-true16,-WavefrontSize32,+WavefrontSize64 -disassemble -show-encoding < %s | FileCheck -strict-whitespace -check-prefixes=GFX11,GFX11-REAL16 %s
+# RUN: llvm-mc -triple=amdgcn -mcpu=gfx1100 -mattr=-real-true16,-WavefrontSize32,+WavefrontSize64 -disassemble -show-encoding < %s | FileCheck -strict-whitespace -check-prefixes=GFX11,GFX11-FAKE16 %s
 
 # GFX11: v_bfrev_b32_e32 v5, v1                  ; encoding: [0x01,0x71,0x0a,0x7e]
 0x01,0x71,0x0a,0x7e
@@ -48,72 +48,72 @@
 # GFX11: v_bfrev_b32_e32 v255, 0xaf123456        ; encoding: [0xff,0x70,0xfe,0x7f,0x56,0x34,0x12,0xaf]
 0xff,0x70,0xfe,0x7f,0x56,0x34,0x12,0xaf
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, v1            ; encoding: [0x01,0xb9,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, v1.l        ; encoding: [0x01,0xb9,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, v1                   ; encoding: [0x01,0xb9,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, v1.l               ; encoding: [0x01,0xb9,0x0a,0x7e]
 0x01,0xb9,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, v127          ; encoding: [0x7f,0xb9,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, v127.l      ; encoding: [0x7f,0xb9,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, v127                 ; encoding: [0x7f,0xb9,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, v127.l             ; encoding: [0x7f,0xb9,0x0a,0x7e]
 0x7f,0xb9,0x0a,0x7e
 
 # GFX11-FAKE16: v_ceil_f16_e32 v5, v129/*Invalid register, operand has 'VS_32_Lo128' register class*/ ; encoding: [0x81,0xb9,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, v1.h        ; encoding: [0x81,0xb9,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, v1.h               ; encoding: [0x81,0xb9,0x0a,0x7e]
 0x81,0xb9,0x0a,0x7e
 
 # GFX11-FAKE16: v_ceil_f16_e32 v5, v255/*Invalid register, operand has 'VS_32_Lo128' register class*/ ; encoding: [0xff,0xb9,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, v127.h      ; encoding: [0xff,0xb9,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, v127.h             ; encoding: [0xff,0xb9,0x0a,0x7e]
 0xff,0xb9,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, s1            ; encoding: [0x01,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, s1          ; encoding: [0x01,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, s1                   ; encoding: [0x01,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, s1                 ; encoding: [0x01,0xb8,0x0a,0x7e]
 0x01,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, s105          ; encoding: [0x69,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, s105        ; encoding: [0x69,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, s105                 ; encoding: [0x69,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, s105               ; encoding: [0x69,0xb8,0x0a,0x7e]
 0x69,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, vcc_lo        ; encoding: [0x6a,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, vcc_lo      ; encoding: [0x6a,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, vcc_lo               ; encoding: [0x6a,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, vcc_lo             ; encoding: [0x6a,0xb8,0x0a,0x7e]
 0x6a,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, vcc_hi        ; encoding: [0x6b,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, vcc_hi      ; encoding: [0x6b,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, vcc_hi               ; encoding: [0x6b,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, vcc_hi             ; encoding: [0x6b,0xb8,0x0a,0x7e]
 0x6b,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, ttmp15        ; encoding: [0x7b,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, ttmp15      ; encoding: [0x7b,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, ttmp15               ; encoding: [0x7b,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, ttmp15             ; encoding: [0x7b,0xb8,0x0a,0x7e]
 0x7b,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, m0            ; encoding: [0x7d,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, m0          ; encoding: [0x7d,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, m0                   ; encoding: [0x7d,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, m0                 ; encoding: [0x7d,0xb8,0x0a,0x7e]
 0x7d,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, exec_lo       ; encoding: [0x7e,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, exec_lo     ; encoding: [0x7e,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, exec_lo              ; encoding: [0x7e,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, exec_lo            ; encoding: [0x7e,0xb8,0x0a,0x7e]
 0x7e,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, exec_hi       ; encoding: [0x7f,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, exec_hi     ; encoding: [0x7f,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, exec_hi              ; encoding: [0x7f,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, exec_hi            ; encoding: [0x7f,0xb8,0x0a,0x7e]
 0x7f,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, null          ; encoding: [0x7c,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, null        ; encoding: [0x7c,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, null                 ; encoding: [0x7c,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, null               ; encoding: [0x7c,0xb8,0x0a,0x7e]
 0x7c,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v5, -1            ; encoding: [0xc1,0xb8,0x0a,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v5.l, -1          ; encoding: [0xc1,0xb8,0x0a,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v5, -1                   ; encoding: [0xc1,0xb8,0x0a,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v5.l, -1                 ; encoding: [0xc1,0xb8,0x0a,0x7e]
 0xc1,0xb8,0x0a,0x7e
 
-# GFX11-FAKE16: v_ceil_f16_e32 v127, 0.5         ; encoding: [0xf0,0xb8,0xfe,0x7e]
-# GFX11-REAL16: v_ceil_f16_e32 v127.l, 0.5       ; encoding: [0xf0,0xb8,0xfe,0x7e]
+# GFX11-FAKE16: v_ceil_f16_e32 v127, 0.5                ; encoding: [0xf0,0xb8,0xfe,0x7e]
+# GFX11-REAL16: v_ceil_f16_e32 v127.l, 0.5              ; encoding: [0xf0,0xb8,0xfe,0x7e]
 0xf0,0xb8,0xfe,0x7e
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding 0xfd,0xb8,0x0a,0x7f
-# GFX11-REAL16: v_ceil_f16_e32 v5.h, src_scc     ; encoding: [0xfd,0xb8,0x0a,0x7f]
+# GFX11-REAL16: v_ceil_f16_e32 v5.h, src_scc            ; encoding: [0xfd,0xb8,0x0a,0x7f]
 0xfd,0xb8,0x0a,0x7f
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding 0xff,0xb8,0xfe,0x7f,0x0b,0xfe,0x00,0x00
-# GFX11-REAL16: v_ceil_f16_e32 v127.h, 0xfe0b    ; encoding: [0xff,0xb8,0xfe,0x7f,0x0b,0xfe,0x00,0x00]
+# GFX11-REAL16: v_ceil_f16_e32 v127.h, 0xfe0b           ; encoding: [0xff,0xb8,0xfe,0x7f,0x0b,0xfe,0x00,0x00]
 0xff,0xb8,0xfe,0x7f,0x0b,0xfe,0x00,0x00
 
 # GFX11: v_ceil_f32_e32 v5, v1                   ; encoding: [0x01,0x45,0x0a,0x7e]
@@ -1610,72 +1610,72 @@
 # GFX11: v_cvt_u32_u16_e32 v255, 0xfe0b          ; encoding: [0xff,0xd6,0xfe,0x7f,0x0b,0xfe,0x00,0x00]
 0xff,0xd6,0xfe,0x7f,0x0b,0xfe,0x00,0x00
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, v1             ; encoding: [0x01,0xb1,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, v1.l         ; encoding: [0x01,0xb1,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, v1                    ; encoding: [0x01,0xb1,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, v1.l                ; encoding: [0x01,0xb1,0x0a,0x7e]
 0x01,0xb1,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, v127           ; encoding: [0x7f,0xb1,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, v127.l       ; encoding: [0x7f,0xb1,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, v127                  ; encoding: [0x7f,0xb1,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, v127.l              ; encoding: [0x7f,0xb1,0x0a,0x7e]
 0x7f,0xb1,0x0a,0x7e
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_exp_f16_e32 v5.l, v1.h         ; encoding: [0x81,0xb1,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, v1.h                ; encoding: [0x81,0xb1,0x0a,0x7e]
 0x81,0xb1,0x0a,0x7e
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_exp_f16_e32 v5.l, v127.h       ; encoding: [0xff,0xb1,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, v127.h              ; encoding: [0xff,0xb1,0x0a,0x7e]
 0xff,0xb1,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, s1             ; encoding: [0x01,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, s1           ; encoding: [0x01,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, s1                    ; encoding: [0x01,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, s1                  ; encoding: [0x01,0xb0,0x0a,0x7e]
 0x01,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, s105           ; encoding: [0x69,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, s105         ; encoding: [0x69,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, s105                  ; encoding: [0x69,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, s105                ; encoding: [0x69,0xb0,0x0a,0x7e]
 0x69,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, vcc_lo         ; encoding: [0x6a,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, vcc_lo       ; encoding: [0x6a,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, vcc_lo                ; encoding: [0x6a,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, vcc_lo              ; encoding: [0x6a,0xb0,0x0a,0x7e]
 0x6a,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, vcc_hi         ; encoding: [0x6b,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, vcc_hi       ; encoding: [0x6b,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, vcc_hi                ; encoding: [0x6b,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, vcc_hi              ; encoding: [0x6b,0xb0,0x0a,0x7e]
 0x6b,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, ttmp15         ; encoding: [0x7b,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, ttmp15       ; encoding: [0x7b,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, ttmp15                ; encoding: [0x7b,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, ttmp15              ; encoding: [0x7b,0xb0,0x0a,0x7e]
 0x7b,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, m0             ; encoding: [0x7d,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, m0           ; encoding: [0x7d,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, m0                    ; encoding: [0x7d,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, m0                  ; encoding: [0x7d,0xb0,0x0a,0x7e]
 0x7d,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, exec_lo        ; encoding: [0x7e,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, exec_lo      ; encoding: [0x7e,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, exec_lo               ; encoding: [0x7e,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, exec_lo             ; encoding: [0x7e,0xb0,0x0a,0x7e]
 0x7e,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, exec_hi        ; encoding: [0x7f,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, exec_hi      ; encoding: [0x7f,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, exec_hi               ; encoding: [0x7f,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, exec_hi             ; encoding: [0x7f,0xb0,0x0a,0x7e]
 0x7f,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, null           ; encoding: [0x7c,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, null         ; encoding: [0x7c,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, null                  ; encoding: [0x7c,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, null                ; encoding: [0x7c,0xb0,0x0a,0x7e]
 0x7c,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v5, -1             ; encoding: [0xc1,0xb0,0x0a,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v5.l, -1           ; encoding: [0xc1,0xb0,0x0a,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v5, -1                    ; encoding: [0xc1,0xb0,0x0a,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v5.l, -1                  ; encoding: [0xc1,0xb0,0x0a,0x7e]
 0xc1,0xb0,0x0a,0x7e
 
-# GFX11-FAKE16: v_exp_f16_e32 v127, 0.5          ; encoding: [0xf0,0xb0,0xfe,0x7e]
-# GFX11-REAL16: v_exp_f16_e32 v127.l, 0.5        ; encoding: [0xf0,0xb0,0xfe,0x7e]
+# GFX11-FAKE16: v_exp_f16_e32 v127, 0.5                 ; encoding: [0xf0,0xb0,0xfe,0x7e]
+# GFX11-REAL16: v_exp_f16_e32 v127.l, 0.5               ; encoding: [0xf0,0xb0,0xfe,0x7e]
 0xf0,0xb0,0xfe,0x7e
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_exp_f16_e32 v5.h, src_scc      ; encoding: [0xfd,0xb0,0x0a,0x7f]
+# GFX11-REAL16: v_exp_f16_e32 v5.h, src_scc             ; encoding: [0xfd,0xb0,0x0a,0x7f]
 0xfd,0xb0,0x0a,0x7f
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_exp_f16_e32 v127.h, 0xfe0b     ; encoding: [0xff,0xb0,0xfe,0x7f,0x0b,0xfe,0x00,0x00]
+# GFX11-REAL16: v_exp_f16_e32 v127.h, 0xfe0b            ; encoding: [0xff,0xb0,0xfe,0x7f,0x0b,0xfe,0x00,0x00]
 0xff,0xb0,0xfe,0x7f,0x0b,0xfe,0x00,0x00
 
 # GFX11: v_exp_f32_e32 v5, v1                    ; encoding: [0x01,0x4b,0x0a,0x7e]
@@ -1723,72 +1723,72 @@
 # GFX11: v_exp_f32_e32 v255, 0xaf123456          ; encoding: [0xff,0x4a,0xfe,0x7f,0x56,0x34,0x12,0xaf]
 0xff,0x4a,0xfe,0x7f,0x56,0x34,0x12,0xaf
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, v1           ; encoding: [0x01,0xb7,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, v1.l       ; encoding: [0x01,0xb7,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, v1                  ; encoding: [0x01,0xb7,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, v1.l              ; encoding: [0x01,0xb7,0x0a,0x7e]
 0x01,0xb7,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, v127         ; encoding: [0x7f,0xb7,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, v127.l     ; encoding: [0x7f,0xb7,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, v127                ; encoding: [0x7f,0xb7,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, v127.l            ; encoding: [0x7f,0xb7,0x0a,0x7e]
 0x7f,0xb7,0x0a,0x7e
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_floor_f16_e32 v5.l, v1.h       ; encoding: [0x81,0xb7,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, v1.h              ; encoding: [0x81,0xb7,0x0a,0x7e]
 0x81,0xb7,0x0a,0x7e
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_floor_f16_e32 v5.l, v127.h     ; encoding: [0xff,0xb7,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, v127.h            ; encoding: [0xff,0xb7,0x0a,0x7e]
 0xff,0xb7,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, s1           ; encoding: [0x01,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, s1         ; encoding: [0x01,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, s1                  ; encoding: [0x01,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, s1                ; encoding: [0x01,0xb6,0x0a,0x7e]
 0x01,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, s105         ; encoding: [0x69,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, s105       ; encoding: [0x69,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, s105                ; encoding: [0x69,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, s105              ; encoding: [0x69,0xb6,0x0a,0x7e]
 0x69,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, vcc_lo       ; encoding: [0x6a,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, vcc_lo     ; encoding: [0x6a,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, vcc_lo              ; encoding: [0x6a,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, vcc_lo            ; encoding: [0x6a,0xb6,0x0a,0x7e]
 0x6a,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, vcc_hi       ; encoding: [0x6b,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, vcc_hi     ; encoding: [0x6b,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, vcc_hi              ; encoding: [0x6b,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, vcc_hi            ; encoding: [0x6b,0xb6,0x0a,0x7e]
 0x6b,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, ttmp15       ; encoding: [0x7b,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, ttmp15     ; encoding: [0x7b,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, ttmp15              ; encoding: [0x7b,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, ttmp15            ; encoding: [0x7b,0xb6,0x0a,0x7e]
 0x7b,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, m0           ; encoding: [0x7d,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, m0         ; encoding: [0x7d,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, m0                  ; encoding: [0x7d,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, m0                ; encoding: [0x7d,0xb6,0x0a,0x7e]
 0x7d,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, exec_lo      ; encoding: [0x7e,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, exec_lo    ; encoding: [0x7e,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, exec_lo             ; encoding: [0x7e,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, exec_lo           ; encoding: [0x7e,0xb6,0x0a,0x7e]
 0x7e,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, exec_hi      ; encoding: [0x7f,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, exec_hi    ; encoding: [0x7f,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, exec_hi             ; encoding: [0x7f,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, exec_hi           ; encoding: [0x7f,0xb6,0x0a,0x7e]
 0x7f,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, null         ; encoding: [0x7c,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, null       ; encoding: [0x7c,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, null                ; encoding: [0x7c,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, null              ; encoding: [0x7c,0xb6,0x0a,0x7e]
 0x7c,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v5, -1           ; encoding: [0xc1,0xb6,0x0a,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v5.l, -1         ; encoding: [0xc1,0xb6,0x0a,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v5, -1                  ; encoding: [0xc1,0xb6,0x0a,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v5.l, -1                ; encoding: [0xc1,0xb6,0x0a,0x7e]
 0xc1,0xb6,0x0a,0x7e
 
-# GFX11-FAKE16: v_floor_f16_e32 v127, 0.5        ; encoding: [0xf0,0xb6,0xfe,0x7e]
-# GFX11-REAL16: v_floor_f16_e32 v127.l, 0.5      ; encoding: [0xf0,0xb6,0xfe,0x7e]
+# GFX11-FAKE16: v_floor_f16_e32 v127, 0.5               ; encoding: [0xf0,0xb6,0xfe,0x7e]
+# GFX11-REAL16: v_floor_f16_e32 v127.l, 0.5             ; encoding: [0xf0,0xb6,0xfe,0x7e]
 0xf0,0xb6,0xfe,0x7e
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_floor_f16_e32 v5.h, src_scc    ; encoding: [0xfd,0xb6,0x0a,0x7f]
+# GFX11-REAL16: v_floor_f16_e32 v5.h, src_scc           ; encoding: [0xfd,0xb6,0x0a,0x7f]
 0xfd,0xb6,0x0a,0x7f
 
 # COM: GFX11-FAKE16: warning: invalid instruction encoding
-# GFX11-REAL16: v_floor_f16_e32 v127.h, 0xfe0b   ; encoding: [0xff,0xb6,0xfe,0x7f,0x0b,0xfe,0x00,0x00]
+# GFX11-REAL16: v_floor_f16_e32 v127.h, 0xfe0b          ; encoding: [0xff,0xb6,0xfe,0x7f,0x0b,0xfe,0x00,0x00]
 0xff,0xb6,0xfe,0x7f,0x0b,0xfe,0x00,0...
[truncated]

@kosarev kosarev requested a review from arsenm March 5, 2024 22:44
jayfoad
jayfoad approved these changes Mar 6, 2024
View reviewed changes
Copy link
Contributor

@jayfoad jayfoad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. Some disassembler tests use -strict-whitespace to check for genuine whitespace problems, so I think for consistency we might as well move towards always using -strict-whitespace.

@kosarev
Copy link
Collaborator

kosarev commented Mar 6, 2024

Thanks Joe. I guess this should also approve submitting such changes for other disasm tests without review.

@jayfoad
Copy link
Contributor

jayfoad commented Mar 6, 2024

I guess this should also approve submitting such changes for other disasm tests without review.

Yes I think that's fine.

@Sisyph
[AMDGPU] Make vop1 disassembler tests use strict-whitespace
c6b70f9 
NFC.
The whitespace needs to be consistently formatted in some manner. Might as well
use -strict-whitespace as the standard.
Adds -strict-whitespace to RUN lines and adjust CHECK line space padding
accordingly.

Also test REAL16 and FAKE16 CHECK lines with wave64.
@Sisyph Sisyph force-pushed the disas_vop1_strict branch from 553c324 to c6b70f9 Compare March 6, 2024 15:10
@Sisyph Sisyph merged commit f448b8e into llvm:main Mar 6, 2024
Sisyph added a commit that referenced this pull request Mar 6, 2024
@Sisyph
[AMDGPU] Make gfx11 vop2 disassembler tests use strict-whitespace
3b1512c 
NFC.
Adds -strict-whitespace to RUN lines and adjusts CHECK line space
padding accordingly.

See also  (#84078)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jayfoad jayfoad jayfoad approved these changes

@rampitec rampitec rampitec approved these changes

@kosarev kosarev Awaiting requested review from kosarev

@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.
5 participants
@Sisyph @llvmbot @kosarev @jayfoad @rampitec