Skip to content

Commit 384bf54

Browse files
bd1976brisbd1976bris
authored
[Driver][PS5] Set visibility option defaults (#92091)
Adjust the PS5 driver defaults for the -fvisibility-from-dllstorageclass sub-options so that only globals with dllimport/dllexport annotations are adjusted. This allows globals without dllimport/export to retain the visibility and pre-emptability assigned during IR-Gen. Set -fvisibility=hidden on PS5 by default to compensate for no longer overriding the visibility of definitions without dllexport. Note there is no behavior change for PS4 (the behavior of overriding the visibility for all globals is retained on PS4).
1 parent d3d6565 commit 384bf54

File tree

4 files changed

+107
-15
lines changed

4 files changed

+107
-15
lines changed

‎clang/lib/Driver/ToolChains/PS4CPU.cpp‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,12 @@ void toolchains::PS4PS5Base::addClangTargetOptions(
358358

359359
CC1Args.push_back("-fno-use-init-array");
360360

361+
// Default to `hidden` visibility for PS5.
362+
if (getTriple().isPS5() &&
363+
!DriverArgs.hasArg(options::OPT_fvisibility_EQ,
364+
options::OPT_fvisibility_ms_compat))
365+
CC1Args.push_back("-fvisibility=hidden");
366+
361367
// Default to -fvisibility-global-new-delete=source for PS5.
362368
if (getTriple().isPS5() &&
363369
!DriverArgs.hasArg(options::OPT_fvisibility_global_new_delete_EQ,
@@ -376,24 +382,32 @@ void toolchains::PS4PS5Base::addClangTargetOptions(
376382
else
377383
CC1Args.push_back("-fvisibility-dllexport=protected");
378384

385+
// For PS4 we override the visibilty of globals definitions without
386+
// dllimport or dllexport annotations.
379387
if (DriverArgs.hasArg(options::OPT_fvisibility_nodllstorageclass_EQ))
380388
DriverArgs.AddLastArg(CC1Args,
381389
options::OPT_fvisibility_nodllstorageclass_EQ);
382-
else
390+
else if (getTriple().isPS4())
383391
CC1Args.push_back("-fvisibility-nodllstorageclass=hidden");
392+
else
393+
CC1Args.push_back("-fvisibility-nodllstorageclass=keep");
384394

385395
if (DriverArgs.hasArg(options::OPT_fvisibility_externs_dllimport_EQ))
386396
DriverArgs.AddLastArg(CC1Args,
387397
options::OPT_fvisibility_externs_dllimport_EQ);
388398
else
389399
CC1Args.push_back("-fvisibility-externs-dllimport=default");
390400

401+
// For PS4 we override the visibilty of external globals without
402+
// dllimport or dllexport annotations.
391403
if (DriverArgs.hasArg(
392404
options::OPT_fvisibility_externs_nodllstorageclass_EQ))
393405
DriverArgs.AddLastArg(
394406
CC1Args, options::OPT_fvisibility_externs_nodllstorageclass_EQ);
395-
else
407+
else if (getTriple().isPS4())
396408
CC1Args.push_back("-fvisibility-externs-nodllstorageclass=default");
409+
else
410+
CC1Args.push_back("-fvisibility-externs-nodllstorageclass=keep");
397411
}
398412
}
399413

‎clang/test/Driver/ps4-ps5-visibility-dllstorageclass.c‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
// Check behaviour of -fvisibility-from-dllstorageclass options for PS4/PS5.
22

33
// DEFINE: %{triple} =
4+
// DEFINE: %{prefix} =
45
// DEFINE: %{run} = \
56
// DEFINE: %clang -### -target %{triple} %s -Werror -o - 2>&1 | \
6-
// DEFINE: FileCheck %s --check-prefix=DEFAULTS \
7+
// DEFINE: FileCheck %s --check-prefixes=DEFAULTS,%{prefix} \
78
// DEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
89
// DEFINE: --implicit-check-not=-fvisibility-dllexport \
910
// DEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
1011
// DEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
1112
// DEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
13+
// REDEFINE: %{prefix} = DEFAULTS-PS4
1214
// REDEFINE: %{triple} = x86_64-scei-ps4
1315
// RUN: %{run}
16+
// REDEFINE: %{prefix} = DEFAULTS-PS5
1417
// REDEFINE: %{triple} = x86_64-sie-ps5
1518
// RUN: %{run}
1619
//
@@ -20,25 +23,29 @@
2023
// REDEFINE: -fvisibility-from-dllstorageclass \
2124
// REDEFINE: -Werror \
2225
// REDEFINE: %s -o - 2>&1 | \
23-
// REDEFINE: FileCheck %s --check-prefix=DEFAULTS \
26+
// REDEFINE: FileCheck %s --check-prefixes=DEFAULTS,%{prefix} \
2427
// REDEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
2528
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
2629
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
2730
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
2831
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
32+
// REDEFINE: %{prefix} = DEFAULTS-PS4
2933
// REDEFINE: %{triple} = x86_64-scei-ps4
3034
// RUN: %{run}
35+
// REDEFINE: %{prefix} = DEFAULTS-PS5
3136
// REDEFINE: %{triple} = x86_64-sie-ps5
3237
// RUN: %{run}
3338

3439
// DEFAULTS: "-fvisibility-from-dllstorageclass"
3540
// DEFAULTS-SAME: "-fvisibility-dllexport=protected"
36-
// DEFAULTS-SAME: "-fvisibility-nodllstorageclass=hidden"
41+
// DEFAULTS-PS4-SAME: "-fvisibility-nodllstorageclass=hidden"
42+
// DEFAULTS-PS5-SAME: "-fvisibility-nodllstorageclass=keep"
3743
// DEFAULTS-SAME: "-fvisibility-externs-dllimport=default"
38-
// DEFAULTS-SAME: "-fvisibility-externs-nodllstorageclass=default"
44+
// DEFAULTS-PS4-SAME: "-fvisibility-externs-nodllstorageclass=default"
45+
// DEFAULTS-PS5-SAME: "-fvisibility-externs-nodllstorageclass=keep"
3946

4047
// REDEFINE: %{run} = \
41-
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
48+
// REDEFINE: %clang -### -target %{triple} \
4249
// REDEFINE: -fvisibility-from-dllstorageclass \
4350
// REDEFINE: -fvisibility-dllexport=hidden \
4451
// REDEFINE: -fvisibility-nodllstorageclass=protected \
@@ -64,48 +71,53 @@
6471
// UNUSED-NEXT: warning: argument unused during compilation: '-fvisibility-externs-nodllstorageclass=protected'
6572

6673
// REDEFINE: %{run} = \
67-
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
74+
// REDEFINE: %clang -### -target %{triple} \
6875
// REDEFINE: -fvisibility-nodllstorageclass=protected \
6976
// REDEFINE: -fvisibility-externs-dllimport=hidden \
7077
// REDEFINE: -Werror \
7178
// REDEFINE: %s -o - 2>&1 | \
72-
// REDEFINE: FileCheck %s -check-prefix=SOME \
79+
// REDEFINE: FileCheck %s -check-prefixes=SOME,%{prefix} \
7380
// REDEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
7481
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
7582
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
7683
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
7784
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
85+
// REDEFINE: %{prefix} = SOME-PS4
7886
// REDEFINE: %{triple} = x86_64-scei-ps4
7987
// RUN: %{run}
88+
// REDEFINE: %{prefix} = SOME-PS5
8089
// REDEFINE: %{triple} = x86_64-sie-ps5
8190
// RUN: %{run}
8291

8392
// REDEFINE: %{run} = \
84-
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
93+
// REDEFINE: %clang -### -target %{triple} \
8594
// REDEFINE: -fvisibility-from-dllstorageclass \
8695
// REDEFINE: -fvisibility-nodllstorageclass=protected \
8796
// REDEFINE: -fvisibility-externs-dllimport=hidden \
8897
// REDEFINE: -Werror \
8998
// REDEFINE: %s -o - 2>&1 | \
90-
// REDEFINE: FileCheck %s -check-prefix=SOME \
99+
// REDEFINE: FileCheck %s -check-prefixes=SOME,%{prefix} \
91100
// REDEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
92101
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
93102
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
94103
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
95104
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
105+
// REDEFINE: %{prefix} = SOME-PS4
96106
// REDEFINE: %{triple} = x86_64-scei-ps4
97107
// RUN: %{run}
108+
// REDEFINE: %{prefix} = SOME-PS5
98109
// REDEFINE: %{triple} = x86_64-sie-ps5
99110
// RUN: %{run}
100111

101112
// SOME: "-fvisibility-from-dllstorageclass"
102113
// SOME-SAME: "-fvisibility-dllexport=protected"
103114
// SOME-SAME: "-fvisibility-nodllstorageclass=protected"
104115
// SOME-SAME: "-fvisibility-externs-dllimport=hidden"
105-
// SOME-SAME: "-fvisibility-externs-nodllstorageclass=default"
116+
// SOME-PS4-SAME: "-fvisibility-externs-nodllstorageclass=default"
117+
// SOME-PS5-SAME: "-fvisibility-externs-nodllstorageclass=keep"
106118

107119
// REDEFINE: %{run} = \
108-
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
120+
// REDEFINE: %clang -### -target %{triple} \
109121
// REDEFINE: -fvisibility-dllexport=default \
110122
// REDEFINE: -fvisibility-dllexport=hidden \
111123
// REDEFINE: -fvisibility-nodllstorageclass=default \
@@ -121,14 +133,15 @@
121133
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
122134
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
123135
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
124-
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
136+
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass \
137+
// REDEFINE: --implicit-check-not="warning: argument unused"
125138
// REDEFINE: %{triple} = x86_64-scei-ps4
126139
// RUN: %{run}
127140
// REDEFINE: %{triple} = x86_64-sie-ps5
128141
// RUN: %{run}
129142

130143
// REDEFINE: %{run} = \
131-
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
144+
// REDEFINE: %clang -### -target %{triple} \
132145
// REDEFINE: -fvisibility-from-dllstorageclass \
133146
// REDEFINE: -fvisibility-dllexport=default \
134147
// REDEFINE: -fvisibility-dllexport=hidden \

‎clang/test/Driver/ps4-visibility.cl‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/// Check PS4 specific interactions between visibility options.
2+
/// Detailed testing of -fvisibility-from-dllstorageclass is covered elsewhere.
3+
4+
/// Check defaults.
5+
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm %s 2>&1 | \
6+
// RUN: FileCheck -check-prefix=DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
7+
// DEFAULT-DAG: "-fvisibility-from-dllstorageclass"
8+
// DEFAULT-DAG: "-fvisibility-dllexport=protected"
9+
// DEFAULT-DAG: "-fvisibility-nodllstorageclass=hidden"
10+
// DEFAULT-DAG: "-fvisibility-externs-dllimport=default"
11+
// DEFAULT-DAG: "-fvisibility-externs-nodllstorageclass=default"
12+
13+
/// Check that -fvisibility-from-dllstorageclass is added in the presence of -fvisibility=.
14+
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fvisibility=default %s 2>&1 | \
15+
// RUN: FileCheck -check-prefixes=DEFAULT,VISEQUALS %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
16+
// VISEQUALS-DAG: "-fvisibility=default"
17+
18+
/// Check that -fvisibility-from-dllstorageclass is added in the presence of -fvisibility-ms-compat.
19+
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fvisibility-ms-compat %s 2>&1 | \
20+
// RUN: FileCheck -check-prefixes=DEFAULT,MSCOMPT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
21+
// MSCOMPT-DAG: "-fvisibility=hidden"
22+
// MSCOMPT-DAG: "-ftype-visibility=default"
23+
24+
/// -fvisibility-from-dllstorageclass added explicitly.
25+
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fvisibility-from-dllstorageclass %s 2>&1 | \
26+
// RUN: FileCheck -check-prefixes=DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
27+
28+
/// -fvisibility-from-dllstorageclass disabled explicitly.
29+
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fno-visibility-from-dllstorageclass %s 2>&1 | \
30+
// RUN: FileCheck -check-prefixes=NOVISFROM %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
31+
// NOVISFROM-NOT: "-fvisibility-from-dllstorageclass"
32+

‎clang/test/Driver/ps5-visibility.cl‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/// Check PS5 specific interactions between visibility options.
2+
/// Detailed testing of -fvisibility-from-dllstorageclass is covered elsewhere.
3+
4+
/// Check defaults.
5+
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm %s 2>&1 | \
6+
// RUN: FileCheck -check-prefixes=VDEFAULT,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
7+
// VDEFAULT-DAG: "-fvisibility=hidden"
8+
// VGND_DEFAULT-DAG: "-fvisibility-global-new-delete=source"
9+
// DEFAULT-DAG: "-fvisibility-from-dllstorageclass"
10+
// DEFAULT-DAG: "-fvisibility-dllexport=protected"
11+
// DEFAULT-DAG: "-fvisibility-nodllstorageclass=keep"
12+
// DEFAULT-DAG: "-fvisibility-externs-dllimport=default"
13+
// DEFAULT-DAG: "-fvisibility-externs-nodllstorageclass=keep"
14+
15+
/// -fvisibility= specified explicitly.
16+
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fvisibility=protected %s 2>&1 | \
17+
// RUN: FileCheck -check-prefixes=VPROTECTED,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
18+
// VPROTECTED-DAG: "-fvisibility=protected"
19+
20+
/// -fvisibility-ms-compat added explicitly.
21+
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fvisibility-ms-compat %s 2>&1 | \
22+
// RUN: FileCheck -check-prefixes=MSCOMPT,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
23+
// MSCOMPT-DAG: "-fvisibility=hidden"
24+
// MSCOMPT-DAG: "-ftype-visibility=default"
25+
26+
/// -fvisibility-from-dllstorageclass added explicitly.
27+
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fvisibility-from-dllstorageclass %s 2>&1 | \
28+
// RUN: FileCheck -check-prefixes=VDEFAULT,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
29+
30+
/// -fvisibility-from-dllstorageclass disabled explicitly.
31+
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fno-visibility-from-dllstorageclass %s 2>&1 | \
32+
// RUN: FileCheck -check-prefixes=VDEFAULT,VGND_DEFAULT,NOVISFROM %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
33+
// NOVISFROM-NOT: "-fvisibility-from-dllstorageclass"

0 commit comments

Comments
 (0)