[llvm] AMDGPU: Manually convert some MC tests to subarch triples (PR #212728)
Matt Arsenault via llvm-commits
llvm-commits at lists.llvm.org
Wed Jul 29 02:58:13 PDT 2026
https://github.com/arsenm created https://github.com/llvm/llvm-project/pull/212728
Many are switches from using the dummy amdgcn triple to a concrete
subarch.
>From e17d91028f1861544ca1c803bd053b0b6ce4fa6d Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Thu, 23 Jul 2026 11:16:00 +0200
Subject: [PATCH] AMDGPU: Manually convert some MC tests to subarch triples
Many are switches from using the dummy amdgcn triple to a concrete
subarch.
---
llvm/test/MC/AMDGPU/alignto_mcexpr.s | 2 +-
llvm/test/MC/AMDGPU/branch-comment.s | 2 +-
llvm/test/MC/AMDGPU/data.s | 4 ++--
llvm/test/MC/AMDGPU/dl-insts-err.s | 2 +-
llvm/test/MC/AMDGPU/elf-lds-error.s | 2 +-
llvm/test/MC/AMDGPU/elf-lds.s | 2 +-
llvm/test/MC/AMDGPU/elf-notes-verify-amdgcn.s | 2 +-
llvm/test/MC/AMDGPU/exp-err.s | 2 +-
llvm/test/MC/AMDGPU/exp-pregfx11.s | 2 +-
llvm/test/MC/AMDGPU/exp.s | 2 +-
llvm/test/MC/AMDGPU/hsa-metadata-kernel-args-v3.s | 12 ++++++------
llvm/test/MC/AMDGPU/hsa-metadata-kernel-attrs-v3.s | 14 +++++++-------
.../MC/AMDGPU/hsa-metadata-kernel-code-props-v3.s | 6 +++---
llvm/test/MC/AMDGPU/labels-branch-err.s | 2 +-
llvm/test/MC/AMDGPU/labels-branch-gfx9.s | 2 +-
llvm/test/MC/AMDGPU/labels-branch.s | 2 +-
llvm/test/MC/AMDGPU/max-branch-distance.s | 2 +-
llvm/test/MC/AMDGPU/mcexpr_amd.s | 4 ++--
llvm/test/MC/AMDGPU/mcexpr_amd_err.s | 2 +-
llvm/test/MC/AMDGPU/occupancy_mcexpr.s | 2 +-
llvm/test/MC/AMDGPU/offset-expr.s | 2 +-
llvm/test/MC/AMDGPU/offsetbug_once.s | 2 +-
llvm/test/MC/AMDGPU/offsetbug_one_and_one.s | 2 +-
llvm/test/MC/AMDGPU/offsetbug_twice.s | 2 +-
llvm/test/MC/AMDGPU/pal-registers.s | 2 +-
llvm/test/MC/AMDGPU/reloc-directive.s | 4 ++--
llvm/test/MC/AMDGPU/round-trip.s | 4 ++--
llvm/test/MC/AMDGPU/s_endpgm.s | 6 +++---
llvm/test/MC/AMDGPU/sop1.s | 4 ++--
llvm/test/MC/AMDGPU/sop2-err.s | 2 +-
llvm/test/MC/AMDGPU/sopp.s | 4 ++--
llvm/test/MC/AMDGPU/sym_kernel_scope.s | 2 +-
llvm/test/MC/AMDGPU/vcc_tuples.s | 2 +-
llvm/test/MC/AMDGPU/vintrp-err.s | 2 +-
34 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/llvm/test/MC/AMDGPU/alignto_mcexpr.s b/llvm/test/MC/AMDGPU/alignto_mcexpr.s
index a80f48b4304ef..12d74f4ff0902 100644
--- a/llvm/test/MC/AMDGPU/alignto_mcexpr.s
+++ b/llvm/test/MC/AMDGPU/alignto_mcexpr.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa < %s | FileCheck --check-prefix=ASM %s
+// RUN: llvm-mc -triple=amdgpu7.00-amd-amdhsa < %s | FileCheck --check-prefix=ASM %s
// ASM: .set alignto_zero_eight, 0
// ASM: .set alignto_one_eight, 8
diff --git a/llvm/test/MC/AMDGPU/branch-comment.s b/llvm/test/MC/AMDGPU/branch-comment.s
index bb5547bce1fee..0185811244a50 100644
--- a/llvm/test/MC/AMDGPU/branch-comment.s
+++ b/llvm/test/MC/AMDGPU/branch-comment.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=amdgcn -mcpu=fiji -filetype=obj %s | llvm-objcopy -S -K keep_symbol - | llvm-objdump -d --mcpu=fiji - | FileCheck %s --check-prefix=BIN
+// RUN: llvm-mc -triple=amdgpu8.03 -filetype=obj %s | llvm-objcopy -S -K keep_symbol - | llvm-objdump -d - | FileCheck %s --check-prefix=BIN
// FIXME: Immediate operands to sopp_br instructions are currently scaled by a
// factor of 4, are unsigned, are always PC relative, don't accept most
diff --git a/llvm/test/MC/AMDGPU/data.s b/llvm/test/MC/AMDGPU/data.s
index 3bc273c080e96..560aa764b5085 100644
--- a/llvm/test/MC/AMDGPU/data.s
+++ b/llvm/test/MC/AMDGPU/data.s
@@ -1,6 +1,6 @@
-// We check that unrecognized opcodes are disassembled by llvm-objdump as data using the .long directive
+// We check that unrecognized opcodes are disassembled by llvm-objdump as data using the .long directive
// and any trailing bytes are disassembled using the .byte directive
-// RUN: llvm-mc -filetype=obj -triple=amdgcn--amdpal -mcpu=gfx900 -show-encoding %s | llvm-objdump -d --mcpu=gfx900 - | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple=amdgpu9.00--amdpal -show-encoding %s | llvm-objdump -d - | FileCheck %s
.text
v_mov_b32 v7, s24
diff --git a/llvm/test/MC/AMDGPU/dl-insts-err.s b/llvm/test/MC/AMDGPU/dl-insts-err.s
index 91ddfb89602a2..86d4fe3f9a47b 100644
--- a/llvm/test/MC/AMDGPU/dl-insts-err.s
+++ b/llvm/test/MC/AMDGPU/dl-insts-err.s
@@ -1,4 +1,4 @@
-// RUN: not llvm-mc -triple=amdgcn -mcpu=gfx800 %s -filetype=null 2>&1 | FileCheck %s
+// RUN: not llvm-mc -triple=amdgpu8.00 %s -filetype=null 2>&1 | FileCheck %s
// RUN: not llvm-mc -triple=amdgpu9.00 %s -filetype=null 2>&1 | FileCheck %s
// RUN: not llvm-mc -triple=amdgpu9.06 %s -filetype=null 2>&1 | FileCheck %s --check-prefix=GFX906-GFX908
// RUN: not llvm-mc -triple=amdgpu9.08 %s -filetype=null 2>&1 | FileCheck %s --check-prefix=GFX906-GFX908
diff --git a/llvm/test/MC/AMDGPU/elf-lds-error.s b/llvm/test/MC/AMDGPU/elf-lds-error.s
index 0eb31e00dc84a..b97bbc7b4a951 100644
--- a/llvm/test/MC/AMDGPU/elf-lds-error.s
+++ b/llvm/test/MC/AMDGPU/elf-lds-error.s
@@ -1,5 +1,5 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --unique --sort --version 6
-// RUN: not llvm-mc -triple=amdgcn-- -mcpu gfx900 %s -o - -filetype=null 2>&1 | FileCheck %s
+// RUN: not llvm-mc -triple=amdgpu9.00-- %s -o - -filetype=null 2>&1 | FileCheck %s
.amdgpu_lds huge, 200000
// CHECK: :[[@LINE-1]]:27: error: size is too large
diff --git a/llvm/test/MC/AMDGPU/elf-lds.s b/llvm/test/MC/AMDGPU/elf-lds.s
index feff2fd2065fb..63c5205220fd3 100644
--- a/llvm/test/MC/AMDGPU/elf-lds.s
+++ b/llvm/test/MC/AMDGPU/elf-lds.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -filetype=obj -triple=amdgcn-- -mcpu gfx900 %s -o - | llvm-readobj -r --syms - | FileCheck %s
+// RUN: llvm-mc -filetype=obj -triple=amdgpu9.00-- %s -o - | llvm-readobj -r --syms - | FileCheck %s
.text
.globl test_kernel
diff --git a/llvm/test/MC/AMDGPU/elf-notes-verify-amdgcn.s b/llvm/test/MC/AMDGPU/elf-notes-verify-amdgcn.s
index d7a0f78fdd0c9..bf2659dff3c69 100644
--- a/llvm/test/MC/AMDGPU/elf-notes-verify-amdgcn.s
+++ b/llvm/test/MC/AMDGPU/elf-notes-verify-amdgcn.s
@@ -1,5 +1,5 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --unique --sort --version 6
-// RUN: not llvm-mc -triple=amdgcn %s -filetype=null 2>&1 | FileCheck --check-prefix=GCN %s
+// RUN: not llvm-mc -triple=amdgpu6.00 %s -filetype=null 2>&1 | FileCheck --check-prefix=GCN %s
.amd_amdgpu_hsa_metadata
// GCN: :[[@LINE-1]]:25: error: .amd_amdgpu_hsa_metadata directive is not available on non-amdhsa OSes
diff --git a/llvm/test/MC/AMDGPU/exp-err.s b/llvm/test/MC/AMDGPU/exp-err.s
index a11172991c19b..435ab450814f4 100644
--- a/llvm/test/MC/AMDGPU/exp-err.s
+++ b/llvm/test/MC/AMDGPU/exp-err.s
@@ -1,4 +1,4 @@
-// RUN: not llvm-mc -triple=amdgcn %s -filetype=null 2>&1 | FileCheck -check-prefixes=GCN,GFX68 --implicit-check-not=error: %s
+// RUN: not llvm-mc -triple=amdgpu6.00 %s -filetype=null 2>&1 | FileCheck -check-prefixes=GCN,GFX68 --implicit-check-not=error: %s
// RUN: not llvm-mc -triple=amdgpu8.02 %s -filetype=null 2>&1 | FileCheck -check-prefixes=GCN,GFX68 --implicit-check-not=error: %s
// RUN: not llvm-mc -triple=amdgpu11.00 %s -filetype=null 2>&1 | FileCheck -check-prefixes=GCN,GFX11 --implicit-check-not=error: %s
diff --git a/llvm/test/MC/AMDGPU/exp-pregfx11.s b/llvm/test/MC/AMDGPU/exp-pregfx11.s
index 7aacc14a6b19e..d1e8932d97550 100644
--- a/llvm/test/MC/AMDGPU/exp-pregfx11.s
+++ b/llvm/test/MC/AMDGPU/exp-pregfx11.s
@@ -1,5 +1,5 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --unique --sort --version 6
-// RUN: llvm-mc -triple=amdgcn -show-encoding %s | FileCheck -check-prefix=SI %s
+// RUN: llvm-mc -triple=amdgpu6.00 -show-encoding %s | FileCheck -check-prefix=SI %s
// RUN: llvm-mc -triple=amdgpu8.02 -show-encoding %s | FileCheck -check-prefix=GFX89 %s
// RUN: llvm-mc -triple=amdgpu9.00 -show-encoding %s | FileCheck -check-prefix=GFX89 %s
// RUN: llvm-mc -triple=amdgpu10.10 -show-encoding %s | FileCheck -check-prefix=GFX10 %s
diff --git a/llvm/test/MC/AMDGPU/exp.s b/llvm/test/MC/AMDGPU/exp.s
index 63065625a2d6f..5ceb455519355 100644
--- a/llvm/test/MC/AMDGPU/exp.s
+++ b/llvm/test/MC/AMDGPU/exp.s
@@ -1,5 +1,5 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --unique --sort --version 6
-// RUN: llvm-mc -triple=amdgcn -show-encoding %s | FileCheck -check-prefix=SI %s
+// RUN: llvm-mc -triple=amdgpu6.00 -show-encoding %s | FileCheck -check-prefix=SI %s
// RUN: llvm-mc -triple=amdgpu8.02 -show-encoding %s | FileCheck -check-prefix=GFX89 %s
// RUN: llvm-mc -triple=amdgpu9.00 -show-encoding %s | FileCheck -check-prefix=GFX89 %s
// RUN: llvm-mc -triple=amdgpu10.10 -show-encoding %s | FileCheck -check-prefix=GFX10 %s
diff --git a/llvm/test/MC/AMDGPU/hsa-metadata-kernel-args-v3.s b/llvm/test/MC/AMDGPU/hsa-metadata-kernel-args-v3.s
index 18be03358c823..8bed56ad9d271 100644
--- a/llvm/test/MC/AMDGPU/hsa-metadata-kernel-args-v3.s
+++ b/llvm/test/MC/AMDGPU/hsa-metadata-kernel-args-v3.s
@@ -1,10 +1,10 @@
// RUN: llvm-mc -triple=amdgpu7.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx800 -show-encoding %s | FileCheck --check-prefix=CHECK %s
+// RUN: llvm-mc -triple=amdgpu8.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
// RUN: llvm-mc -triple=amdgpu9.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
; CHECK: .amdgpu_metadata
-; CHECK: amdhsa.kernels:
-; CHECK-NEXT: - .args:
+; CHECK: amdhsa.kernels:
+; CHECK-NEXT: - .args:
; CHECK-NEXT: - .offset: 1
; CHECK-NEXT: .size: 1
; CHECK-NEXT: .type_name: char
@@ -31,7 +31,7 @@
; CHECK-NEXT: .kernarg_segment_align: 64
; CHECK-NEXT: .kernarg_segment_size: 8
; CHECK-NEXT: .language: OpenCL C
-; CHECK-NEXT: .language_version:
+; CHECK-NEXT: .language_version:
; CHECK-NEXT: - 2
; CHECK-NEXT: - 0
; CHECK-NEXT: .max_flat_workgroup_size: 256
@@ -41,10 +41,10 @@
; CHECK-NEXT: .symbol: 'test_kernel at kd'
; CHECK-NEXT: .vgpr_count: 40
; CHECK-NEXT: .wavefront_size: 128
-; CHECK-NEXT: amdhsa.printf:
+; CHECK-NEXT: amdhsa.printf:
; CHECK-NEXT: - '1:1:4:%d\n'
; CHECK-NEXT: - '2:1:8:%g\n'
-; CHECK-NEXT: amdhsa.version:
+; CHECK-NEXT: amdhsa.version:
; CHECK-NEXT: - 1
; CHECK-NEXT: - 0
; CHECK: .end_amdgpu_metadata
diff --git a/llvm/test/MC/AMDGPU/hsa-metadata-kernel-attrs-v3.s b/llvm/test/MC/AMDGPU/hsa-metadata-kernel-attrs-v3.s
index b04880c9dc6d6..73bc4632c0533 100644
--- a/llvm/test/MC/AMDGPU/hsa-metadata-kernel-attrs-v3.s
+++ b/llvm/test/MC/AMDGPU/hsa-metadata-kernel-attrs-v3.s
@@ -1,20 +1,20 @@
// RUN: llvm-mc -triple=amdgpu7.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx800 -show-encoding %s | FileCheck --check-prefix=CHECK %s
+// RUN: llvm-mc -triple=amdgpu8.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
// RUN: llvm-mc -triple=amdgpu9.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
// CHECK: .amdgpu_metadata
-// CHECK: amdhsa.kernels:
+// CHECK: amdhsa.kernels:
// CHECK: - .group_segment_fixed_size: 16
// CHECK: .kernarg_segment_align: 64
// CHECK: .kernarg_segment_size: 8
// CHECK: .language: OpenCL C
-// CHECK: .language_version:
+// CHECK: .language_version:
// CHECK-NEXT: - 2
// CHECK-NEXT: - 0
// CHECK: .max_flat_workgroup_size: 256
// CHECK: .name: test_kernel
// CHECK: .private_segment_fixed_size: 32
-// CHECK: .reqd_workgroup_size:
+// CHECK: .reqd_workgroup_size:
// CHECK-NEXT: - 1
// CHECK-NEXT: - 2
// CHECK-NEXT: - 4
@@ -23,14 +23,14 @@
// CHECK: .vec_type_hint: int
// CHECK: .vgpr_count: 40
// CHECK: .wavefront_size: 128
-// CHECK: .workgroup_size_hint:
+// CHECK: .workgroup_size_hint:
// CHECK-NEXT: - 8
// CHECK-NEXT: - 16
// CHECK-NEXT: - 32
-// CHECK: amdhsa.printf:
+// CHECK: amdhsa.printf:
// CHECK: - '1:1:4:%d\n'
// CHECK: - '2:1:8:%g\n'
-// CHECK: amdhsa.version:
+// CHECK: amdhsa.version:
// CHECK-NEXT: - 1
// CHECK-NEXT: - 0
// CHECK: .end_amdgpu_metadata
diff --git a/llvm/test/MC/AMDGPU/hsa-metadata-kernel-code-props-v3.s b/llvm/test/MC/AMDGPU/hsa-metadata-kernel-code-props-v3.s
index a5b7abb701e29..7d30fda88e9ff 100644
--- a/llvm/test/MC/AMDGPU/hsa-metadata-kernel-code-props-v3.s
+++ b/llvm/test/MC/AMDGPU/hsa-metadata-kernel-code-props-v3.s
@@ -1,9 +1,9 @@
// RUN: llvm-mc -triple=amdgpu7.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -mcpu=gfx800 -show-encoding %s | FileCheck --check-prefix=CHECK %s
+// RUN: llvm-mc -triple=amdgpu8.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
// RUN: llvm-mc -triple=amdgpu9.00-amd-amdhsa -show-encoding %s | FileCheck --check-prefix=CHECK %s
// CHECK: .amdgpu_metadata
-// CHECK: amdhsa.kernels:
+// CHECK: amdhsa.kernels:
// CHECK: - .group_segment_fixed_size: 24
// CHECK: .kernarg_segment_align: 16
// CHECK: .kernarg_segment_size: 24
@@ -16,7 +16,7 @@
// CHECK: .vgpr_count: 14
// CHECK: .vgpr_spill_count: 1
// CHECK: .wavefront_size: 64
-// CHECK: amdhsa.version:
+// CHECK: amdhsa.version:
// CHECK-NEXT: - 1
// CHECK-NEXT: - 0
.amdgpu_metadata
diff --git a/llvm/test/MC/AMDGPU/labels-branch-err.s b/llvm/test/MC/AMDGPU/labels-branch-err.s
index ff6a83e0135a0..0f79acae992ef 100644
--- a/llvm/test/MC/AMDGPU/labels-branch-err.s
+++ b/llvm/test/MC/AMDGPU/labels-branch-err.s
@@ -1,5 +1,5 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --unique --sort --version 6
-// RUN: not llvm-mc -triple=amdgcn -filetype=obj -o /dev/null %s 2>&1 | FileCheck -check-prefix=ERROR %s
+// RUN: not llvm-mc -triple=amdgpu6.00 -filetype=obj -o /dev/null %s 2>&1 | FileCheck -check-prefix=ERROR %s
s_branch undef_label
// ERROR: :[[@LINE-1]]:10: error: undefined label 'undef_label'
diff --git a/llvm/test/MC/AMDGPU/labels-branch-gfx9.s b/llvm/test/MC/AMDGPU/labels-branch-gfx9.s
index 3a5efe739c1ce..dda1dad114445 100644
--- a/llvm/test/MC/AMDGPU/labels-branch-gfx9.s
+++ b/llvm/test/MC/AMDGPU/labels-branch-gfx9.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple=amdgpu9.00 -show-encoding %s | FileCheck %s --check-prefix=GFX9
-// RUN: llvm-mc -triple=amdgcn -mcpu=gfx900 -filetype=obj %s | llvm-objdump -d --mcpu=gfx900 - | FileCheck %s --check-prefix=BIN
+// RUN: llvm-mc -triple=amdgpu9.00 -filetype=obj %s | llvm-objdump -d - | FileCheck %s --check-prefix=BIN
loop_start:
diff --git a/llvm/test/MC/AMDGPU/labels-branch.s b/llvm/test/MC/AMDGPU/labels-branch.s
index 5fb96a4ca67b4..6bc3c326d51de 100644
--- a/llvm/test/MC/AMDGPU/labels-branch.s
+++ b/llvm/test/MC/AMDGPU/labels-branch.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple=amdgpu8.03 -show-encoding %s | FileCheck %s --check-prefix=VI
-// RUN: llvm-mc -triple=amdgcn -mcpu=fiji -filetype=obj %s | llvm-objdump -d --mcpu=fiji - | FileCheck %s --check-prefix=BIN
+// RUN: llvm-mc -triple=amdgpu8.03 -filetype=obj %s | llvm-objdump -d --mcpu=fiji - | FileCheck %s --check-prefix=BIN
loop_start:
s_branch loop_start
diff --git a/llvm/test/MC/AMDGPU/max-branch-distance.s b/llvm/test/MC/AMDGPU/max-branch-distance.s
index 46aa524f7ab4f..77f831fe16297 100644
--- a/llvm/test/MC/AMDGPU/max-branch-distance.s
+++ b/llvm/test/MC/AMDGPU/max-branch-distance.s
@@ -1,4 +1,4 @@
-// RUN: not llvm-mc -triple=amdgcn -filetype=obj -o /dev/null %s 2>&1 | FileCheck -check-prefix=ERROR %s
+// RUN: not llvm-mc -triple=amdgpu6.00 -filetype=obj -o /dev/null %s 2>&1 | FileCheck -check-prefix=ERROR %s
// ERROR: max-branch-distance.s:7:12: error: branch size exceeds simm16
// fill v_nop
diff --git a/llvm/test/MC/AMDGPU/mcexpr_amd.s b/llvm/test/MC/AMDGPU/mcexpr_amd.s
index cd9eb026772e4..5127275ed84d2 100644
--- a/llvm/test/MC/AMDGPU/mcexpr_amd.s
+++ b/llvm/test/MC/AMDGPU/mcexpr_amd.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa < %s | FileCheck --check-prefix=ASM %s
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa -filetype=obj < %s > %t
+// RUN: llvm-mc -triple=amdgpu7.00-amd-amdhsa < %s | FileCheck --check-prefix=ASM %s
+// RUN: llvm-mc -triple=amdgpu7.00-amd-amdhsa -filetype=obj < %s > %t
// RUN: llvm-objdump --syms %t | FileCheck --check-prefix=OBJDUMP %s
// OBJDUMP: SYMBOL TABLE:
diff --git a/llvm/test/MC/AMDGPU/mcexpr_amd_err.s b/llvm/test/MC/AMDGPU/mcexpr_amd_err.s
index 1d23e35c9b33d..75201af38296f 100644
--- a/llvm/test/MC/AMDGPU/mcexpr_amd_err.s
+++ b/llvm/test/MC/AMDGPU/mcexpr_amd_err.s
@@ -1,4 +1,4 @@
-// RUN: not llvm-mc -triple=amdgcn-amd-amdhsa %s -filetype=null 2>&1 | FileCheck --check-prefix=ASM %s
+// RUN: not llvm-mc -triple=amdgpu7.00-amd-amdhsa %s -filetype=null 2>&1 | FileCheck --check-prefix=ASM %s
.set one, 1
.set two, 2
diff --git a/llvm/test/MC/AMDGPU/occupancy_mcexpr.s b/llvm/test/MC/AMDGPU/occupancy_mcexpr.s
index a5386cdfbbcd8..af8952b593316 100644
--- a/llvm/test/MC/AMDGPU/occupancy_mcexpr.s
+++ b/llvm/test/MC/AMDGPU/occupancy_mcexpr.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=amdgcn-amd-amdhsa < %s | FileCheck --check-prefix=ASM %s
+// RUN: llvm-mc -triple=amdgpu7.00-amd-amdhsa < %s | FileCheck --check-prefix=ASM %s
// The occupancy() MCExpr arguments are:
// occupancy(MaxWaves, VGPRGranule, TotalVGPRs, InitOcc,
diff --git a/llvm/test/MC/AMDGPU/offset-expr.s b/llvm/test/MC/AMDGPU/offset-expr.s
index 7c3c71c1645aa..8bf2409aa2178 100644
--- a/llvm/test/MC/AMDGPU/offset-expr.s
+++ b/llvm/test/MC/AMDGPU/offset-expr.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=amdgcn -mcpu=gfx906 -filetype=obj %s | llvm-objdump -d --mcpu=gfx906 - | FileCheck %s
+// RUN: llvm-mc -triple=amdgpu9.06 -filetype=obj %s | llvm-objdump -d --mcpu=gfx906 - | FileCheck %s
// Check that the offset is correctly calculated.
diff --git a/llvm/test/MC/AMDGPU/offsetbug_once.s b/llvm/test/MC/AMDGPU/offsetbug_once.s
index e47d7b232d118..9935611336589 100644
--- a/llvm/test/MC/AMDGPU/offsetbug_once.s
+++ b/llvm/test/MC/AMDGPU/offsetbug_once.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple=amdgpu10.10 -show-encoding %s | FileCheck %s --check-prefix=GFX10
-// RUN: llvm-mc -triple=amdgcn -mcpu=gfx1010 -filetype=obj %s | llvm-objdump -d --mcpu=gfx1010 - | FileCheck %s --check-prefix=BIN
+// RUN: llvm-mc -triple=amdgpu10.10 -filetype=obj %s | llvm-objdump -d - | FileCheck %s --check-prefix=BIN
s_getpc_b64 s[0:1]
s_cbranch_vccnz BB0_1
// GFX10: s_cbranch_vccnz BB0_1 ; encoding: [A,A,0x87,0xbf]
diff --git a/llvm/test/MC/AMDGPU/offsetbug_one_and_one.s b/llvm/test/MC/AMDGPU/offsetbug_one_and_one.s
index 54d3123b091e2..e4dd7e7487550 100644
--- a/llvm/test/MC/AMDGPU/offsetbug_one_and_one.s
+++ b/llvm/test/MC/AMDGPU/offsetbug_one_and_one.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple=amdgpu10.10 -show-encoding %s | FileCheck %s --check-prefix=GFX10
-// RUN: llvm-mc -triple=amdgcn -mcpu=gfx1010 -filetype=obj %s | llvm-objdump -d --mcpu=gfx1010 - | FileCheck %s --check-prefix=BIN
+// RUN: llvm-mc -triple=amdgpu10.10 -filetype=obj %s | llvm-objdump -d - | FileCheck %s --check-prefix=BIN
s_getpc_b64 s[0:1]
s_cbranch_vccnz BB0_1
// GFX10: s_cbranch_vccnz BB0_1 ; encoding: [A,A,0x87,0xbf]
diff --git a/llvm/test/MC/AMDGPU/offsetbug_twice.s b/llvm/test/MC/AMDGPU/offsetbug_twice.s
index f86c6166cd83f..93635f6e192b7 100644
--- a/llvm/test/MC/AMDGPU/offsetbug_twice.s
+++ b/llvm/test/MC/AMDGPU/offsetbug_twice.s
@@ -1,5 +1,5 @@
// RUN: llvm-mc -triple=amdgpu10.10 -show-encoding %s | FileCheck %s --check-prefix=GFX10
-// RUN: llvm-mc -triple=amdgcn -mcpu=gfx1010 -filetype=obj %s | llvm-objdump -d --mcpu=gfx1010 - | FileCheck %s --check-prefix=BIN
+// RUN: llvm-mc -triple=amdgpu10.10 -filetype=obj %s | llvm-objdump -d --mcpu=gfx1010 - | FileCheck %s --check-prefix=BIN
s_getpc_b64 s[0:1]
s_cbranch_vccnz BB0_2
// GFX10: s_cbranch_vccnz BB0_2 ; encoding: [A,A,0x87,0xbf]
diff --git a/llvm/test/MC/AMDGPU/pal-registers.s b/llvm/test/MC/AMDGPU/pal-registers.s
index 4c74388dc87c6..37440dc422931 100644
--- a/llvm/test/MC/AMDGPU/pal-registers.s
+++ b/llvm/test/MC/AMDGPU/pal-registers.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=amdgcn--amdpal %s | FileCheck %s
+// RUN: llvm-mc -triple=amdgpu6.00--amdpal %s | FileCheck %s
.amdgpu_pal_metadata
---
diff --git a/llvm/test/MC/AMDGPU/reloc-directive.s b/llvm/test/MC/AMDGPU/reloc-directive.s
index 5d55fde4945ef..72c5c75a76287 100644
--- a/llvm/test/MC/AMDGPU/reloc-directive.s
+++ b/llvm/test/MC/AMDGPU/reloc-directive.s
@@ -1,6 +1,6 @@
-# RUN: llvm-mc -triple=amdgcn--amdhsa %s | FileCheck --check-prefix=PRINT %s
+# RUN: llvm-mc -triple=amdgpu7.00--amdhsa %s | FileCheck --check-prefix=PRINT %s
-# RUN: llvm-mc -filetype=obj -triple=amdgcn--amdhsa %s -o %t
+# RUN: llvm-mc -filetype=obj -triple=amdgpu7.00--amdhsa %s -o %t
# RUN: llvm-readobj -r %t | FileCheck %s
# PRINT: .reloc {{.*}}+2, R_AMDGPU_NONE, .data
diff --git a/llvm/test/MC/AMDGPU/round-trip.s b/llvm/test/MC/AMDGPU/round-trip.s
index 7ff49142d03d0..65f57bc0da154 100644
--- a/llvm/test/MC/AMDGPU/round-trip.s
+++ b/llvm/test/MC/AMDGPU/round-trip.s
@@ -1,5 +1,5 @@
-# RUN: llvm-mc -preserve-comments -triple=amdgcn-amd- %s >%t-1.s
-# RUN: llvm-mc -preserve-comments -triple=amdgcn-amd- %t-1.s >%t-2.s
+# RUN: llvm-mc -preserve-comments -triple=amdgpu6.00-amd- %s >%t-1.s
+# RUN: llvm-mc -preserve-comments -triple=amdgpu6.00-amd- %t-1.s >%t-2.s
# RUN: diff %t-1.s %t-2.s
# Test that AMDGPU assembly round-trips when run through MC; the first
diff --git a/llvm/test/MC/AMDGPU/s_endpgm.s b/llvm/test/MC/AMDGPU/s_endpgm.s
index 59170f1497b2d..8b05464954f27 100644
--- a/llvm/test/MC/AMDGPU/s_endpgm.s
+++ b/llvm/test/MC/AMDGPU/s_endpgm.s
@@ -1,6 +1,6 @@
-// RUN: llvm-mc -triple=amdgcn %s | FileCheck -strict-whitespace %s -check-prefix=WHITESPACE
-// RUN: llvm-mc -triple=amdgcn -show-encoding %s | FileCheck %s --check-prefix=GCN
-// RUN: llvm-mc -triple=amdgcn -mcpu=gfx900 -filetype=obj %s | llvm-objcopy -S -K keep_symbol - | llvm-objdump -d --mcpu=gfx900 - | FileCheck %s --check-prefix=BIN
+// RUN: llvm-mc -triple=amdgpu6.00 %s | FileCheck -strict-whitespace %s -check-prefix=WHITESPACE
+// RUN: llvm-mc -triple=amdgpu6.00 -show-encoding %s | FileCheck %s --check-prefix=GCN
+// RUN: llvm-mc -triple=amdgpu9.00 -filetype=obj %s | llvm-objcopy -S -K keep_symbol - | llvm-objdump -d - | FileCheck %s --check-prefix=BIN
// WHITESPACE: s_endpgm{{$}}
// GCN: s_endpgm ; encoding: [0x00,0x00,0x81,0xbf]
diff --git a/llvm/test/MC/AMDGPU/sop1.s b/llvm/test/MC/AMDGPU/sop1.s
index ee1be22f3fab7..e05fad9473d2e 100644
--- a/llvm/test/MC/AMDGPU/sop1.s
+++ b/llvm/test/MC/AMDGPU/sop1.s
@@ -1,9 +1,9 @@
-// RUN: not llvm-mc -triple=amdgcn -show-encoding %s | FileCheck --check-prefix=SICI %s
+// RUN: not llvm-mc -triple=amdgpu6.00 -show-encoding %s | FileCheck --check-prefix=SICI %s
// RUN: not llvm-mc -triple=amdgpu8.03 -show-encoding %s | FileCheck --check-prefix=GFX89 %s
// RUN: not llvm-mc -triple=amdgpu9.00 -show-encoding %s | FileCheck --check-prefixes=GFX89,GFX9 %s
// RUN: not llvm-mc -triple=amdgpu10.10 -show-encoding %s | FileCheck --check-prefix=GFX10 %s
-// RUN: not llvm-mc -triple=amdgcn %s -filetype=null 2>&1 | FileCheck --check-prefixes=NOSICI,NOSICIVI --implicit-check-not=error: %s
+// RUN: not llvm-mc -triple=amdgpu6.00 %s -filetype=null 2>&1 | FileCheck --check-prefixes=NOSICI,NOSICIVI --implicit-check-not=error: %s
// RUN: not llvm-mc -triple=amdgpu8.03 %s -filetype=null 2>&1 | FileCheck --check-prefixes=NOSICIVI,NOGFX89 --implicit-check-not=error: %s
// RUN: not llvm-mc -triple=amdgpu9.00 %s -filetype=null 2>&1 | FileCheck --check-prefixes=NOGFX9,NOGFX89 --implicit-check-not=error: %s
// RUN: not llvm-mc -triple=amdgpu10.10 -filetype=null 2>&1 %s | FileCheck --check-prefix=GFX10-ERR --implicit-check-not=error: %s
diff --git a/llvm/test/MC/AMDGPU/sop2-err.s b/llvm/test/MC/AMDGPU/sop2-err.s
index 876b7f185b2e4..8d8c9b131dbd8 100644
--- a/llvm/test/MC/AMDGPU/sop2-err.s
+++ b/llvm/test/MC/AMDGPU/sop2-err.s
@@ -1,5 +1,5 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --unique --sort --version 6
-// RUN: not llvm-mc -triple=amdgcn %s -filetype=null 2>&1 | FileCheck -check-prefix=GCN --implicit-check-not=error: %s
+// RUN: not llvm-mc -triple=amdgpu6.00 %s -filetype=null 2>&1 | FileCheck -check-prefix=GCN --implicit-check-not=error: %s
s_and_b32 s2, 0x12345678, 0x12345679
// GCN: :[[@LINE-1]]:27: error: only one unique literal operand is allowed
diff --git a/llvm/test/MC/AMDGPU/sopp.s b/llvm/test/MC/AMDGPU/sopp.s
index 16b09543b10c5..547ce7e5f0c61 100644
--- a/llvm/test/MC/AMDGPU/sopp.s
+++ b/llvm/test/MC/AMDGPU/sopp.s
@@ -1,5 +1,5 @@
-// RUN: not llvm-mc -triple=amdgcn -show-encoding %s | FileCheck --check-prefixes=GCN,SI %s
-// RUN: not llvm-mc -triple=amdgcn %s -filetype=null 2>&1 | FileCheck %s --check-prefix=NOSICI --implicit-check-not=error:
+// RUN: not llvm-mc -triple=amdgpu6.00 -show-encoding %s | FileCheck --check-prefixes=GCN,SI %s
+// RUN: not llvm-mc -triple=amdgpu6.00 %s -filetype=null 2>&1 | FileCheck %s --check-prefix=NOSICI --implicit-check-not=error:
// RUN: llvm-mc -triple=amdgpu8.03 -show-encoding %s | FileCheck --check-prefixes=GCN,VI %s
//===----------------------------------------------------------------------===//
diff --git a/llvm/test/MC/AMDGPU/sym_kernel_scope.s b/llvm/test/MC/AMDGPU/sym_kernel_scope.s
index 88f3e6ae7266a..5923a127eeba7 100644
--- a/llvm/test/MC/AMDGPU/sym_kernel_scope.s
+++ b/llvm/test/MC/AMDGPU/sym_kernel_scope.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple=amdgcn %s | FileCheck %s
+// RUN: llvm-mc -triple=amdgpu6.00 %s | FileCheck %s
.byte .kernel.sgpr_count
// CHECK: .byte 0
diff --git a/llvm/test/MC/AMDGPU/vcc_tuples.s b/llvm/test/MC/AMDGPU/vcc_tuples.s
index cf2ed8f9d9f75..551bf503a4f05 100644
--- a/llvm/test/MC/AMDGPU/vcc_tuples.s
+++ b/llvm/test/MC/AMDGPU/vcc_tuples.s
@@ -14,7 +14,7 @@
// RUN: not llvm-mc -triple=amdgpu11.00 -show-encoding %s -filetype=null 2>&1 | FileCheck --check-prefixes=GFX11-ERR --implicit-check-not=error: %s
// RUN: not llvm-mc -triple=amdgpu11.00 -show-encoding %s | %extract-encodings | llvm-mc -triple=amdgpu11.00 -disassemble -show-encoding | FileCheck --check-prefixes=GFX11 %s
// RUN: llvm-mc -triple=amdgpu12.00 -show-encoding %s | FileCheck -check-prefixes=GFX12 %s
-// RUN: llvm-mc -triple=amdgcn -mcpu=gfx1200 -show-encoding %s | %extract-encodings | llvm-mc -triple=amdgcn -mcpu=gfx1250 -disassemble -show-encoding | FileCheck --check-prefixes=GFX12 %s
+// RUN: llvm-mc -triple=amdgpu12.00 -show-encoding %s | %extract-encodings | llvm-mc -triple=amdgpu12.50 -disassemble -show-encoding | FileCheck --check-prefixes=GFX12 %s
// RUN: llvm-mc -triple=amdgpu12.50 -show-encoding %s | FileCheck -check-prefixes=GFX12 %s
// RUN: llvm-mc -triple=amdgpu12.50 -show-encoding %s | %extract-encodings | llvm-mc -triple=amdgpu12.50 -disassemble -show-encoding | FileCheck --check-prefixes=GFX12 %s
diff --git a/llvm/test/MC/AMDGPU/vintrp-err.s b/llvm/test/MC/AMDGPU/vintrp-err.s
index e412d7a0d6f09..da91ceaf28f2b 100644
--- a/llvm/test/MC/AMDGPU/vintrp-err.s
+++ b/llvm/test/MC/AMDGPU/vintrp-err.s
@@ -1,5 +1,5 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --unique --sort --version 6
-// RUN: not llvm-mc -triple=amdgcn %s -filetype=null 2>&1 | FileCheck -check-prefix=GCN --implicit-check-not=error: %s
+// RUN: not llvm-mc -triple=amdgpu6.00 %s -filetype=null 2>&1 | FileCheck -check-prefix=GCN --implicit-check-not=error: %s
// RUN: not llvm-mc -triple=amdgpu8.02 %s -filetype=null 2>&1 | FileCheck -check-prefix=GCN --implicit-check-not=error: %s
v_interp_mov_f32 v11, invalid_param_3, attr0.y
More information about the llvm-commits
mailing list