[llvm] d5f2c3e - [NFC][AMDGPU] Clean up some lit test prefixes
Scott Linder via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 11 09:13:09 PST 2020
Author: Scott Linder
Date: 2020-11-11T17:12:37Z
New Revision: d5f2c3e7c0945cdadb40119cca73e3c2a22ae336
URL: https://github.com/llvm/llvm-project/commit/d5f2c3e7c0945cdadb40119cca73e3c2a22ae336
DIFF: https://github.com/llvm/llvm-project/commit/d5f2c3e7c0945cdadb40119cca73e3c2a22ae336.diff
LOG: [NFC][AMDGPU] Clean up some lit test prefixes
Replace some instances of "ALL" with "GCN" where it applies. Committed
as obvious.
Added:
Modified:
llvm/test/CodeGen/AMDGPU/extra-sroa-after-unroll.ll
llvm/test/CodeGen/AMDGPU/global-atomics-fp.ll
llvm/test/CodeGen/AMDGPU/spill-wide-sgpr.ll
llvm/test/MC/AMDGPU/hsa-diag-v3.s
Removed:
################################################################################
diff --git a/llvm/test/CodeGen/AMDGPU/extra-sroa-after-unroll.ll b/llvm/test/CodeGen/AMDGPU/extra-sroa-after-unroll.ll
index c2093eaf215f..db704a8bcbbf 100644
--- a/llvm/test/CodeGen/AMDGPU/extra-sroa-after-unroll.ll
+++ b/llvm/test/CodeGen/AMDGPU/extra-sroa-after-unroll.ll
@@ -1,14 +1,14 @@
-; RUN: opt -instnamer -O1 -mtriple=amdgcn-- -S -o - %s | FileCheck -check-prefixes=ALL,O1 %s
-; RUN: opt -instnamer -O2 -mtriple=amdgcn-- -S -o - %s | FileCheck -check-prefixes=ALL,O2 %s
-; RUN: opt -instnamer -O3 -mtriple=amdgcn-- -S -o - %s | FileCheck -check-prefixes=ALL,O3 %s
+; RUN: opt -instnamer -O1 -mtriple=amdgcn-- -S -o - %s | FileCheck -check-prefixes=GCN,O1 %s
+; RUN: opt -instnamer -O2 -mtriple=amdgcn-- -S -o - %s | FileCheck -check-prefixes=GCN,O2 %s
+; RUN: opt -instnamer -O3 -mtriple=amdgcn-- -S -o - %s | FileCheck -check-prefixes=GCN,O3 %s
target datalayout = "A5"
-; ALL-LABEL: t0
+; GCN-LABEL: t0
; O1-NOT: alloca
; O2-NOT: alloca
; O3-NOT: alloca
-; ALL-COUNT-27: = load
-; ALL-COUNT-26: = add
+; GCN-COUNT-27: = load
+; GCN-COUNT-26: = add
define protected amdgpu_kernel void @t0(i32 addrspace(1)* %p.coerce) #0 {
entry:
%p = alloca i32*, align 8, addrspace(5)
diff --git a/llvm/test/CodeGen/AMDGPU/global-atomics-fp.ll b/llvm/test/CodeGen/AMDGPU/global-atomics-fp.ll
index b4199cb1292a..f93b6d3de7b4 100644
--- a/llvm/test/CodeGen/AMDGPU/global-atomics-fp.ll
+++ b/llvm/test/CodeGen/AMDGPU/global-atomics-fp.ll
@@ -1,16 +1,12 @@
-; RUN: llc -march=amdgcn -mcpu=gfx900 -verify-machineinstrs < %s | FileCheck -enable-var-scope -check-prefixes=GCN,GFX900,CAS %s
-; RUN: llc -march=amdgcn -mcpu=gfx908 -verify-machineinstrs < %s | FileCheck -enable-var-scope -check-prefixes=GCN,GFX908,CAS %s
+; RUN: llc -march=amdgcn -mcpu=gfx900 -verify-machineinstrs < %s | FileCheck -enable-var-scope -check-prefixes=GCN,GFX900 %s
+; RUN: llc -march=amdgcn -mcpu=gfx908 -verify-machineinstrs < %s | FileCheck -enable-var-scope -check-prefixes=GCN,GFX908 %s
; GCN-LABEL: {{^}}global_atomic_fadd_ret_f32:
-; CAS: [[LOOP:BB[0-9]+_[0-9]+]]
-; CAS: v_add_f32_e32
-; CAS: global_atomic_cmpswap
-; CAS: s_andn2_b64 exec, exec,
-; CAS-NEXT: s_cbranch_execnz [[LOOP]]
-
-; GFX90A-NOT: v_add_f32
-; GFX90A: global_atomic_add_f32 v{{[0-9]+}}, v{{\[[0-9]+:[0-9]+\]}}, v{{[0-9]+}}, off glc
-; GFX90A-NOT: s_cbranch_execnz
+; GCN: [[LOOP:BB[0-9]+_[0-9]+]]
+; GCN: v_add_f32_e32
+; GCN: global_atomic_cmpswap
+; GCN: s_andn2_b64 exec, exec,
+; GCN-NEXT: s_cbranch_execnz [[LOOP]]
define amdgpu_kernel void @global_atomic_fadd_ret_f32(float addrspace(1)* %ptr) #0 {
%result = atomicrmw fadd float addrspace(1)* %ptr, float 4.0 seq_cst
store float %result, float addrspace(1)* undef
diff --git a/llvm/test/CodeGen/AMDGPU/spill-wide-sgpr.ll b/llvm/test/CodeGen/AMDGPU/spill-wide-sgpr.ll
index 3c08bcebf4cc..ecde59e82caa 100644
--- a/llvm/test/CodeGen/AMDGPU/spill-wide-sgpr.ll
+++ b/llvm/test/CodeGen/AMDGPU/spill-wide-sgpr.ll
@@ -1,7 +1,7 @@
-; RUN: llc -O0 -march=amdgcn -mcpu=fiji -verify-machineinstrs < %s | FileCheck -check-prefix=ALL -check-prefix=VGPR %s
-; RUN: llc -O0 -march=amdgcn -mcpu=fiji -amdgpu-spill-sgpr-to-vgpr=0 -verify-machineinstrs < %s | FileCheck -check-prefix=ALL -check-prefix=VMEM %s
+; RUN: llc -O0 -march=amdgcn -mcpu=fiji -verify-machineinstrs < %s | FileCheck -check-prefix=GCN -check-prefix=VGPR %s
+; RUN: llc -O0 -march=amdgcn -mcpu=fiji -amdgpu-spill-sgpr-to-vgpr=0 -verify-machineinstrs < %s | FileCheck -check-prefix=GCN -check-prefix=VMEM %s
-; ALL-LABEL: {{^}}spill_sgpr_x2:
+; GCN-LABEL: {{^}}spill_sgpr_x2:
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 0
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 1
@@ -28,7 +28,7 @@ ret:
ret void
}
-; ALL-LABEL: {{^}}spill_sgpr_x3:
+; GCN-LABEL: {{^}}spill_sgpr_x3:
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 0
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 1
@@ -57,7 +57,7 @@ ret:
ret void
}
-; ALL-LABEL: {{^}}spill_sgpr_x4:
+; GCN-LABEL: {{^}}spill_sgpr_x4:
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 0
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 1
@@ -88,7 +88,7 @@ ret:
ret void
}
-; ALL-LABEL: {{^}}spill_sgpr_x5:
+; GCN-LABEL: {{^}}spill_sgpr_x5:
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 0
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 1
@@ -121,7 +121,7 @@ ret:
ret void
}
-; ALL-LABEL: {{^}}spill_sgpr_x8:
+; GCN-LABEL: {{^}}spill_sgpr_x8:
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 0
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 1
@@ -159,7 +159,7 @@ ret:
ret void
}
-; ALL-LABEL: {{^}}spill_sgpr_x16:
+; GCN-LABEL: {{^}}spill_sgpr_x16:
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 0
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 1
@@ -213,7 +213,7 @@ ret:
ret void
}
-; ALL-LABEL: {{^}}spill_sgpr_x32:
+; GCN-LABEL: {{^}}spill_sgpr_x32:
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 0
; VGPR: v_writelane_b32 v{{[0-9]+}}, s{{[0-9]+}}, 1
diff --git a/llvm/test/MC/AMDGPU/hsa-diag-v3.s b/llvm/test/MC/AMDGPU/hsa-diag-v3.s
index 7185f9e65705..a99cd937f1b5 100644
--- a/llvm/test/MC/AMDGPU/hsa-diag-v3.s
+++ b/llvm/test/MC/AMDGPU/hsa-diag-v3.s
@@ -1,30 +1,30 @@
-// RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GFX8,NONGFX90A,NONGFX10,AMDHSA,ALL
-// RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=NONGFX8,NONGFX90A,GFX10,AMDHSA,ALL
-// RUN: not llvm-mc -triple amdgcn-amd- -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=NONAMDHSA,ALL
+// RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,GFX8,NONGFX10,AMDHSA
+// RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,GFX10,AMDHSA
+// RUN: not llvm-mc -triple amdgcn-amd- -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,NONAMDHSA
.text
-// ALL-LABEL: warning: test_target
+// GCN-LABEL: warning: test_target
// GFX8-NOT: error:
// GFX10: error: target must match options
// NONAMDHSA: error: unknown directive
.warning "test_target"
.amdgcn_target "amdgcn-amd-amdhsa--gfx803+xnack"
-// ALL-LABEL: warning: test_amdhsa_kernel_no_name
-// ALL: error: unknown directive
+// GCN-LABEL: warning: test_amdhsa_kernel_no_name
+// GCN: error: unknown directive
.warning "test_amdhsa_kernel_no_name"
.amdhsa_kernel
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_kernel_empty
+// GCN-LABEL: warning: test_amdhsa_kernel_empty
// AMDHSA-NOT: error: unknown directive
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_kernel_empty"
.amdhsa_kernel test_amdhsa_kernel_empty
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_kernel_unknown_directive
+// GCN-LABEL: warning: test_amdhsa_kernel_unknown_directive
// AMDHSA: error: expected .amdhsa_ directive or .end_amdhsa_kernel
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_kernel_unknown_directive"
@@ -32,7 +32,7 @@
1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_group_segment_fixed_size_invalid_size
+// GCN-LABEL: warning: test_amdhsa_group_segment_fixed_size_invalid_size
// AMDHSA: error: value out of range
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_group_segment_fixed_size_invalid_size"
@@ -40,7 +40,7 @@
.amdhsa_group_segment_fixed_size -1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_group_segment_fixed_size_invalid_expression
+// GCN-LABEL: warning: test_amdhsa_group_segment_fixed_size_invalid_expression
// AMDHSA: error: value out of range
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_group_segment_fixed_size_invalid_expression"
@@ -48,7 +48,7 @@
.amdhsa_group_segment_fixed_size 10000000000 + 1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_group_segment_fixed_size_repeated
+// GCN-LABEL: warning: test_amdhsa_group_segment_fixed_size_repeated
// AMDHSA: error: .amdhsa_ directives cannot be repeated
// NONAMDHSA-: error: unknown directive
.warning "test_amdhsa_group_segment_fixed_size_repeated"
@@ -57,14 +57,14 @@
.amdhsa_group_segment_fixed_size 1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_next_free_vgpr_missing
+// GCN-LABEL: warning: test_amdhsa_next_free_vgpr_missing
// AMDHSA: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_next_free_vgpr_missing"
.amdhsa_kernel test_amdhsa_next_free_vgpr_missing
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_next_free_sgpr_missing
+// GCN-LABEL: warning: test_amdhsa_next_free_sgpr_missing
// AMDHSA: error: .amdhsa_next_free_sgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_next_free_sgpr_missing"
@@ -72,7 +72,7 @@
.amdhsa_next_free_vgpr 0
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_wavefront_size32
+// GCN-LABEL: warning: test_amdhsa_wavefront_size32
// NONGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
@@ -81,7 +81,7 @@
.amdhsa_wavefront_size32 1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_wavefront_size32_invalid
+// GCN-LABEL: warning: test_amdhsa_wavefront_size32_invalid
// NONGFX10: error: directive requires gfx10+
// GFX10: error: value out of range
// NONAMDHSA: error: unknown directive
@@ -90,7 +90,7 @@
.amdhsa_wavefront_size32 5
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_workgroup_processor_mode
+// GCN-LABEL: warning: test_amdhsa_workgroup_processor_mode
// NONGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
@@ -99,7 +99,7 @@
.amdhsa_workgroup_processor_mode 1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_workgroup_processor_mode_invalid
+// GCN-LABEL: warning: test_amdhsa_workgroup_processor_mode_invalid
// NONGFX10: error: directive requires gfx10+
// GFX10: error: value out of range
// NONAMDHSA: error: unknown directive
@@ -108,7 +108,7 @@
.amdhsa_workgroup_processor_mode 5
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_memory_ordered
+// GCN-LABEL: warning: test_amdhsa_memory_ordered
// NONGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
@@ -117,7 +117,7 @@
.amdhsa_memory_ordered 1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_memory_ordered_invalid
+// GCN-LABEL: warning: test_amdhsa_memory_ordered_invalid
// NONGFX10: error: directive requires gfx10+
// GFX10: error: value out of range
// NONAMDHSA: error: unknown directive
@@ -126,7 +126,7 @@
.amdhsa_memory_ordered 5
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_forward_progress
+// GCN-LABEL: warning: test_amdhsa_forward_progress
// NONGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
@@ -135,7 +135,7 @@
.amdhsa_forward_progress 1
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_amdhsa_forward_progress_invalid
+// GCN-LABEL: warning: test_amdhsa_forward_progress_invalid
// NONGFX10: error: directive requires gfx10+
// GFX10: error: value out of range
// NONAMDHSA: error: unknown directive
@@ -144,12 +144,12 @@
.amdhsa_forward_progress 5
.end_amdhsa_kernel
-// ALL-LABEL: warning: test_next_free_vgpr_invalid
+// GCN-LABEL: warning: test_next_free_vgpr_invalid
// AMDHSA: error: .amdgcn.next_free_{v,s}gpr symbols must be absolute expressions
// NONAMDHSA-NOT: error:
.warning "test_next_free_vgpr_invalid"
.set .amdgcn.next_free_vgpr, "foo"
v_mov_b32_e32 v0, s0
-// ALL-LABEL: warning: test_end
+// GCN-LABEL: warning: test_end
.warning "test_end"
More information about the llvm-commits
mailing list