From 6121190b8ccca293632a0ba24a3344938dc2d705 Mon Sep 17 00:00:00 2001 From: Mariya Podchishchaeva Date: Fri, 3 Mar 2023 05:02:22 -0500 Subject: [PATCH] [NFC] Refine tests by adding `:` to checks The tests can fail if working directory where the tests were launched has a `error` substring in its path. Reviewed By: jhenderson, foad Differential Revision: https://reviews.llvm.org/D144562 --- llvm/test/MC/AMDGPU/gfx11_asm_vop1_t16_err.s | 4 ++-- llvm/test/MC/AMDGPU/gfx11_asm_vop2_t16_err.s | 4 ++-- llvm/test/MC/AMDGPU/gfx11_asm_vop3_err.s | 4 ++-- llvm/test/MC/AMDGPU/gfx11_asm_vopc_t16_err.s | 2 +- llvm/test/MC/AMDGPU/gfx11_asm_vopcx_t16_err.s | 2 +- llvm/test/MC/ARM/thumb-branches.s | 8 ++++---- llvm/test/MC/ARM/thumb2-branch-ranges.s | 8 ++++---- llvm/test/MC/Hexagon/PacketRules/hvx_vshuff_vdeal.s | 2 +- llvm/test/MC/Hexagon/c4_newval.s | 2 +- llvm/test/MC/Hexagon/multiple-pc4.s | 2 +- llvm/test/MC/Hexagon/zreg-post-inc.s | 2 +- llvm/test/TableGen/GICombinerEmitter/defs-invalid.td | 2 +- llvm/test/TableGen/GICombinerEmitter/match-invalid.td | 2 +- llvm/test/tools/llvm-dwarfdump/X86/debug_tls_relocs.s | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop1_t16_err.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop1_t16_err.s index f18fdf3..2ebb06f 100644 --- a/llvm/test/MC/AMDGPU/gfx11_asm_vop1_t16_err.s +++ b/llvm/test/MC/AMDGPU/gfx11_asm_vop1_t16_err.s @@ -1,5 +1,5 @@ -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,-wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=-wavefrontsize32,+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,-wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=-wavefrontsize32,+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s v_ceil_f16_e32 v128, 0xfe0b // GFX11: :[[@LINE-1]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop2_t16_err.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop2_t16_err.s index c226280..d4bf86f 100644 --- a/llvm/test/MC/AMDGPU/gfx11_asm_vop2_t16_err.s +++ b/llvm/test/MC/AMDGPU/gfx11_asm_vop2_t16_err.s @@ -1,5 +1,5 @@ -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,-wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=-wavefrontsize32,+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,-wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=-wavefrontsize32,+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s v_add_f16_e32 v255, v1, v2 // GFX11: :[[@LINE-1]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vop3_err.s b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_err.s index 14c27d5..f1189d0 100644 --- a/llvm/test/MC/AMDGPU/gfx11_asm_vop3_err.s +++ b/llvm/test/MC/AMDGPU/gfx11_asm_vop3_err.s @@ -1,5 +1,5 @@ -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,-wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=-wavefrontsize32,+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize32,-wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=-wavefrontsize32,+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s v_permlane16_b32 v5, v1, s2, s3 op_sel:[0, 0, 0, 1] // GFX11: :[[@LINE-1]]:{{[0-9]+}}: error: invalid op_sel operand diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vopc_t16_err.s b/llvm/test/MC/AMDGPU/gfx11_asm_vopc_t16_err.s index aa58d3a..d3de2cb 100644 --- a/llvm/test/MC/AMDGPU/gfx11_asm_vopc_t16_err.s +++ b/llvm/test/MC/AMDGPU/gfx11_asm_vopc_t16_err.s @@ -1,4 +1,4 @@ -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s v_cmp_class_f16_e32 vcc, v1, v255 // GFX11: :[[@LINE-1]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode diff --git a/llvm/test/MC/AMDGPU/gfx11_asm_vopcx_t16_err.s b/llvm/test/MC/AMDGPU/gfx11_asm_vopcx_t16_err.s index ae959d6..0cea363 100644 --- a/llvm/test/MC/AMDGPU/gfx11_asm_vopcx_t16_err.s +++ b/llvm/test/MC/AMDGPU/gfx11_asm_vopcx_t16_err.s @@ -1,4 +1,4 @@ -// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error %s +// RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1100 -mattr=+wavefrontsize64 -show-encoding %s 2>&1 | FileCheck --check-prefix=GFX11 --implicit-check-not=error: %s v_cmpx_class_f16_e32 v1, v255 // GFX11: :[[@LINE-1]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode diff --git a/llvm/test/MC/ARM/thumb-branches.s b/llvm/test/MC/ARM/thumb-branches.s index 68bf550..c9e1660 100644 --- a/llvm/test/MC/ARM/thumb-branches.s +++ b/llvm/test/MC/ARM/thumb-branches.s @@ -11,7 +11,7 @@ bl shortend .space 0x3fffff shortend: -// CHECKSHORT-NOT: error +// CHECKSHORT-NOT: error: // CHECKSHORT: [[@LINE+1]]:{{[0-9]}}: error: Relocation out of range bl shortend2 .space 0x400000 @@ -31,8 +31,8 @@ end2: .global end3 end3: -// CHECK-NOT: error -// CHECKSHORT-NOT: error +// CHECK-NOT: error: +// CHECKSHORT-NOT: error: // CHECKSHORT: [[@LINE+2]]:{{[0-9]}}: error: Relocation out of range // CHECK: [[@LINE+1]]:{{[0-9]}}: error: Relocation out of range bl end4 @@ -63,7 +63,7 @@ start3: .space 0xfffffd bl start3 -// CHECK-NOT: error +// CHECK-NOT: error: start4: .space 0xfffffd // CHECK: [[@LINE+2]]:{{[0-9]}}: error: Relocation out of range diff --git a/llvm/test/MC/ARM/thumb2-branch-ranges.s b/llvm/test/MC/ARM/thumb2-branch-ranges.s index 83cb025..fc8044a 100644 --- a/llvm/test/MC/ARM/thumb2-branch-ranges.s +++ b/llvm/test/MC/ARM/thumb2-branch-ranges.s @@ -25,7 +25,7 @@ end3: bx lr .thumb // branch to thumb function is resolved at assembly time -// CHECK-NOT: error +// CHECK-NOT: error: // CHECK: [[@LINE+2]]:{{[0-9]}}: error: Relocation out of range // CHECK-LABEL: b.w end4 b.w end4 @@ -46,7 +46,7 @@ end6: bx lr .thumb // conditional branch to thumb function resolved at assembly time -// CHECK-NOT: error +// CHECK-NOT: error: // CHECK: [[@LINE+2]]:{{[0-9]}}: error: Relocation out of range // CHECK-LABEL: beq.w end7 beq.w end7 @@ -69,7 +69,7 @@ start2: start3: .space 0x1000000 // branch to thumb function resolved at assembly time -// CHECK-NOT: error +// CHECK-NOT: error: // CHECK: [[@LINE+2]]:{{[0-9]}}: error: Relocation out of range // CHECK-LABEL: b.w start3 b.w start3 @@ -90,7 +90,7 @@ start5: start6: .space 0x100000 // branch to thumb function resolved at assembly time -// CHECK-NOT: error +// CHECK-NOT: error: // CHECK: [[@LINE+2]]:{{[0-9]}}: error: Relocation out of range // CHECK-LABEL: beq.w start6 beq.w start6 diff --git a/llvm/test/MC/Hexagon/PacketRules/hvx_vshuff_vdeal.s b/llvm/test/MC/Hexagon/PacketRules/hvx_vshuff_vdeal.s index fc8a424..028062f 100644 --- a/llvm/test/MC/Hexagon/PacketRules/hvx_vshuff_vdeal.s +++ b/llvm/test/MC/Hexagon/PacketRules/hvx_vshuff_vdeal.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc -arch=hexagon -mv65 -mhvx -filetype=obj -o %t %s 2>&1 | FileCheck --implicit-check-not=error %s +# RUN: not llvm-mc -arch=hexagon -mv65 -mhvx -filetype=obj -o %t %s 2>&1 | FileCheck --implicit-check-not=error: %s { v1 = v2; vshuff(v1,v3,r0) } # CHECK: error: register `V1' modified more than once diff --git a/llvm/test/MC/Hexagon/c4_newval.s b/llvm/test/MC/Hexagon/c4_newval.s index f569aec..356a369 100644 --- a/llvm/test/MC/Hexagon/c4_newval.s +++ b/llvm/test/MC/Hexagon/c4_newval.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc -arch=hexagon %s 2>%t; FileCheck --implicit-check-not=error %s <%t +# RUN: not llvm-mc -arch=hexagon %s 2>%t; FileCheck --implicit-check-not=error: %s <%t .Lfoo: { p3:0 = r0 diff --git a/llvm/test/MC/Hexagon/multiple-pc4.s b/llvm/test/MC/Hexagon/multiple-pc4.s index d5eb988..6979919 100644 --- a/llvm/test/MC/Hexagon/multiple-pc4.s +++ b/llvm/test/MC/Hexagon/multiple-pc4.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -arch=hexagon -filetype=asm %s 2>%t; FileCheck --implicit-check-not=error %s <%t +# RUN: llvm-mc -arch=hexagon -filetype=asm %s 2>%t; FileCheck --implicit-check-not=error: %s <%t # Check that multiple changes to a predicate in a packet are caught. diff --git a/llvm/test/MC/Hexagon/zreg-post-inc.s b/llvm/test/MC/Hexagon/zreg-post-inc.s index 346bec1..696e18d 100644 --- a/llvm/test/MC/Hexagon/zreg-post-inc.s +++ b/llvm/test/MC/Hexagon/zreg-post-inc.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc -arch=hexagon -filetype=obj -mhvx -mcpu=hexagonv66 %s 2> %t; FileCheck --implicit-check-not=error %s <%t +# RUN: not llvm-mc -arch=hexagon -filetype=obj -mhvx -mcpu=hexagonv66 %s 2> %t; FileCheck --implicit-check-not=error: %s <%t { if (p0) memb(r14+#8)=r4.new diff --git a/llvm/test/TableGen/GICombinerEmitter/defs-invalid.td b/llvm/test/TableGen/GICombinerEmitter/defs-invalid.td index fe11ef4..b2d2f95 100644 --- a/llvm/test/TableGen/GICombinerEmitter/defs-invalid.td +++ b/llvm/test/TableGen/GICombinerEmitter/defs-invalid.td @@ -1,6 +1,6 @@ // RUN: not llvm-tblgen -I %p/../../../include -gen-global-isel-combiner \ // RUN: -combiners=MyCombiner %s 2>&1 | \ -// RUN: FileCheck -implicit-check-not=error %s +// RUN: FileCheck -implicit-check-not=error: %s include "llvm/Target/Target.td" include "llvm/Target/GlobalISel/Combine.td" diff --git a/llvm/test/TableGen/GICombinerEmitter/match-invalid.td b/llvm/test/TableGen/GICombinerEmitter/match-invalid.td index 8d7ed80..c69018b 100644 --- a/llvm/test/TableGen/GICombinerEmitter/match-invalid.td +++ b/llvm/test/TableGen/GICombinerEmitter/match-invalid.td @@ -1,6 +1,6 @@ // RUN: not llvm-tblgen -I %p/../../../include -gen-global-isel-combiner \ // RUN: -combiners=MyCombiner %s 2>&1 | \ -// RUN: FileCheck -implicit-check-not=error %s +// RUN: FileCheck -implicit-check-not=error: %s include "llvm/Target/Target.td" include "llvm/Target/GlobalISel/Combine.td" diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_tls_relocs.s b/llvm/test/tools/llvm-dwarfdump/X86/debug_tls_relocs.s index d432ecf..769113a 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug_tls_relocs.s +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_tls_relocs.s @@ -1,7 +1,7 @@ # RUN: llvm-mc %s -filetype obj -triple x86_64-pc-linux -o %t.o # RUN: llvm-dwarfdump -v %t.o | FileCheck %s -# CHECK-NOT: error +# CHECK-NOT: error: # CHECK: DW_AT_location [DW_FORM_exprloc] (DW_OP_const8u 0x0, DW_OP_GNU_push_tls_address) # CHECK: DW_AT_location [DW_FORM_exprloc] (DW_OP_const4u 0x0, DW_OP_GNU_push_tls_address) -- 2.7.4