Skip to content

[Driver][PS5] Set visibility option defaults #92091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2024
Merged

[Driver][PS5] Set visibility option defaults #92091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions clang/lib/Driver/ToolChains/PS4CPU.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,12 @@ void toolchains::PS4PS5Base::addClangTargetOptions(

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

// Default to `hidden` visibility for PS5.
if (getTriple().isPS5() &&
!DriverArgs.hasArg(options::OPT_fvisibility_EQ,
options::OPT_fvisibility_ms_compat))
CC1Args.push_back("-fvisibility=hidden");

// Default to -fvisibility-global-new-delete=source for PS5.
if (getTriple().isPS5() &&
!DriverArgs.hasArg(options::OPT_fvisibility_global_new_delete_EQ,
Expand All @@ -376,24 +382,32 @@ void toolchains::PS4PS5Base::addClangTargetOptions(
else
CC1Args.push_back("-fvisibility-dllexport=protected");

// For PS4 we override the visibilty of globals definitions without
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: This comment is new and replaces a comment in our downstream code that wasn't suitable for upstream as it referenced internal tracking numbers.

// dllimport or dllexport annotations.
if (DriverArgs.hasArg(options::OPT_fvisibility_nodllstorageclass_EQ))
DriverArgs.AddLastArg(CC1Args,
options::OPT_fvisibility_nodllstorageclass_EQ);
else
else if (getTriple().isPS4())
CC1Args.push_back("-fvisibility-nodllstorageclass=hidden");
else
CC1Args.push_back("-fvisibility-nodllstorageclass=keep");

if (DriverArgs.hasArg(options::OPT_fvisibility_externs_dllimport_EQ))
DriverArgs.AddLastArg(CC1Args,
options::OPT_fvisibility_externs_dllimport_EQ);
else
CC1Args.push_back("-fvisibility-externs-dllimport=default");

// For PS4 we override the visibilty of external globals without
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewer: This comment is new and replaces a comment in our downstream code that wasn't suitable for upstream as it referenced internal tracking numbers.

// dllimport or dllexport annotations.
if (DriverArgs.hasArg(
options::OPT_fvisibility_externs_nodllstorageclass_EQ))
DriverArgs.AddLastArg(
CC1Args, options::OPT_fvisibility_externs_nodllstorageclass_EQ);
else
else if (getTriple().isPS4())
CC1Args.push_back("-fvisibility-externs-nodllstorageclass=default");
else
CC1Args.push_back("-fvisibility-externs-nodllstorageclass=keep");
}
}

Expand Down
39 changes: 26 additions & 13 deletions clang/test/Driver/ps4-ps5-visibility-dllstorageclass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
// Check behaviour of -fvisibility-from-dllstorageclass options for PS4/PS5.

// DEFINE: %{triple} =
// DEFINE: %{prefix} =
// DEFINE: %{run} = \
// DEFINE: %clang -### -target %{triple} %s -Werror -o - 2>&1 | \
// DEFINE: FileCheck %s --check-prefix=DEFAULTS \
// DEFINE: FileCheck %s --check-prefixes=DEFAULTS,%{prefix} \
// DEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
// DEFINE: --implicit-check-not=-fvisibility-dllexport \
// DEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
// DEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
// DEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
// REDEFINE: %{prefix} = DEFAULTS-PS4
// REDEFINE: %{triple} = x86_64-scei-ps4
// RUN: %{run}
// REDEFINE: %{prefix} = DEFAULTS-PS5
// REDEFINE: %{triple} = x86_64-sie-ps5
// RUN: %{run}
//
Expand All @@ -20,25 +23,29 @@
// REDEFINE: -fvisibility-from-dllstorageclass \
// REDEFINE: -Werror \
// REDEFINE: %s -o - 2>&1 | \
// REDEFINE: FileCheck %s --check-prefix=DEFAULTS \
// REDEFINE: FileCheck %s --check-prefixes=DEFAULTS,%{prefix} \
// REDEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
// REDEFINE: %{prefix} = DEFAULTS-PS4
// REDEFINE: %{triple} = x86_64-scei-ps4
// RUN: %{run}
// REDEFINE: %{prefix} = DEFAULTS-PS5
// REDEFINE: %{triple} = x86_64-sie-ps5
// RUN: %{run}

// DEFAULTS: "-fvisibility-from-dllstorageclass"
// DEFAULTS-SAME: "-fvisibility-dllexport=protected"
// DEFAULTS-SAME: "-fvisibility-nodllstorageclass=hidden"
// DEFAULTS-PS4-SAME: "-fvisibility-nodllstorageclass=hidden"
// DEFAULTS-PS5-SAME: "-fvisibility-nodllstorageclass=keep"
// DEFAULTS-SAME: "-fvisibility-externs-dllimport=default"
// DEFAULTS-SAME: "-fvisibility-externs-nodllstorageclass=default"
// DEFAULTS-PS4-SAME: "-fvisibility-externs-nodllstorageclass=default"
// DEFAULTS-PS5-SAME: "-fvisibility-externs-nodllstorageclass=keep"

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

// REDEFINE: %{run} = \
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
// REDEFINE: %clang -### -target %{triple} \
// REDEFINE: -fvisibility-nodllstorageclass=protected \
// REDEFINE: -fvisibility-externs-dllimport=hidden \
// REDEFINE: -Werror \
// REDEFINE: %s -o - 2>&1 | \
// REDEFINE: FileCheck %s -check-prefix=SOME \
// REDEFINE: FileCheck %s -check-prefixes=SOME,%{prefix} \
// REDEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
// REDEFINE: %{prefix} = SOME-PS4
// REDEFINE: %{triple} = x86_64-scei-ps4
// RUN: %{run}
// REDEFINE: %{prefix} = SOME-PS5
// REDEFINE: %{triple} = x86_64-sie-ps5
// RUN: %{run}

// REDEFINE: %{run} = \
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
// REDEFINE: %clang -### -target %{triple} \
// REDEFINE: -fvisibility-from-dllstorageclass \
// REDEFINE: -fvisibility-nodllstorageclass=protected \
// REDEFINE: -fvisibility-externs-dllimport=hidden \
// REDEFINE: -Werror \
// REDEFINE: %s -o - 2>&1 | \
// REDEFINE: FileCheck %s -check-prefix=SOME \
// REDEFINE: FileCheck %s -check-prefixes=SOME,%{prefix} \
// REDEFINE: --implicit-check-not=-fvisibility-from-dllstorageclass \
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
// REDEFINE: %{prefix} = SOME-PS4
// REDEFINE: %{triple} = x86_64-scei-ps4
// RUN: %{run}
// REDEFINE: %{prefix} = SOME-PS5
// REDEFINE: %{triple} = x86_64-sie-ps5
// RUN: %{run}

// SOME: "-fvisibility-from-dllstorageclass"
// SOME-SAME: "-fvisibility-dllexport=protected"
// SOME-SAME: "-fvisibility-nodllstorageclass=protected"
// SOME-SAME: "-fvisibility-externs-dllimport=hidden"
// SOME-SAME: "-fvisibility-externs-nodllstorageclass=default"
// SOME-PS4-SAME: "-fvisibility-externs-nodllstorageclass=default"
// SOME-PS5-SAME: "-fvisibility-externs-nodllstorageclass=keep"

// REDEFINE: %{run} = \
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
// REDEFINE: %clang -### -target %{triple} \
// REDEFINE: -fvisibility-dllexport=default \
// REDEFINE: -fvisibility-dllexport=hidden \
// REDEFINE: -fvisibility-nodllstorageclass=default \
Expand All @@ -121,14 +133,15 @@
// REDEFINE: --implicit-check-not=-fvisibility-dllexport \
// REDEFINE: --implicit-check-not=-fvisibility-nodllstorageclass \
// REDEFINE: --implicit-check-not=-fvisibility-externs-dllimport \
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass
// REDEFINE: --implicit-check-not=-fvisibility-externs-nodllstorageclass \
// REDEFINE: --implicit-check-not="warning: argument unused"
// REDEFINE: %{triple} = x86_64-scei-ps4
// RUN: %{run}
// REDEFINE: %{triple} = x86_64-sie-ps5
// RUN: %{run}

// REDEFINE: %{run} = \
// REDEFINE: %clang -### -target x86_64-scei-ps4 \
// REDEFINE: %clang -### -target %{triple} \
// REDEFINE: -fvisibility-from-dllstorageclass \
// REDEFINE: -fvisibility-dllexport=default \
// REDEFINE: -fvisibility-dllexport=hidden \
Expand Down
32 changes: 32 additions & 0 deletions clang/test/Driver/ps4-visibility.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/// Check PS4 specific interactions between visibility options.
/// Detailed testing of -fvisibility-from-dllstorageclass is covered elsewhere.

/// Check defaults.
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm %s 2>&1 | \
// RUN: FileCheck -check-prefix=DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// DEFAULT-DAG: "-fvisibility-from-dllstorageclass"
// DEFAULT-DAG: "-fvisibility-dllexport=protected"
// DEFAULT-DAG: "-fvisibility-nodllstorageclass=hidden"
// DEFAULT-DAG: "-fvisibility-externs-dllimport=default"
// DEFAULT-DAG: "-fvisibility-externs-nodllstorageclass=default"

/// Check that -fvisibility-from-dllstorageclass is added in the presence of -fvisibility=.
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fvisibility=default %s 2>&1 | \
// RUN: FileCheck -check-prefixes=DEFAULT,VISEQUALS %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// VISEQUALS-DAG: "-fvisibility=default"

/// Check that -fvisibility-from-dllstorageclass is added in the presence of -fvisibility-ms-compat.
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fvisibility-ms-compat %s 2>&1 | \
// RUN: FileCheck -check-prefixes=DEFAULT,MSCOMPT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// MSCOMPT-DAG: "-fvisibility=hidden"
// MSCOMPT-DAG: "-ftype-visibility=default"

/// -fvisibility-from-dllstorageclass added explicitly.
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fvisibility-from-dllstorageclass %s 2>&1 | \
// RUN: FileCheck -check-prefixes=DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass

/// -fvisibility-from-dllstorageclass disabled explicitly.
// RUN: %clang -### -target x86_64-scei-ps4 -x cl -c -emit-llvm -fno-visibility-from-dllstorageclass %s 2>&1 | \
// RUN: FileCheck -check-prefixes=NOVISFROM %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// NOVISFROM-NOT: "-fvisibility-from-dllstorageclass"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already implicitly checked by --implicit-check-not=fvisibility


33 changes: 33 additions & 0 deletions clang/test/Driver/ps5-visibility.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/// Check PS5 specific interactions between visibility options.
/// Detailed testing of -fvisibility-from-dllstorageclass is covered elsewhere.

/// Check defaults.
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm %s 2>&1 | \
// RUN: FileCheck -check-prefixes=VDEFAULT,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// VDEFAULT-DAG: "-fvisibility=hidden"
// VGND_DEFAULT-DAG: "-fvisibility-global-new-delete=source"
// DEFAULT-DAG: "-fvisibility-from-dllstorageclass"
// DEFAULT-DAG: "-fvisibility-dllexport=protected"
// DEFAULT-DAG: "-fvisibility-nodllstorageclass=keep"
// DEFAULT-DAG: "-fvisibility-externs-dllimport=default"
// DEFAULT-DAG: "-fvisibility-externs-nodllstorageclass=keep"

/// -fvisibility= specified explicitly.
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fvisibility=protected %s 2>&1 | \
// RUN: FileCheck -check-prefixes=VPROTECTED,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// VPROTECTED-DAG: "-fvisibility=protected"

/// -fvisibility-ms-compat added explicitly.
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fvisibility-ms-compat %s 2>&1 | \
// RUN: FileCheck -check-prefixes=MSCOMPT,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// MSCOMPT-DAG: "-fvisibility=hidden"
// MSCOMPT-DAG: "-ftype-visibility=default"

/// -fvisibility-from-dllstorageclass added explicitly.
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fvisibility-from-dllstorageclass %s 2>&1 | \
// RUN: FileCheck -check-prefixes=VDEFAULT,VGND_DEFAULT,DEFAULT %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass

/// -fvisibility-from-dllstorageclass disabled explicitly.
// RUN: %clang -### -target x86_64-sie-ps5 -x cl -c -emit-llvm -fno-visibility-from-dllstorageclass %s 2>&1 | \
// RUN: FileCheck -check-prefixes=VDEFAULT,VGND_DEFAULT,NOVISFROM %s --implicit-check-not=fvisibility --implicit-check-not=ftype-visibility --implicit-check-not=dllstorageclass
// NOVISFROM-NOT: "-fvisibility-from-dllstorageclass"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already excluded by --implicit-check-not=fvsibility

Loading