This is an archive of the discontinued LLVM Phabricator instance.

Differential D30430

Make Lit tests C++11 compatible - IR ordering
ClosedPublic

Authored by tigerleapgorge on Feb 27 2017, 2:16 PM.

Details

Reviewers
rjmccall
Commits
rGf22a68714f56: [Test] Make Lit tests C++11 compatible - IR ordering
rC296549: [Test] Make Lit tests C++11 compatible - IR ordering
rL296549: [Test] Make Lit tests C++11 compatible - IR ordering
Summary

This test failure is caused by difference in IR ordering when compiling at C++98 vs C++11
Because there was a CHECK-NOT between the two CHECKs, just changing the CHECKs to CHECK-DAG would not work.

So to make FileCheck more flexible.
I have changed the CHECK to CHECK-DAG.
I have changed CHECK-NOT to go under a new check-prefix CHECK2 so they are CHECK2-NOT.

IR in C++98
@_ZN5test022implicit_instantiationE = global %"struct.test0::stdio_sync_filebuf.2" zeroinitializer, align 8
@__dso_handle = external hidden global i8
@_ZN7PR100011xE = global i32 0, align 4
@_ZTVN5test018stdio_sync_filebufIA3_iEE = weak_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTIN5test018stdio_sync_filebufIA3_iEE to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.1"*)* @_ZN5test018stdio_sync_filebufIA3_iED1Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.1"*)* @_ZN5test018stdio_sync_filebufIA3_iED0Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.1"*)* @_ZN5test018stdio_sync_filebufIA3_iE6xsgetnEv to i8*)] }, align 8
@_ZTVN10__cxxabiv120__si_class_type_infoE = external global i8*
@_ZTSN5test018stdio_sync_filebufIA3_iEE = weak_odr constant [35 x i8] c"N5test018stdio_sync_filebufIA3_iEE\00"
@_ZTIN5test015basic_streambufE = external constant i8*
@_ZTIN5test018stdio_sync_filebufIA3_iEE = weak_odr constant { i8*, i8*, i8* } { i8* bitcast (i8 getelementptr inbounds (i8*, i8 @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([35 x i8], [35 x i8]* @_ZTSN5test018stdio_sync_filebufIA3_iEE, i32 0, i32 0), i8* bitcast (i8 @_ZTIN5test015basic_streambufE to i8*) }
@_ZN7PR100011SIiE3arrE = linkonce_odr global [3 x i32] zeroinitializer, align 4
@_ZGVN7PR100011SIiE3arrE = linkonce_odr global i64 0, align 8
@_ZTVN5test018stdio_sync_filebufIA4_iEE = linkonce_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTIN5test018stdio_sync_filebufIA4_iEE to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.2"*)* @_ZN5test018stdio_sync_filebufIA4_iED1Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.2"*)* @_ZN5test018stdio_sync_filebufIA4_iED0Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.2"*)* @_ZN5test018stdio_sync_filebufIA4_iE6xsgetnEv to i8*)] }, align 8
@_ZTSN5test018stdio_sync_filebufIA4_iEE = linkonce_odr constant [35 x i8] c"N5test018stdio_sync_filebufIA4_iEE\00"
@_ZTIN5test018stdio_sync_filebufIA4_iEE = linkonce_odr constant { i8*, i8*, i8* } { i8* bitcast (i8 getelementptr inbounds (i8*, i8 @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([35 x i8], [35 x i8]* @_ZTSN5test018stdio_sync_filebufIA4_iEE, i32 0, i32 0), i8* bitcast (i8 @_ZTIN5test015basic_streambufE to i8*) }
@_ZTVN5test015basic_streambufE = available_externally unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* bitcast (i8 @_ZTIN5test015basic_streambufE to i8*), i8* bitcast (void (%"struct.test0::basic_streambuf"*)* @_ZN5test015basic_streambufD1Ev to i8*), i8* bitcast (void (%"struct.test0::basic_streambuf"*)* @_ZN5test015basic_streambufD0Ev to i8*)] }, align 8
@_ZTVN5test21CIiEE = available_externally unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* bitcast (i8 @_ZTIN5test21CIiEE to i8*), i8* bitcast (void (%"class.test2::C"*)* @_ZN5test21CIiED1Ev to i8*), i8* bitcast (void (%"class.test2::C"*)* @_ZN5test21CIiED0Ev to i8*)] }, align 8
@_ZTIN5test21CIiEE = external constant i8*
@llvm.global_ctors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @__cxx_global_var_init.2, i8* null }, { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_template_instantiation.cpp, i8* null }]

