[llvm][NFC] Make test less brittle

[urnathan]

Summary

This test checks attributes by looking at the attribute dump. That's both brittle and won't detect (some kinds of) attribute changes on functions.

The attribute tests are unnecessary -- delete them

[nikic]

I didn't add those, and they shouldn't be there. You can just delete these check lines.

[urnathan]

Updated diff to check the attribute table via CHECK-DAG. This is now checking more than before.

[urnathan]

In D156600#4544482, @nikic wrote:

I didn't add those, and they shouldn't be there. You can just delete these check lines.

Oh, wilco, and sigh, need to get phabricator to tell me I have replies :)

[urnathan]

Here you go, ok? -- I'm gonna blame git blame :)

[nikic]

LGTM

llvm/test/Analysis/BasicAA/cs-cs.ll

-; RUN: opt < %s -aa-pipeline=basic-aa -passes=aa-eval -print-all-alias-modref-info -S 2>&1 | FileCheck %s
+; RUN: opt < %s -aa-pipeline=basic-aa -passes=aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:64-v128:32:128-a0:0:32-n32"
 target triple = "arm-apple-ios"
 
 declare void @llvm.memset.p0.i64(ptr nocapture writeonly, i8, i64, i1) #0
 declare void @llvm.memcpy.p0.p0.i64(ptr nocapture writeonly, ptr nocapture readonly, i64, i1) #0
 declare void @llvm.memcpy.element.unordered.atomic.p0.p0.i64(ptr nocapture writeonly, ptr nocapture readonly, i64, i32) #0
 
 declare void @a_readonly_func(ptr) #1

 ; CHECK: Both ModRef:   call void @an_inaccessibleorargmemonly_func(ptr %q) #11 [ "unknown"() ] <->   call void @a_readonly_func(ptr %p) #9 [ "unknown"() ]
 ; CHECK: Both ModRef:   call void @an_inaccessibleorargmemonly_func(ptr %q) #11 [ "unknown"() ] <->   call void @an_inaccessiblememonly_func() #10 [ "unknown"() ]
 ; CHECK: Both ModRef:   call void @an_inaccessibleorargmemonly_func(ptr %q) #11 [ "unknown"() ] <->   call void @an_argmemonly_func(ptr %q) #12 [ "unknown"() ]
 ; CHECK: Both ModRef:   call void @an_argmemonly_func(ptr %q) #12 [ "unknown"() ] <->   call void @a_readonly_func(ptr %p) #9 [ "unknown"() ]
 ; CHECK: NoModRef:   call void @an_argmemonly_func(ptr %q) #12 [ "unknown"() ] <->   call void @an_inaccessiblememonly_func() #10 [ "unknown"() ]
 ; CHECK: Both ModRef:   call void @an_argmemonly_func(ptr %q) #12 [ "unknown"() ] <->   call void @an_inaccessibleorargmemonly_func(ptr %q) #11 [ "unknown"() ]
 }
 
-
-; CHECK:      attributes #0 = { nocallback nofree nounwind willreturn memory(argmem: write) }
-; CHECK-NEXT: attributes #1 = { nocallback nofree nounwind willreturn memory(argmem: readwrite) }
-; CHECK-NEXT: attributes #2 = { nosync nounwind willreturn memory(argmem: readwrite) }
-; CHECK-NEXT: attributes #3 = { noinline nounwind memory(read) }
-; CHECK-NEXT: attributes #4 = { noinline nounwind memory(write) }
-; CHECK-NEXT: attributes #5 = { nounwind ssp }
-; CHECK-NEXT: attributes #6 = { nounwind memory(inaccessiblemem: readwrite) }
-; CHECK-NEXT: attributes #7 = { nounwind memory(argmem: readwrite, inaccessiblemem: readwrite) }
-; CHECK-NEXT: attributes #8 = { nounwind memory(argmem: readwrite) }
-; CHECK-NEXT: attributes #9 = { memory(read) }
-; CHECK-NEXT: attributes #10 = { memory(inaccessiblemem: readwrite) }
-; CHECK-NEXT: attributes #11 = { memory(argmem: readwrite, inaccessiblemem: readwrite) }
-; CHECK-NEXT: attributes #12 = { memory(argmem: readwrite) }
-
 attributes #0 = { argmemonly nounwind }
 attributes #1 = { noinline nounwind readonly }
 attributes #2 = { noinline nounwind writeonly }
 attributes #3 = { nounwind ssp }
 attributes #4 = { inaccessiblememonly nounwind }
 attributes #5 = { inaccessiblemem_or_argmemonly nounwind }
 attributes #6 = { readonly }
 attributes #7 = { inaccessiblememonly }
 attributes #8 = { inaccessiblemem_or_argmemonly }
 attributes #9 = { argmemonly }