[RISCV] Use StringRef for RequiredExtensions in RVVIntrinsicDef #143503
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-backend-risc-v Author: Brandon Wu (4vtomat) ChangesThis prevents many duplicated copies of required extensions string. Full diff: https://github.com/llvm/llvm-project/pull/143503.diff 1 Files Affected:
diff --git a/clang/lib/Sema/SemaRISCV.cpp b/clang/lib/Sema/SemaRISCV.cpp
index 9f70be746eb3f..628a3e5e8b417 100644
--- a/clang/lib/Sema/SemaRISCV.cpp
+++ b/clang/lib/Sema/SemaRISCV.cpp
@@ -27,6 +27,7 @@
#include "clang/Sema/Sema.h"
#include "clang/Support/RISCVVIntrinsicUtils.h"
#include "llvm/ADT/SmallVector.h"
+#include "llvm/Support/StringSaver.h"
#include "llvm/TargetParser/RISCVISAInfo.h"
#include "llvm/TargetParser/RISCVTargetParser.h"
#include <optional>
@@ -47,7 +48,7 @@ struct RVVIntrinsicDef {
std::string BuiltinName;
/// Mapping to RequiredFeatures in riscv_vector.td
- std::string RequiredExtensions;
+ StringRef RequiredExtensions;
/// Function signature, first element is return type.
RVVTypes Signature;
@@ -192,6 +193,10 @@ class RISCVIntrinsicManagerImpl : public sema::RISCVIntrinsicManager {
// Mapping function name to RVVOverloadIntrinsicDef.
StringMap<RVVOverloadIntrinsicDef> OverloadIntrinsics;
+ // Caching the required extension strings.
+ BumpPtrAllocator StrAlloc;
+ UniqueStringSaver StrPool;
+
// Create RVVIntrinsicDef.
void InitRVVIntrinsic(const RVVIntrinsicRecord &Record, StringRef SuffixStr,
StringRef OverloadedSuffixStr, bool IsMask,
@@ -206,7 +211,7 @@ class RISCVIntrinsicManagerImpl : public sema::RISCVIntrinsicManager {
IntrinsicKind K);
public:
- RISCVIntrinsicManagerImpl(clang::Sema &S) : S(S) {
+ RISCVIntrinsicManagerImpl(clang::Sema &S) : S(S), StrPool(StrAlloc) {
ConstructedRISCVVBuiltins = false;
ConstructedRISCVSiFiveVectorBuiltins = false;
ConstructedRISCVAndesVectorBuiltins = false;
@@ -385,7 +390,8 @@ void RISCVIntrinsicManagerImpl::InitRVVIntrinsic(
uint32_t Index = IntrinsicList.size();
assert(IntrinsicList.size() == (size_t)Index &&
"Intrinsics indices overflow.");
- IntrinsicList.push_back({BuiltinName, Record.RequiredExtensions, Signature});
+ IntrinsicList.push_back(
+ {BuiltinName, StrPool.save(Record.RequiredExtensions), Signature});
// Creating mapping to Intrinsics.
Intrinsics.insert({Name, Index});
|
|
@llvm/pr-subscribers-clang Author: Brandon Wu (4vtomat) ChangesThis prevents many duplicated copies of required extensions string. Full diff: https://github.com/llvm/llvm-project/pull/143503.diff 1 Files Affected:
diff --git a/clang/lib/Sema/SemaRISCV.cpp b/clang/lib/Sema/SemaRISCV.cpp
index 9f70be746eb3f..628a3e5e8b417 100644
--- a/clang/lib/Sema/SemaRISCV.cpp
+++ b/clang/lib/Sema/SemaRISCV.cpp
@@ -27,6 +27,7 @@
#include "clang/Sema/Sema.h"
#include "clang/Support/RISCVVIntrinsicUtils.h"
#include "llvm/ADT/SmallVector.h"
+#include "llvm/Support/StringSaver.h"
#include "llvm/TargetParser/RISCVISAInfo.h"
#include "llvm/TargetParser/RISCVTargetParser.h"
#include <optional>
@@ -47,7 +48,7 @@ struct RVVIntrinsicDef {
std::string BuiltinName;
/// Mapping to RequiredFeatures in riscv_vector.td
- std::string RequiredExtensions;
+ StringRef RequiredExtensions;
/// Function signature, first element is return type.
RVVTypes Signature;
@@ -192,6 +193,10 @@ class RISCVIntrinsicManagerImpl : public sema::RISCVIntrinsicManager {
// Mapping function name to RVVOverloadIntrinsicDef.
StringMap<RVVOverloadIntrinsicDef> OverloadIntrinsics;
+ // Caching the required extension strings.
+ BumpPtrAllocator StrAlloc;
+ UniqueStringSaver StrPool;
+
// Create RVVIntrinsicDef.
void InitRVVIntrinsic(const RVVIntrinsicRecord &Record, StringRef SuffixStr,
StringRef OverloadedSuffixStr, bool IsMask,
@@ -206,7 +211,7 @@ class RISCVIntrinsicManagerImpl : public sema::RISCVIntrinsicManager {
IntrinsicKind K);
public:
- RISCVIntrinsicManagerImpl(clang::Sema &S) : S(S) {
+ RISCVIntrinsicManagerImpl(clang::Sema &S) : S(S), StrPool(StrAlloc) {
ConstructedRISCVVBuiltins = false;
ConstructedRISCVSiFiveVectorBuiltins = false;
ConstructedRISCVAndesVectorBuiltins = false;
@@ -385,7 +390,8 @@ void RISCVIntrinsicManagerImpl::InitRVVIntrinsic(
uint32_t Index = IntrinsicList.size();
assert(IntrinsicList.size() == (size_t)Index &&
"Intrinsics indices overflow.");
- IntrinsicList.push_back({BuiltinName, Record.RequiredExtensions, Signature});
+ IntrinsicList.push_back(
+ {BuiltinName, StrPool.save(Record.RequiredExtensions), Signature});
// Creating mapping to Intrinsics.
Intrinsics.insert({Name, Index});
|
topperc
reviewed
Jun 10, 2025
clang/lib/Sema/SemaRISCV.cpp
Outdated
| @@ -385,7 +390,8 @@ void RISCVIntrinsicManagerImpl::InitRVVIntrinsic( | |||
| uint32_t Index = IntrinsicList.size(); | |||
| assert(IntrinsicList.size() == (size_t)Index && | |||
| "Intrinsics indices overflow."); | |||
| IntrinsicList.push_back({BuiltinName, Record.RequiredExtensions, Signature}); | |||
| IntrinsicList.push_back( | |||
| {BuiltinName, StrPool.save(Record.RequiredExtensions), Signature}); | |||
There was a problem hiding this comment.
Why do we need the StringSaver? Record.RequiredExtensions should already point to a single global string in the .rodata that was uniqued by the linker. We can just make a StringRef from that.
There was a problem hiding this comment.
Oh that's a good point, thanks!
This prevents many duplicated copies of required extensions string.
4vtomat
force-pushed
the
cache_required_ext_str
branch
from
947142e to
06013a6
Compare
4vtomat
changed the title
wangpc-pp
approved these changes
Jun 11, 2025
tomtor
pushed a commit
to tomtor/llvm-project
that referenced
this pull request
Jun 14, 2025
…#143503) This prevents many duplicated copies of required extensions string.
akuhlens
pushed a commit
to akuhlens/llvm-project
that referenced
this pull request
Jun 24, 2025
…#143503) This prevents many duplicated copies of required extensions string.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This prevents many duplicated copies of required extensions string.