Skip to content

Commit 2e22ce8

Browse files
orodleyorodley
committed
Fix clang tests
1 parent 77674d8 commit 2e22ce8

4 files changed

Lines changed: 26 additions & 19 deletions

File tree

‎clang/lib/CodeGen/CGCUDANV.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "llvm/IR/BasicBlock.h"
2626
#include "llvm/IR/Constants.h"
2727
#include "llvm/IR/DerivedTypes.h"
28+
#include "llvm/IR/GlobalValue.h"
2829
#include "llvm/IR/ReplaceConstant.h"
2930
#include "llvm/Support/Format.h"
3031
#include "llvm/Support/VirtualFileSystem.h"
@@ -969,7 +970,10 @@ llvm::Function *CGNVCUDARuntime::makeModuleCtorFunction() {
969970
// Generate a unique module ID.
970971
SmallString<64> ModuleID;
971972
llvm::raw_svector_ostream OS(ModuleID);
972-
OS << ModuleIDPrefix << llvm::format("%" PRIx64, FatbinWrapper->getGUID());
973+
OS << ModuleIDPrefix
974+
<< llvm::format("%" PRIx64,
975+
llvm::GlobalValue::getGUIDAssumingExternalLinkage(
976+
FatbinWrapper->getName()));
973977
llvm::Constant *ModuleIDConstant = makeConstantArray(
974978
std::string(ModuleID), "", ModuleIDSectionName, 32, /*AddNull=*/true);
975979

‎clang/test/CodeGen/cfi-icall-trap-recover-runtime.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,32 @@
1515

1616

1717
// TRAP-LABEL: define hidden void @f(
18-
// TRAP-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
18+
// TRAP-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]]
1919
// TRAP-NEXT: [[ENTRY:.*:]]
2020
// TRAP-NEXT: ret void
2121
//
2222
// ABORT-LABEL: define hidden void @f(
23-
// ABORT-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
23+
// ABORT-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]]
2424
// ABORT-NEXT: [[ENTRY:.*:]]
2525
// ABORT-NEXT: ret void
2626
//
2727
// RECOVER-LABEL: define hidden void @f(
28-
// RECOVER-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
28+
// RECOVER-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]]
2929
// RECOVER-NEXT: [[ENTRY:.*:]]
3030
// RECOVER-NEXT: ret void
3131
//
3232
// ABORT_MIN-LABEL: define hidden void @f(
33-
// ABORT_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
33+
// ABORT_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]]
3434
// ABORT_MIN-NEXT: [[ENTRY:.*:]]
3535
// ABORT_MIN-NEXT: ret void
3636
//
3737
// RECOVER_MIN-LABEL: define hidden void @f(
38-
// RECOVER_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
38+
// RECOVER_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]]
3939
// RECOVER_MIN-NEXT: [[ENTRY:.*:]]
4040
// RECOVER_MIN-NEXT: ret void
4141
//
4242
// PRESERVE_MIN-LABEL: define hidden void @f(
43-
// PRESERVE_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]] {
43+
// PRESERVE_MIN-SAME: ) #[[ATTR0:[0-9]+]] !type [[META6:![0-9]+]] !type [[META7:![0-9]+]]
4444
// PRESERVE_MIN-NEXT: [[ENTRY:.*:]]
4545
// PRESERVE_MIN-NEXT: ret void
4646
//
@@ -50,7 +50,7 @@ void f() {
5050
void xf();
5151

5252
// TRAP-LABEL: define hidden void @g(
53-
// TRAP-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
53+
// TRAP-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]]
5454
// TRAP-NEXT: [[ENTRY:.*:]]
5555
// TRAP-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
5656
// TRAP-NEXT: [[FP:%.*]] = alloca ptr, align 8
@@ -71,7 +71,7 @@ void xf();
7171
// TRAP-NEXT: ret void
7272
//
7373
// ABORT-LABEL: define hidden void @g(
74-
// ABORT-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
74+
// ABORT-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]]
7575
// ABORT-NEXT: [[ENTRY:.*:]]
7676
// ABORT-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
7777
// ABORT-NEXT: [[FP:%.*]] = alloca ptr, align 8
@@ -93,7 +93,7 @@ void xf();
9393
// ABORT-NEXT: ret void
9494
//
9595
// RECOVER-LABEL: define hidden void @g(
96-
// RECOVER-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
96+
// RECOVER-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]]
9797
// RECOVER-NEXT: [[ENTRY:.*:]]
9898
// RECOVER-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
9999
// RECOVER-NEXT: [[FP:%.*]] = alloca ptr, align 8
@@ -115,7 +115,7 @@ void xf();
115115
// RECOVER-NEXT: ret void
116116
//
117117
// ABORT_MIN-LABEL: define hidden void @g(
118-
// ABORT_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
118+
// ABORT_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]]
119119
// ABORT_MIN-NEXT: [[ENTRY:.*:]]
120120
// ABORT_MIN-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
121121
// ABORT_MIN-NEXT: [[FP:%.*]] = alloca ptr, align 8
@@ -136,7 +136,7 @@ void xf();
136136
// ABORT_MIN-NEXT: ret void
137137
//
138138
// RECOVER_MIN-LABEL: define hidden void @g(
139-
// RECOVER_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
139+
// RECOVER_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]]
140140
// RECOVER_MIN-NEXT: [[ENTRY:.*:]]
141141
// RECOVER_MIN-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
142142
// RECOVER_MIN-NEXT: [[FP:%.*]] = alloca ptr, align 8
@@ -157,7 +157,7 @@ void xf();
157157
// RECOVER_MIN-NEXT: ret void
158158
//
159159
// PRESERVE_MIN-LABEL: define hidden void @g(
160-
// PRESERVE_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]] {
160+
// PRESERVE_MIN-SAME: i32 noundef [[B:%.*]]) #[[ATTR0]] !type [[META8:![0-9]+]] !type [[META9:![0-9]+]]
161161
// PRESERVE_MIN-NEXT: [[ENTRY:.*:]]
162162
// PRESERVE_MIN-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4
163163
// PRESERVE_MIN-NEXT: [[FP:%.*]] = alloca ptr, align 8

‎clang/test/CodeGen/lto-newpm-pipeline.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
// CHECK-FULL-O0-NEXT: Running pass: CoroConditionalWrapper
3535
// CHECK-FULL-O0-NEXT: Running pass: CanonicalizeAliasesPass
3636
// CHECK-FULL-O0-NEXT: Running pass: NameAnonGlobalPass
37+
// CHECK-FULL-O0-NEXT: Running pass: AssignGUIDPass
3738
// CHECK-FULL-O0-NEXT: Running pass: AnnotationRemarksPass
3839
// CHECK-FULL-O0-NEXT: Running analysis: TargetLibraryAnalysis
3940
// CHECK-FULL-O0-NEXT: Running pass: VerifierPass
@@ -48,6 +49,7 @@
4849
// CHECK-THIN-O0-NEXT: Running pass: CoroConditionalWrapper
4950
// CHECK-THIN-O0-NEXT: Running pass: CanonicalizeAliasesPass
5051
// CHECK-THIN-O0-NEXT: Running pass: NameAnonGlobalPass
52+
// CHECK-THIN-O0-NEXT: Running pass: AssignGUIDPass
5153
// CHECK-THIN-O0-NEXT: Running pass: AnnotationRemarksPass
5254
// CHECK-THIN-O0-NEXT: Running analysis: TargetLibraryAnalysis
5355
// CHECK-THIN-O0-NEXT: Running pass: VerifierPass
@@ -64,6 +66,7 @@
6466
// CHECK-THIN-OPTIMIZED-NOT: Running pass: LoopVectorizePass
6567
// CHECK-THIN-OPTIMIZED: Running pass: CanonicalizeAliasesPass
6668
// CHECK-THIN-OPTIMIZED: Running pass: NameAnonGlobalPass
69+
// CHECK-THIN-OPTIMIZED: Running pass: AssignGUIDPass
6770
// CHECK-THIN-OPTIMIZED: Running pass: ThinLTOBitcodeWriterPass
6871

6972
void Foo(void) {}

‎clang/test/CodeGenCXX/cfi-vcall-trap-recover-runtime.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct S1 {
1919
};
2020

2121
// TRAP-LABEL: define hidden void @_Z3s1fP2S1(
22-
// TRAP-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
22+
// TRAP-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
2323
// TRAP-NEXT: [[ENTRY:.*:]]
2424
// TRAP-NEXT: [[S1_ADDR:%.*]] = alloca ptr, align 8
2525
// TRAP-NEXT: store ptr [[S1]], ptr [[S1_ADDR]], align 8
@@ -37,7 +37,7 @@ struct S1 {
3737
// TRAP-NEXT: ret void
3838
//
3939
// ABORT-LABEL: define hidden void @_Z3s1fP2S1(
40-
// ABORT-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
40+
// ABORT-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
4141
// ABORT-NEXT: [[ENTRY:.*:]]
4242
// ABORT-NEXT: [[S1_ADDR:%.*]] = alloca ptr, align 8
4343
// ABORT-NEXT: store ptr [[S1]], ptr [[S1_ADDR]], align 8
@@ -58,7 +58,7 @@ struct S1 {
5858
// ABORT-NEXT: ret void
5959
//
6060
// RECOVER-LABEL: define hidden void @_Z3s1fP2S1(
61-
// RECOVER-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
61+
// RECOVER-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
6262
// RECOVER-NEXT: [[ENTRY:.*:]]
6363
// RECOVER-NEXT: [[S1_ADDR:%.*]] = alloca ptr, align 8
6464
// RECOVER-NEXT: store ptr [[S1]], ptr [[S1_ADDR]], align 8
@@ -79,7 +79,7 @@ struct S1 {
7979
// RECOVER-NEXT: ret void
8080
//
8181
// ABORT_MIN-LABEL: define hidden void @_Z3s1fP2S1(
82-
// ABORT_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
82+
// ABORT_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
8383
// ABORT_MIN-NEXT: [[ENTRY:.*:]]
8484
// ABORT_MIN-NEXT: [[S1_ADDR:%.*]] = alloca ptr, align 8
8585
// ABORT_MIN-NEXT: store ptr [[S1]], ptr [[S1_ADDR]], align 8
@@ -98,7 +98,7 @@ struct S1 {
9898
// ABORT_MIN-NEXT: ret void
9999
//
100100
// RECOVER_MIN-LABEL: define hidden void @_Z3s1fP2S1(
101-
// RECOVER_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
101+
// RECOVER_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
102102
// RECOVER_MIN-NEXT: [[ENTRY:.*:]]
103103
// RECOVER_MIN-NEXT: [[S1_ADDR:%.*]] = alloca ptr, align 8
104104
// RECOVER_MIN-NEXT: store ptr [[S1]], ptr [[S1_ADDR]], align 8
@@ -117,7 +117,7 @@ struct S1 {
117117
// RECOVER_MIN-NEXT: ret void
118118
//
119119
// PRESERVE_MIN-LABEL: define hidden void @_Z3s1fP2S1(
120-
// PRESERVE_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]] {
120+
// PRESERVE_MIN-SAME: ptr noundef [[S1:%.*]]) #[[ATTR0:[0-9]+]]
121121
// PRESERVE_MIN-NEXT: [[ENTRY:.*:]]
122122
// PRESERVE_MIN-NEXT: [[S1_ADDR:%.*]] = alloca ptr, align 8
123123
// PRESERVE_MIN-NEXT: store ptr [[S1]], ptr [[S1_ADDR]], align 8

0 commit comments

Comments
 (0)