IR in C++11
@_ZTVN5test018stdio_sync_filebufIA4_iEE = linkonce_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTIN5test018stdio_sync_filebufIA4_iEE to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.2"*)* @_ZN5test018stdio_sync_filebufIA4_iED1Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.2"*)* @_ZN5test018stdio_sync_filebufIA4_iED0Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.2"*)* @_ZN5test018stdio_sync_filebufIA4_iE6xsgetnEv to i8*)] }, align 8
@_ZN5test022implicit_instantiationE = global { i8 } { i8 getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTVN5test018stdio_sync_filebufIA4_iEE, i32 0, inrange i32 0, i32 2) }, align 8
@__dso_handle = external hidden global i8
@_ZN7PR100011xE = global i32 0, align 4
@_ZTVN5test018stdio_sync_filebufIA3_iEE = weak_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTIN5test018stdio_sync_filebufIA3_iEE to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.1"*)* @_ZN5test018stdio_sync_filebufIA3_iED1Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.1"*)* @_ZN5test018stdio_sync_filebufIA3_iED0Ev to i8*), i8* bitcast (void (%"struct.test0::stdio_sync_filebuf.1"*)* @_ZN5test018stdio_sync_filebufIA3_iE6xsgetnEv to i8*)] }, align 8
@_ZTVN10__cxxabiv120__si_class_type_infoE = external global i8*
@_ZTSN5test018stdio_sync_filebufIA3_iEE = weak_odr constant [35 x i8] c"N5test018stdio_sync_filebufIA3_iEE\00"
@_ZTIN5test015basic_streambufE = external constant i8*
@_ZTIN5test018stdio_sync_filebufIA3_iEE = weak_odr constant { i8*, i8*, i8* } { i8* bitcast (i8 getelementptr inbounds (i8*, i8 @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([35 x i8], [35 x i8]* @_ZTSN5test018stdio_sync_filebufIA3_iEE, i32 0, i32 0), i8* bitcast (i8 @_ZTIN5test015basic_streambufE to i8*) }
@_ZN7PR100011SIiE3arrE = linkonce_odr global [3 x i32] zeroinitializer, align 4
@_ZGVN7PR100011SIiE3arrE = linkonce_odr global i64 0, align 8
@_ZTSN5test018stdio_sync_filebufIA4_iEE = linkonce_odr constant [35 x i8] c"N5test018stdio_sync_filebufIA4_iEE\00"
@_ZTIN5test018stdio_sync_filebufIA4_iEE = linkonce_odr constant { i8*, i8*, i8* } { i8* bitcast (i8 getelementptr inbounds (i8*, i8 @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([35 x i8], [35 x i8]* @_ZTSN5test018stdio_sync_filebufIA4_iEE, i32 0, i32 0), i8* bitcast (i8 @_ZTIN5test015basic_streambufE to i8*) }
@_ZTVN5test21CIiEE = available_externally unnamed_addr constant { [4 x i8*] } { [4 x i8*] [i8* null, i8* bitcast (i8** @_ZTIN5test21CIiEE to i8*), i8* bitcast (void (%"class.test2::C"*)* @_ZN5test21CIiED1Ev to i8*), i8* bitcast (void (%"class.test2::C"*)* @_ZN5test21CIiED0Ev to i8*)] }, align 8
@_ZTIN5test21CIiEE = external constant i8*
@llvm.global_ctors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @__cxx_global_var_init.2, i8* null }, { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_template_instantiation.cpp, i8* null }]

Diff Detail

Repository
rL LLVM

Event Timeline

tigerleapgorge created this revision.Feb 27 2017, 2:16 PM
rjmccall edited edge metadata.Feb 27 2017, 9:38 PM

The C++98 behavior here is not really vital to test precisely; it's just minor differences in what gets instantiated and when. I think it's fine to just update the run line to -std=c++11 for things like this. But if you really want to test both configurations, this LGTM, although please leave a comment in the test explaining that it's just trying to account for differences in instantiation order between C++98 and C++11.

tigerleapgorge updated this revision to Diff 90078.Feb 28 2017, 1:30 PM

Updated patch.

Test only runs in C++11.
Added comments to explain CHECK-DAG and CHECK2-NOT.

tigerleapgorge added a comment.Feb 28 2017, 1:39 PM
In D30430#688146, @rjmccall wrote:

The C++98 behavior here is not really vital to test precisely; it's just minor differences in what gets instantiated and when.

Hi John, my main concern with CHECK-NOT appearing between CHECK lines is that it makes the test brittle to the order of the IR.
For this reason I have separated out the CHECK-NOTs to go under a seperate prefix with a separate RUN line.
If you would like to old way of a single RUN line, I can do that too.

I think it's fine to just update the run line to -std=c++11 for things like this.

Done. I have deleted C++98 RUN lines and default (no -std) RUN lines.

But if you really want to test both configurations, this LGTM, although please leave a comment in the test explaining that it's just trying to account for differences in instantiation order between C++98 and C++11.

I have added 2 lines of comments.
One explains why CHECK-DAG is used instead of CHECK.
Another explains why CHECK2-NOT is used instead of CHECK-NOT

probinson added a subscriber: probinson.Feb 28 2017, 2:58 PM
Closed by commit rL296549: [Test] Make Lit tests C++11 compatible - IR ordering (authored by lcharles). · Explain WhyFeb 28 2017, 4:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
test/
CodeGenCXX/
35 lines

Diff 90101

cfe/trunk/test/CodeGenCXX/template-instantiation.cpp

// RUN: %clang_cc1 %s -O1 -disable-llvm-passes -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s // RUN: %clang_cc1 %s -O1 -disable-llvm-passes -triple=x86_64-apple-darwin10 -std=c++11 -emit-llvm -o - | FileCheck %s
// RUN: %clang_cc1 %s -O1 -disable-llvm-passes -triple=x86_64-apple-darwin10 -std=c++11 -emit-llvm -o - | FileCheck %s --check-prefix=CHECK2
// CHECK: @_ZN7PR100011xE = global // Instantiation order varies on different C++ dialects (IE, between C++98 and C++11).
// CHECK-NOT: @_ZN7PR100014kBarE = external global i32 // CHECK-DAG: @_ZN7PR100011xE = global
// // CHECK-DAG: @_ZTVN5test018stdio_sync_filebufIA3_iEE = weak_odr unnamed_addr constant
// CHECK-NOT: @_ZTVN5test118stdio_sync_filebufIwEE = constant // CHECK-DAG: @_ZN7PR100011SIiE3arrE = linkonce_odr global [3 x i32]
// CHECK-NOT: _ZTVN5test315basic_fstreamXXIcEE // CHECK-DAG: @_ZTVN5test018stdio_sync_filebufIA4_iEE = linkonce_odr unnamed_addr constant
// CHECK-NOT: @_ZTVN5test018stdio_sync_filebufIA1_iEE
// CHECK-NOT: @_ZTVN5test018stdio_sync_filebufIA2_iEE // Negative checks go under prefix "CHECK2" to avoid interference with CHECK and CHECK-DAG.
// CHECK: @_ZTVN5test018stdio_sync_filebufIA3_iEE = weak_odr unnamed_addr constant // CHECK2-NOT: @_ZN7PR100014kBarE = external global i32
// CHECK2-NOT: @_ZTVN5test118stdio_sync_filebufIwEE = constant
// CHECK2-NOT: _ZTVN5test315basic_fstreamXXIcEE
// CHECK2-NOT: @_ZTVN5test018stdio_sync_filebufIA1_iEE
// CHECK2-NOT: @_ZTVN5test018stdio_sync_filebufIA2_iEE
// CHECK2-NOT: @_ZN7PR100011SIiE3arr2E = linkonce_odr global [3 x i32]A
// CHECK: @_ZN7PR100011SIiE3arrE = linkonce_odr global [3 x i32] // CHECK2-NOT: _ZTVN5test31SIiEE
// CHECK-NOT: @_ZN7PR100011SIiE3arr2E = linkonce_odr global [3 x i32]A // CHECK2-NOT: _ZTSN5test31SIiEE
// CHECK: @_ZTVN5test018stdio_sync_filebufIA4_iEE = linkonce_odr unnamed_addr constant
// CHECK-NOT: _ZTVN5test31SIiEE
// CHECK-NOT: _ZTSN5test31SIiEE
// CHECK-LABEL: define linkonce_odr void @_ZN5test21CIiEC1Ev(%"class.test2::C"* %this) unnamed_addr // CHECK-LABEL: define linkonce_odr void @_ZN5test21CIiEC1Ev(%"class.test2::C"* %this) unnamed_addr
// CHECK-LABEL: define linkonce_odr void @_ZN5test21CIiE6foobarIdEEvT_( // CHECK-LABEL: define linkonce_odr void @_ZN5test21CIiE6foobarIdEEvT_(
// CHECK-LABEL: define available_externally void @_ZN5test21CIiE6zedbarEd( // CHECK-LABEL: define available_externally void @_ZN5test21CIiE6zedbarEd(
// CHECK-LABEL: define linkonce_odr void @_ZN7PR106662g1ENS_1SILi1EEE() // CHECK-LABEL: define linkonce_odr void @_ZN7PR106662g1ENS_1SILi1EEE()
// CHECK-LABEL: define linkonce_odr void @_ZN7PR106662g1ENS_1SILi2EEE() // CHECK-LABEL: define linkonce_odr void @_ZN7PR106662g1ENS_1SILi2EEE()
// CHECK-LABEL: define linkonce_odr void @_ZN7PR106662g1ENS_1SILi3EEE() // CHECK-LABEL: define linkonce_odr void @_ZN7PR106662g1ENS_1SILi3EEE()
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Lines
// Hits an assertion due to bogus instantiation of class B. // Hits an assertion due to bogus instantiation of class B.
template <int i> class A { template <int i> class A {
class B* g; class B* g;
}; };
class B { class B {
void f () {} void f () {}
}; };
// Should not instantiate class B since it is introduced in namespace scope. // Should not instantiate class B since it is introduced in namespace scope.
// CHECK-NOT: _ZN6PR85051AILi0EE1B1fEv // CHECK2-NOT: _ZN6PR85051AILi0EE1B1fEv
template class A<0>; template class A<0>;
} }
// Ensure that when instantiating initializers for static data members to // Ensure that when instantiating initializers for static data members to
// complete their type in an unevaluated context, we *do* emit initializers with // complete their type in an unevaluated context, we *do* emit initializers with
// side-effects, but *don't* emit initializers and variables which are otherwise // side-effects, but *don't* emit initializers and variables which are otherwise
// unused in the program. // unused in the program.
namespace PR10001 { namespace PR10001 {
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines