From 65ab102be3dfde9e3239ac9d08efdbcd7041f261 Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Fri, 26 Feb 2016 19:34:01 +0000 Subject: [PATCH] Fix Clang tests that used CHECK-NEXT-NOT and CHECK-DAG-NOT. FileCheck actually doesn't support combo suffixes. Differential Revision: http://reviews.llvm.org/D17589 llvm-svn: 262052 --- clang/test/CodeGen/aarch64-fix-cortex-a53-835769.c | 2 +- clang/test/CodeGen/alias.c | 6 +++--- clang/test/CodeGenOpenCL/amdgpu-num-gpr-attr.cl | 4 ++-- clang/test/Driver/hexagon-toolchain-elf.c | 6 +++--- clang/test/SemaCXX/pragma-optimize.cpp | 22 +++++++++++----------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/clang/test/CodeGen/aarch64-fix-cortex-a53-835769.c b/clang/test/CodeGen/aarch64-fix-cortex-a53-835769.c index 7ad1240..c6a38b2 100644 --- a/clang/test/CodeGen/aarch64-fix-cortex-a53-835769.c +++ b/clang/test/CodeGen/aarch64-fix-cortex-a53-835769.c @@ -23,5 +23,5 @@ int64_t f_load_madd_64(int64_t a, int64_t b, int64_t *c) { // CHECK: ldr // CHECK-YES-NEXT: nop -// CHECK-NO-NEXT-NOT: nop +// CHECK-NO-NOT: nop // CHECK-NEXT: madd diff --git a/clang/test/CodeGen/alias.c b/clang/test/CodeGen/alias.c index a14bc0e..c34dcf5 100644 --- a/clang/test/CodeGen/alias.c +++ b/clang/test/CodeGen/alias.c @@ -24,20 +24,20 @@ extern const int __mod_usb_device_table __attribute__ ((alias("wacom_usb_ids"))) // CHECKBASIC-DAG: @__mod_usb_device_table = alias i32, getelementptr inbounds ([8 x i32], [8 x i32]* @wacom_usb_ids, i32 0, i32 0) // CHECKASM-DAG: .globl __mod_usb_device_table // CHECKASM-DAG: __mod_usb_device_table = wacom_usb_ids -// CHECKASM-DAG-NOT: .size __mod_usb_device_table +// CHECKASM-NOT: .size __mod_usb_device_table extern int g1; extern int g1 __attribute((alias("g0"))); // CHECKBASIC-DAG: @g1 = alias i32, i32* @g0 // CHECKASM-DAG: .globl g1 // CHECKASM-DAG: g1 = g0 -// CHECKASM-DAG-NOT: .size g1 +// CHECKASM-NOT: .size g1 extern __thread int __libc_errno __attribute__ ((alias ("TL_WITH_ALIAS"))); // CHECKBASIC-DAG: @__libc_errno = thread_local alias i32, i32* @TL_WITH_ALIAS // CHECKASM-DAG: .globl __libc_errno // CHECKASM-DAG: __libc_errno = TL_WITH_ALIAS -// CHECKASM-DAG-NOT: .size __libc_errno +// CHECKASM-NOT: .size __libc_errno void f0(void) { } extern void f1(void); diff --git a/clang/test/CodeGenOpenCL/amdgpu-num-gpr-attr.cl b/clang/test/CodeGenOpenCL/amdgpu-num-gpr-attr.cl index 35bdcea..d2ecc7a 100644 --- a/clang/test/CodeGenOpenCL/amdgpu-num-gpr-attr.cl +++ b/clang/test/CodeGenOpenCL/amdgpu-num-gpr-attr.cl @@ -40,8 +40,8 @@ kernel void test_num_vgpr0_sgpr0() { // X86-NOT: "amdgpu_num_vgpr" // X86-NOT: "amdgpu_num_sgpr" -// CHECK-DAG-NOT: "amdgpu_num_vgpr"="0" -// CHECK-DAG-NOT: "amdgpu_num_sgpr"="0" +// CHECK-NOT: "amdgpu_num_vgpr"="0" +// CHECK-NOT: "amdgpu_num_sgpr"="0" // CHECK-DAG: attributes [[ATTR_VGPR64]] = { nounwind "amdgpu_num_vgpr"="64" // CHECK-DAG: attributes [[ATTR_SGPR32]] = { nounwind "amdgpu_num_sgpr"="32" // CHECK-DAG: attributes [[ATTR_VGPR64_SGPR32]] = { nounwind "amdgpu_num_sgpr"="32" "amdgpu_num_vgpr"="64" diff --git a/clang/test/Driver/hexagon-toolchain-elf.c b/clang/test/Driver/hexagon-toolchain-elf.c index e3a54dd..c2907dc 100644 --- a/clang/test/Driver/hexagon-toolchain-elf.c +++ b/clang/test/Driver/hexagon-toolchain-elf.c @@ -41,7 +41,7 @@ // RUN: %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK012 %s // CHECK012: "-cc1" -// CHECK012-DAG-NOT: "-internal-isystem" +// CHECK012-NOT: "-internal-isystem" // CHECK012-DAG: "-internal-externc-isystem" "{{.*}}/Inputs/hexagon_tree/Tools/bin/../target/hexagon/include" // RUN: %clangxx -### -target hexagon-unknown-elf -fno-integrated-as \ @@ -51,8 +51,8 @@ // RUN: %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK013 %s // CHECK013: "-cc1" -// CHECK013-DAG-NOT: "-internal-isystem" -// CHECK013-DAG-NOT: "-internal-externc-isystem" +// CHECK013-NOT: "-internal-isystem" +// CHECK013-NOT: "-internal-externc-isystem" // ----------------------------------------------------------------------------- // Test -mcpu= -mv diff --git a/clang/test/SemaCXX/pragma-optimize.cpp b/clang/test/SemaCXX/pragma-optimize.cpp index 48a1546..cda46c5 100644 --- a/clang/test/SemaCXX/pragma-optimize.cpp +++ b/clang/test/SemaCXX/pragma-optimize.cpp @@ -151,14 +151,14 @@ int yet_another_normal(int x) { // CHECK-DAG: attributes [[ATTRYETANOTHEROPTNONE]] = { {{.*}}noinline{{.*}}optnone{{.*}} } // Check that the other functions do NOT have optnone. -// CHECK-DAG-NOT: attributes [[ATTRFOO]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRBAZ]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRBAX]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRWOMBAT]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRCONTAINER]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRTWICE]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRCONTAINER2]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRCONTAINER3]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRTHRICEINT]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRANOTHERNORMAL]] = { {{.*}}optnone{{.*}} } -// CHECK-DAG-NOT: attributes [[ATTRYETANOTHERNORMAL]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRFOO]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRBAZ]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRBAX]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRWOMBAT]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRCONTAINER]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRTWICE]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRCONTAINER2]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRCONTAINER3]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRTHRICEINT]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRANOTHERNORMAL]] = { {{.*}}optnone{{.*}} } +// CHECK-NOT: attributes [[ATTRYETANOTHERNORMAL]] = { {{.*}}optnone{{.*}} } -- 2.7.4