Skip to content

[PS5] Adopt new compiler-rt naming scheme for the profile library. #99862

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.

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
Jul 23, 2024

Conversation

goussepi
Copy link
Collaborator

Changes the driver to look for libclang_rt.profile_nosubmission.a instead of libclang_rt.profile-x86_64_nosubmission.a

@goussepi goussepi requested review from rnk, MaskRay, jmorse and pogo59 July 22, 2024 11:15
@llvmbot llvmbot added clang Clang issues not falling into any other category clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' labels Jul 22, 2024
@llvmbot
Copy link
Member

llvmbot commented Jul 22, 2024

@llvm/pr-subscribers-clang-driver

@llvm/pr-subscribers-clang

Author: None (goussepi)

Changes

Changes the driver to look for libclang_rt.profile_nosubmission.a instead of libclang_rt.profile-x86_64_nosubmission.a


Full diff: https://github.com/llvm/llvm-project/pull/99862.diff

2 Files Affected:

  • (modified) clang/lib/Driver/ToolChains/PS4CPU.h (+1-1)
  • (modified) clang/test/Driver/ps4-ps5-runtime-flags.c (+2-2)
diff --git a/clang/lib/Driver/ToolChains/PS4CPU.h b/clang/lib/Driver/ToolChains/PS4CPU.h
index fee80e77462f3..b248d1c256129 100644
--- a/clang/lib/Driver/ToolChains/PS4CPU.h
+++ b/clang/lib/Driver/ToolChains/PS4CPU.h
@@ -163,7 +163,7 @@ class LLVM_LIBRARY_VISIBILITY PS5CPU : public PS4PS5Base {
                         llvm::opt::ArgStringList &CmdArgs, const char *Prefix,
                         const char *Suffix) const override;
   const char *getProfileRTLibName() const override {
-    return "libclang_rt.profile-x86_64_nosubmission.a";
+    return "libclang_rt.profile_nosubmission.a";
   }
 
 protected:
diff --git a/clang/test/Driver/ps4-ps5-runtime-flags.c b/clang/test/Driver/ps4-ps5-runtime-flags.c
index e75ba97948d23..4b00aead6fe5c 100644
--- a/clang/test/Driver/ps4-ps5-runtime-flags.c
+++ b/clang/test/Driver/ps4-ps5-runtime-flags.c
@@ -40,5 +40,5 @@
 // RUN: %clang -target x86_64-sie-ps5 -fcs-profile-generate %s -### 2>&1 | FileCheck --check-prefix=CHECK-PS5-PROFILE %s
 // RUN: %clang -target x86_64-sie-ps5 -fcs-profile-generate -fno-profile-generate %s -### 2>&1 | FileCheck --check-prefix=CHECK-PS5-NO-PROFILE %s
 //
-// CHECK-PS5-PROFILE: "--dependent-lib=libclang_rt.profile-x86_64_nosubmission.a"
-// CHECK-PS5-NO-PROFILE-NOT: "--dependent-lib=libclang_rt.profile-x86_64_nosubmission.a"
+// CHECK-PS5-PROFILE: "--dependent-lib=libclang_rt.profile_nosubmission.a"
+// CHECK-PS5-NO-PROFILE-NOT: "--dependent-lib=libclang_rt.profile_nosubmission.a"

Copy link
Collaborator

@pogo59 pogo59 left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Member

@MaskRay MaskRay left a comment

Choose a reason for hiding this comment

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

LGTM. The majority of patches omit the trailing period in the subject.

Changes the driver to look for libclang_rt.profile_nosubmission.a
instead of libclang_rt.profile-x86_64_nosubmission.a
@goussepi goussepi force-pushed the lib-profile-new-naming-scheme branch from 8e2d203 to f2bbdbd Compare July 23, 2024 09:07
@goussepi goussepi merged commit b5fb7b2 into llvm:main Jul 23, 2024
4 of 7 checks passed
@goussepi goussepi deleted the lib-profile-new-naming-scheme branch July 23, 2024 10:29
yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
…99862)

Summary:
Changes the driver to look for libclang_rt.profile_nosubmission.a
instead of libclang_rt.profile-x86_64_nosubmission.a

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60251053
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants