From 9e81c3bdb216e7ca457acf6614591e5b807cf70c Mon Sep 17 00:00:00 2001 From: Manman Ren Date: Fri, 27 Sep 2013 18:34:27 +0000 Subject: TBAA: handle scalar TBAA format and struct-path aware TBAA format. Remove the command line argument "struct-path-tbaa" since we should not depend on command line argument to decide which format the IR file is using. Instead, we check the first operand of the tbaa tag node, if it is a MDNode, we treat it as struct-path aware TBAA format, otherwise, we treat it as scalar TBAA format. When clang starts to use struct-path aware TBAA format no matter whether struct-path-tbaa is no, and we can auto-upgrade existing bc files, the support for scalar TBAA format can be dropped. Existing testing cases are updated to use the struct-path aware TBAA format. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191538 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Transforms/GVN/preserve-tbaa.ll | 3 ++- test/Transforms/GVN/tbaa.ll | 28 +++++++++++++++------- test/Transforms/InstCombine/store.ll | 3 ++- test/Transforms/InstCombine/struct-assign-tbaa.ll | 6 +++-- test/Transforms/JumpThreading/thread-loads.ll | 4 ++-- .../LICM/2011-04-06-PromoteResultOfPromotion.ll | 6 +++-- test/Transforms/LICM/promote-order.ll | 6 +++-- test/Transforms/LICM/scalar_promote.ll | 6 +++-- 8 files changed, 41 insertions(+), 21 deletions(-) (limited to 'test/Transforms') diff --git a/test/Transforms/GVN/preserve-tbaa.ll b/test/Transforms/GVN/preserve-tbaa.ll index e52772bfd9..c52ed96c23 100644 --- a/test/Transforms/GVN/preserve-tbaa.ll +++ b/test/Transforms/GVN/preserve-tbaa.ll @@ -25,6 +25,7 @@ for.end: ; preds = %for.body, %entry ret void } -!0 = metadata !{metadata !"short", metadata !1} +!0 = metadata !{metadata !3, metadata !3, i64 0} !1 = metadata !{metadata !"omnipotent char", metadata !2} !2 = metadata !{metadata !"Simple C/C++ TBAA", null} +!3 = metadata !{metadata !"short", metadata !1} diff --git a/test/Transforms/GVN/tbaa.ll b/test/Transforms/GVN/tbaa.ll index 85fe39a93b..d6412fce59 100644 --- a/test/Transforms/GVN/tbaa.ll +++ b/test/Transforms/GVN/tbaa.ll @@ -13,7 +13,7 @@ define i32 @test1(i8* %p, i8* %q) { define i32 @test2(i8* %p, i8* %q) { ; CHECK: @test2(i8* %p, i8* %q) -; CHECK: call i32 @foo(i8* %p), !tbaa !0 +; CHECK: call i32 @foo(i8* %p), !tbaa [[TAGC:!.*]] ; CHECK: %c = add i32 %a, %a %a = call i32 @foo(i8* %p), !tbaa !0 %b = call i32 @foo(i8* %p), !tbaa !0 @@ -23,7 +23,7 @@ define i32 @test2(i8* %p, i8* %q) { define i32 @test3(i8* %p, i8* %q) { ; CHECK: @test3(i8* %p, i8* %q) -; CHECK: call i32 @foo(i8* %p), !tbaa !3 +; CHECK: call i32 @foo(i8* %p), !tbaa [[TAGB:!.*]] ; CHECK: %c = add i32 %a, %a %a = call i32 @foo(i8* %p), !tbaa !3 %b = call i32 @foo(i8* %p), !tbaa !3 @@ -33,7 +33,7 @@ define i32 @test3(i8* %p, i8* %q) { define i32 @test4(i8* %p, i8* %q) { ; CHECK: @test4(i8* %p, i8* %q) -; CHECK: call i32 @foo(i8* %p), !tbaa !1 +; CHECK: call i32 @foo(i8* %p), !tbaa [[TAGA:!.*]] ; CHECK: %c = add i32 %a, %a %a = call i32 @foo(i8* %p), !tbaa !1 %b = call i32 @foo(i8* %p), !tbaa !0 @@ -43,7 +43,7 @@ define i32 @test4(i8* %p, i8* %q) { define i32 @test5(i8* %p, i8* %q) { ; CHECK: @test5(i8* %p, i8* %q) -; CHECK: call i32 @foo(i8* %p), !tbaa !1 +; CHECK: call i32 @foo(i8* %p), !tbaa [[TAGA:!.*]] ; CHECK: %c = add i32 %a, %a %a = call i32 @foo(i8* %p), !tbaa !0 %b = call i32 @foo(i8* %p), !tbaa !1 @@ -53,7 +53,7 @@ define i32 @test5(i8* %p, i8* %q) { define i32 @test6(i8* %p, i8* %q) { ; CHECK: @test6(i8* %p, i8* %q) -; CHECK: call i32 @foo(i8* %p), !tbaa !1 +; CHECK: call i32 @foo(i8* %p), !tbaa [[TAGA:!.*]] ; CHECK: %c = add i32 %a, %a %a = call i32 @foo(i8* %p), !tbaa !0 %b = call i32 @foo(i8* %p), !tbaa !3 @@ -74,8 +74,18 @@ define i32 @test7(i8* %p, i8* %q) { declare i32 @foo(i8*) readonly -!0 = metadata !{metadata !"C", metadata !1} -!1 = metadata !{metadata !"A", metadata !2} +; CHECK: [[TAGC]] = metadata !{metadata [[TYPEC:!.*]], metadata [[TYPEC]], i64 0} +; CHECK: [[TYPEC]] = metadata !{metadata !"C", metadata [[TYPEA:!.*]]} +; CHECK: [[TYPEA]] = metadata !{metadata !"A", metadata !{{.*}}} +; CHECK: [[TAGB]] = metadata !{metadata [[TYPEB:!.*]], metadata [[TYPEB]], i64 0} +; CHECK: [[TYPEB]] = metadata !{metadata !"B", metadata [[TYPEA]]} +; CHECK: [[TAGA]] = metadata !{metadata [[TYPEA]], metadata [[TYPEA]], i64 0} +!0 = metadata !{metadata !5, metadata !5, i64 0} +!1 = metadata !{metadata !6, metadata !6, i64 0} !2 = metadata !{metadata !"tbaa root", null} -!3 = metadata !{metadata !"B", metadata !1} -!4 = metadata !{metadata !"another root", null} +!3 = metadata !{metadata !7, metadata !7, i64 0} +!4 = metadata !{metadata !8, metadata !8, i64 0} +!5 = metadata !{metadata !"C", metadata !6} +!6 = metadata !{metadata !"A", metadata !2} +!7 = metadata !{metadata !"B", metadata !6} +!8 = metadata !{metadata !"another root", null} diff --git a/test/Transforms/InstCombine/store.ll b/test/Transforms/InstCombine/store.ll index 9b666b9dcb..b64c800e54 100644 --- a/test/Transforms/InstCombine/store.ll +++ b/test/Transforms/InstCombine/store.ll @@ -113,7 +113,8 @@ for.end: ; preds = %for.cond ; CHECK-NEXT: store i32 %storemerge, i32* %gi, align 4, !tbaa !0 } -!0 = metadata !{metadata !"int", metadata !1} +!0 = metadata !{metadata !4, metadata !4, i64 0} !1 = metadata !{metadata !"omnipotent char", metadata !2} !2 = metadata !{metadata !"Simple C/C++ TBAA"} !3 = metadata !{metadata !"float", metadata !1} +!4 = metadata !{metadata !"int", metadata !1} diff --git a/test/Transforms/InstCombine/struct-assign-tbaa.ll b/test/Transforms/InstCombine/struct-assign-tbaa.ll index d7a26fabbc..c80e31ae3d 100644 --- a/test/Transforms/InstCombine/struct-assign-tbaa.ll +++ b/test/Transforms/InstCombine/struct-assign-tbaa.ll @@ -35,10 +35,12 @@ define i32 (i8*, i32*, double*)*** @test2() { ret i32 (i8*, i32*, double*)*** %tmp2 } -; CHECK: !0 = metadata !{metadata !"float", metadata !1} +; CHECK: !0 = metadata !{metadata !1, metadata !1, i64 0} +; CHECK: !1 = metadata !{metadata !"float", metadata !2} !0 = metadata !{metadata !"Simple C/C++ TBAA"} !1 = metadata !{metadata !"omnipotent char", metadata !0} -!2 = metadata !{metadata !"float", metadata !0} +!2 = metadata !{metadata !5, metadata !5, i64 0} !3 = metadata !{i64 0, i64 4, metadata !2} !4 = metadata !{i64 0, i64 8, null} +!5 = metadata !{metadata !"float", metadata !0} diff --git a/test/Transforms/JumpThreading/thread-loads.ll b/test/Transforms/JumpThreading/thread-loads.ll index e651f9aab6..e5bf64b9e2 100644 --- a/test/Transforms/JumpThreading/thread-loads.ll +++ b/test/Transforms/JumpThreading/thread-loads.ll @@ -75,7 +75,7 @@ bb3: ; preds = %bb1 ret i32 %res.0 } -!0 = metadata !{metadata !"int", metadata !1} +!0 = metadata !{metadata !3, metadata !3, i64 0} !1 = metadata !{metadata !"omnipotent char", metadata !2} !2 = metadata !{metadata !"Simple C/C++ TBAA", null} - +!3 = metadata !{metadata !"int", metadata !1} diff --git a/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll b/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll index 86c2679b07..7cf7a32355 100644 --- a/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll +++ b/test/Transforms/LICM/2011-04-06-PromoteResultOfPromotion.ll @@ -30,8 +30,10 @@ for.end: ; preds = %for.inc ret void } -!0 = metadata !{metadata !"any pointer", metadata !1} +!0 = metadata !{metadata !5, metadata !5, i64 0} !1 = metadata !{metadata !"omnipotent char", metadata !2} !2 = metadata !{metadata !"Simple C/C++ TBAA", null} !3 = metadata !{metadata !"short", metadata !1} -!4 = metadata !{metadata !"int", metadata !1} +!4 = metadata !{metadata !6, metadata !6, i64 0} +!5 = metadata !{metadata !"any pointer", metadata !1} +!6 = metadata !{metadata !"int", metadata !1} diff --git a/test/Transforms/LICM/promote-order.ll b/test/Transforms/LICM/promote-order.ll index b016265bbb..86f11fe044 100644 --- a/test/Transforms/LICM/promote-order.ll +++ b/test/Transforms/LICM/promote-order.ll @@ -37,5 +37,7 @@ for.end: ; preds = %for.cond.for.end_cr } !0 = metadata !{metadata !"minimal TBAA"} -!1 = metadata !{metadata !"float", metadata !0} -!2 = metadata !{metadata !"int", metadata !0} +!1 = metadata !{metadata !3, metadata !3, i64 0} +!2 = metadata !{metadata !4, metadata !4, i64 0} +!3 = metadata !{metadata !"float", metadata !0} +!4 = metadata !{metadata !"int", metadata !0} diff --git a/test/Transforms/LICM/scalar_promote.ll b/test/Transforms/LICM/scalar_promote.ll index b3e45c5fde..92ef15581c 100644 --- a/test/Transforms/LICM/scalar_promote.ll +++ b/test/Transforms/LICM/scalar_promote.ll @@ -181,7 +181,9 @@ for.end: ; preds = %for.cond.for.end_cr ; CHECK-NEXT: store i32 %inc, i32* %gi, align 4, !tbaa !0 } -!0 = metadata !{metadata !"int", metadata !1} +!0 = metadata !{metadata !4, metadata !4, i64 0} !1 = metadata !{metadata !"omnipotent char", metadata !2} !2 = metadata !{metadata !"Simple C/C++ TBAA"} -!3 = metadata !{metadata !"float", metadata !1} +!3 = metadata !{metadata !5, metadata !5, i64 0} +!4 = metadata !{metadata !"int", metadata !1} +!5 = metadata !{metadata !"float", metadata !1} -- cgit v1.2.3