Skip to content

Commit 99d2ff5

Browse files
lhameslhames
committed
[ORC-RT] Use llvm-jitlink -num-threads=0 for objc-imageinfo.S tests.
These testcases depend on debugging output, which isn't stable under concurrent linking.
1 parent 0895550 commit 99d2ff5

File tree

2 files changed

+60
-20
lines changed

2 files changed

+60
-20
lines changed

‎compiler-rt/test/orc/TestCases/Darwin/arm64/objc-imageinfo.S

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,29 @@
99

1010
// Check individual versions are loadable.
1111

12-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_old.o 2>&1 | FileCheck %s -check-prefix=OLD
12+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
13+
// RUN: %t/objc_old.o 2>&1 \
14+
// RUN: | FileCheck %s -check-prefix=OLD
1315
// OLD: MachOPlatform: Registered __objc_imageinfo for main
1416
// OLD-SAME: flags = 0x0000
15-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=NEW
17+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
18+
// RUN: %t/objc_new.o 2>&1 \
19+
// RUN: | FileCheck %s -check-prefix=NEW
1620
// NEW: MachOPlatform: Registered __objc_imageinfo for main
1721
// NEW-SAME: flags = 0x0040
18-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_4.o 2>&1 | FileCheck %s -check-prefix=SWIFT_4
22+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
23+
// RUN: %t/swift_4.o 2>&1 \
24+
// RUN: | FileCheck %s -check-prefix=SWIFT_4
1925
// SWIFT_4: MachOPlatform: Registered __objc_imageinfo for main
2026
// SWIFT_4-SAME: flags = 0x0640
21-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_5.o 2>&1 | FileCheck %s -check-prefix=SWIFT_5
27+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
28+
// RUN: %t/swift_5.o 2>&1 \
29+
// RUN: | FileCheck %s -check-prefix=SWIFT_5
2230
// SWIFT_5: MachOPlatform: Registered __objc_imageinfo for main
2331
// SWIFT_5-SAME: flags = 0x5000740
24-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o 2>&1 | FileCheck %s -check-prefix=SWIFT_59
32+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
33+
// RUN: %t/swift_59.o 2>&1 \
34+
// RUN: | FileCheck %s -check-prefix=SWIFT_59
2535
// SWIFT_59: MachOPlatform: Registered __objc_imageinfo for main
2636
// SWIFT_59-SAME: flags = 0x5090740
2737

@@ -33,23 +43,33 @@
3343
// Check merging.
3444

3545
// Take the lowest swift version.
36-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o %t/swift_5.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX1
46+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/swift_59.o \
47+
// RUN: %t/swift_5.o 2>&1 \
48+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX1
3749
// SWIFT_MIX1: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x5000740
3850

3951
// Add swift to objc.
40-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX2
52+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/swift_59.o \
53+
// RUN: %t/objc_new.o 2>&1 \
54+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX2
4155
// SWIFT_MIX2: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x5090740
4256

4357
// Add multiple swift to objc.
44-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o %t/swift_5.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX3
58+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/swift_59.o \
59+
// RUN: %t/swift_5.o %t/objc_new.o 2>&1 \
60+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX3
4561
// SWIFT_MIX3: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x5000740
4662

4763
// Disable categories.
48-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_old.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX4
64+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/objc_old.o \
65+
// RUN: %t/objc_new.o 2>&1 \
66+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX4
4967
// SWIFT_MIX4: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x0000
5068

5169
// Disable signed class_ro.
52-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_new.o %t/objc_new_signed_ro.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX5
70+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/objc_new.o \
71+
// RUN: %t/objc_new_signed_ro.o 2>&1 \
72+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX5
5373
// SWIFT_MIX5: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x0040
5474

5575
//--- main.S

‎compiler-rt/test/orc/TestCases/Darwin/x86-64/objc-imageinfo.S

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,29 @@
99

1010
// Check individual versions are loadable.
1111

12-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_old.o 2>&1 | FileCheck %s -check-prefix=OLD
12+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
13+
// RUN: %t/objc_old.o 2>&1 \
14+
// RUN: | FileCheck %s -check-prefix=OLD
1315
// OLD: MachOPlatform: Registered __objc_imageinfo for main
1416
// OLD-SAME: flags = 0x0000
15-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=NEW
17+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
18+
// RUN: %t/objc_new.o 2>&1 \
19+
// RUN: | FileCheck %s -check-prefix=NEW
1620
// NEW: MachOPlatform: Registered __objc_imageinfo for main
1721
// NEW-SAME: flags = 0x0040
18-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_4.o 2>&1 | FileCheck %s -check-prefix=SWIFT_4
22+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
23+
// RUN: %t/swift_4.o 2>&1
24+
// RUN: | FileCheck %s -check-prefix=SWIFT_4
1925
// SWIFT_4: MachOPlatform: Registered __objc_imageinfo for main
2026
// SWIFT_4-SAME: flags = 0x0640
21-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_5.o 2>&1 | FileCheck %s -check-prefix=SWIFT_5
27+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
28+
// RUN: %t/swift_5.o 2>&1
29+
// RUN: | FileCheck %s -check-prefix=SWIFT_5
2230
// SWIFT_5: MachOPlatform: Registered __objc_imageinfo for main
2331
// SWIFT_5-SAME: flags = 0x5000740
24-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o 2>&1 | FileCheck %s -check-prefix=SWIFT_59
32+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o \
33+
// RUN: %t/swift_59.o 2>&1
34+
// RUN: | FileCheck %s -check-prefix=SWIFT_59
2535
// SWIFT_59: MachOPlatform: Registered __objc_imageinfo for main
2636
// SWIFT_59-SAME: flags = 0x5090740
2737

@@ -33,23 +43,33 @@
3343
// Check merging.
3444

3545
// Take the lowest swift version.
36-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o %t/swift_5.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX1
46+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/swift_59.o \
47+
// RUN: %t/swift_5.o 2>&1 \
48+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX1
3749
// SWIFT_MIX1: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x5000740
3850

3951
// Add swift to objc.
40-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX2
52+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/swift_59.o \
53+
// RUN: %t/objc_new.o 2>&1
54+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX2
4155
// SWIFT_MIX2: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x5090740
4256

4357
// Add multiple swift to objc.
44-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/swift_59.o %t/swift_5.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX3
58+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/swift_59.o \
59+
// RUN: %t/swift_5.o %t/objc_new.o 2>&1
60+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX3
4561
// SWIFT_MIX3: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x5000740
4662

4763
// Disable categories.
48-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_old.o %t/objc_new.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX4
64+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/objc_old.o
65+
// RUN: %t/objc_new.o 2>&1
66+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX4
4967
// SWIFT_MIX4: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x0000
5068

5169
// Disable signed class_ro.
52-
// RUN: %llvm_jitlink -debug-only=orc %t/main.o %t/objc_new.o %t/objc_new_signed_ro.o 2>&1 | FileCheck %s -check-prefix=SWIFT_MIX5
70+
// RUN: %llvm_jitlink -num-threads=0 -debug-only=orc %t/main.o %t/objc_new.o
71+
// RUN: %t/objc_new_signed_ro.o 2>&1
72+
// RUN: | FileCheck %s -check-prefix=SWIFT_MIX5
5373
// SWIFT_MIX5: MachOPlatform: Merging __objc_imageinfo flags for main {{.*}} -> 0x0040
5474

5575
//--- main.S

0 commit comments

Comments
 (0)