[llvm] r262054 - Fix tests that used CHECK-NEXT-NOT and CHECK-DAG-NOT.
Paul Robinson via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 26 11:40:35 PST 2016
Author: probinson
Date: Fri Feb 26 13:40:34 2016
New Revision: 262054
URL: http://llvm.org/viewvc/llvm-project?rev=262054&view=rev
Log:
Fix tests that used CHECK-NEXT-NOT and CHECK-DAG-NOT.
FileCheck actually doesn't support combo suffixes.
Differential Revision: http://reviews.llvm.org/D17588
Modified:
llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll
llvm/trunk/test/CodeGen/AArch64/remat.ll
llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll
llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll
llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll
llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll
llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll
llvm/trunk/test/Transforms/GVN/pre-gep-load.ll
llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll
llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll
llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll
llvm/trunk/test/tools/dsymutil/absolute_symbol.test
Modified: llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll (original)
+++ llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll Fri Feb 26 13:40:34 2016
@@ -6,8 +6,8 @@
; recip = 1.0 / D; a * recip; b * recip; c * recip;
define void @three_fdiv_float(float %D, float %a, float %b, float %c) #0 {
; CHECK-LABEL: three_fdiv_float:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv s
+; CHECK-NOT: fdiv
; CHECK: fmul
; CHECK: fmul
; CHECK: fmul
@@ -20,8 +20,8 @@ define void @three_fdiv_float(float %D,
define void @three_fdiv_double(double %D, double %a, double %b, double %c) #0 {
; CHECK-LABEL: three_fdiv_double:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv d
+; CHECK-NOT: fdiv
; CHECK: fmul
; CHECK: fmul
; CHECK: fmul
@@ -34,8 +34,8 @@ define void @three_fdiv_double(double %D
define void @three_fdiv_4xfloat(<4 x float> %D, <4 x float> %a, <4 x float> %b, <4 x float> %c) #0 {
; CHECK-LABEL: three_fdiv_4xfloat:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv v
+; CHECK-NOT: fdiv
; CHECK: fmul
; CHECK: fmul
; CHECK: fmul
@@ -48,8 +48,8 @@ define void @three_fdiv_4xfloat(<4 x flo
define void @three_fdiv_2xdouble(<2 x double> %D, <2 x double> %a, <2 x double> %b, <2 x double> %c) #0 {
; CHECK-LABEL: three_fdiv_2xdouble:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv v
+; CHECK-NOT: fdiv
; CHECK: fmul
; CHECK: fmul
; CHECK: fmul
@@ -64,9 +64,9 @@ define void @three_fdiv_2xdouble(<2 x do
; calculates a reciprocal.
define void @two_fdiv_float(float %D, float %a, float %b) #0 {
; CHECK-LABEL: two_fdiv_float:
-; CHECK: fdiv
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fmul
+; CHECK: fdiv s
+; CHECK: fdiv s
+; CHECK-NOT: fmul
%div = fdiv float %a, %D
%div1 = fdiv float %b, %D
tail call void @foo_2f(float %div, float %div1)
@@ -75,9 +75,9 @@ define void @two_fdiv_float(float %D, fl
define void @two_fdiv_double(double %D, double %a, double %b) #0 {
; CHECK-LABEL: two_fdiv_double:
-; CHECK: fdiv
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fmul
+; CHECK: fdiv d
+; CHECK: fdiv d
+; CHECK-NOT: fmul
%div = fdiv double %a, %D
%div1 = fdiv double %b, %D
tail call void @foo_2d(double %div, double %div1)
Modified: llvm/trunk/test/CodeGen/AArch64/remat.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/remat.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AArch64/remat.ll (original)
+++ llvm/trunk/test/CodeGen/AArch64/remat.ll Fri Feb 26 13:40:34 2016
@@ -12,9 +12,11 @@ entry:
%tmp = alloca %X
call void @f(%X* %tmp)
; CHECK: add x0, sp, #8
-; CHECK-NEXT-NOT: mov
+; CHECK-NOT: mov
+; CHECK-NEXT: bl f
call void @f(%X* %tmp)
; CHECK: add x0, sp, #8
-; CHECK-NEXT-NOT: mov
+; CHECK-NOT: mov
+; CHECK-NEXT: bl f
ret void
}
Modified: llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll (original)
+++ llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll Fri Feb 26 13:40:34 2016
@@ -16,7 +16,7 @@
; CHECK-LABEL: LBB0_1
; CHECK: [[DST:r[0-9]+]] = [[SRC:r[0-9]+]]
; CHECK-DAG: memw([[SRC]]
-; CHECK-DAG-NOT: memw([[DST]]
+; CHECK-NOT: memw([[DST]]
; CHECK-LABEL: LBB0_2
target datalayout = "e-p:32:32:32-i64:64:64-i32:32:32-i16:16:16-i1:32:32-f64:64:64-f32:32:32-v64:64:64-v32:32:32-a0:0-n16:32"
Modified: llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll (original)
+++ llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll Fri Feb 26 13:40:34 2016
@@ -7,7 +7,7 @@
; CHECK: = add(pc, ##_GLOBAL_OFFSET_TABLE_ at PCREL)
; CHECK-DAG: = ##src_ie at IEGOT
; CHECK-DAG: = ##dst_ie at IEGOT
-; CHECK-DAG-NOT: call
+; CHECK-NOT: call
define i32 @test_initial_exec() nounwind {
entry:
%0 = load i32, i32* @src_ie, align 4
Modified: llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll Fri Feb 26 13:40:34 2016
@@ -9,8 +9,8 @@ target triple = "powerpc64-unknown-linux
define void @three_fdiv_double(double %D, double %a, double %b, double %c) #0 {
; CHECK-LABEL: three_fdiv_double:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv {{[0-9]}}
+; CHECK-NOT: fdiv
; CHECK: fmul
; CHECK: fmul
; CHECK: fmul
@@ -23,9 +23,9 @@ define void @three_fdiv_double(double %D
define void @two_fdiv_double(double %D, double %a, double %b) #0 {
; CHECK-LABEL: two_fdiv_double:
-; CHECK: fdiv
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fmul
+; CHECK: fdiv {{[0-9]}}
+; CHECK: fdiv {{[0-9]}}
+; CHECK-NOT: fmul
%div = fdiv double %a, %D
%div1 = fdiv double %b, %D
tail call void @foo_2d(double %div, double %div1)
Modified: llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll (original)
+++ llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll Fri Feb 26 13:40:34 2016
@@ -70,7 +70,7 @@ entry:
;V8: {{fbe|fbne}}
;V9-LABEL: test_select_int_fcc:
;V9: fcmps
-;V9-NEXT-NOT: nop
+;V9-NOT: nop
;V9-NOT: {{fbe|fbne}}
;V9: mov{{e|ne}} %fcc0
%0 = fcmp une float %f, 0.000000e+00
@@ -101,7 +101,7 @@ entry:
;V8: {{fbne|fbe}}
;V9-LABEL: test_select_dfp_fcc:
;V9: fcmpd
-;V9-NEXT-NOT: nop
+;V9-NOT: nop
;V9-NOT: {{fbne|fbe}}
;V9: fmovd{{e|ne}} %fcc0
%0 = fcmp une double %f, 0.000000e+00
Modified: llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll Fri Feb 26 13:40:34 2016
@@ -10,7 +10,7 @@ define i32 @f() {
entry:
; CHECK-LABEL: f:
; CHECK: ldm r[[BASE:[0-9]]],
-; CHECK-NEXT-NOT: subs r[[BASE]]
+; CHECK-NOT: subs r[[BASE]]
%0 = load i32, i32* getelementptr inbounds (%struct.S, %struct.S* @s, i32 0, i32 0), align 4
%1 = load i32, i32* getelementptr inbounds (%struct.S, %struct.S* @s, i32 0, i32 1), align 4
%cmp = icmp sgt i32 %0, %1
Modified: llvm/trunk/test/Transforms/GVN/pre-gep-load.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/pre-gep-load.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/pre-gep-load.ll (original)
+++ llvm/trunk/test/Transforms/GVN/pre-gep-load.ll Fri Feb 26 13:40:34 2016
@@ -34,7 +34,7 @@ sw.bb2:
%arrayidx5 = getelementptr inbounds double, double* %2, i64 %idxprom3
%3 = load double, double* %arrayidx5, align 8
; CHECK: sw.bb2:
-; CHECK-NEXT-NOT: sext
+; CHECK-NOT: sext
; CHECK-NEXT: phi double [
; CHECK-NOT: load
%sub6 = fsub double 3.000000e+00, %3
Modified: llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll (original)
+++ llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll Fri Feb 26 13:40:34 2016
@@ -12,7 +12,9 @@
; CHECK-NEXT: fadd
; CHECK-NEXT: fadd
; CHECK-NEXT: fadd
-; CHECK-NEXT-NOT: fadd
+; CHECK-NEXT: =
+; CHECK-NOT: fadd
+; CHECK-SAME: >
target datalayout = "e-m:e-i64:64-n32:64"
target triple = "powerpc64le-ibm-linux-gnu"
Modified: llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll (original)
+++ llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll Fri Feb 26 13:40:34 2016
@@ -12,7 +12,9 @@
; CHECK-NEXT: fadd
; CHECK-NEXT: fadd
; CHECK-NEXT: fadd
-; CHECK-NEXT-NOT: fadd
+; CHECK-NEXT: =
+; CHECK-NOT: fadd
+; CHECK-SAME: >
target datalayout = "e-m:e-i64:64-n32:64"
target triple = "powerpc64le-ibm-linux-gnu"
Modified: llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll (original)
+++ llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll Fri Feb 26 13:40:34 2016
@@ -48,7 +48,7 @@ cond.false57:
; CHECK-LABEL: invoketest
; CHECK-LABEL: cond.end60
-; CHECK-NEXT-NOT: phi <2 x double>
+; CHECK-NOT: phi <2 x double>
; CHECK: insertelement
; CHECK-LABEL: if.then63
Modified: llvm/trunk/test/tools/dsymutil/absolute_symbol.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/absolute_symbol.test?rev=262054&r1=262053&r2=262054&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/absolute_symbol.test (original)
+++ llvm/trunk/test/tools/dsymutil/absolute_symbol.test Fri Feb 26 13:40:34 2016
@@ -14,4 +14,4 @@ We must not consider this symbol for deb
might conflict with other real symbols in the same file.
CHECK: objc_class_name_Foo
-CHECK-SAME-NOT: objAddr
+CHECK-NOT: objAddr
More information about the llvm-commits
mailing list