Skip to content

Reapply "[RISCV] Support RISCV Atomics ABI attributes (#84597)" #90266

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
ilovepi merged 12 commits into from
Jul 2, 2024
Merged

Reapply "[RISCV] Support RISCV Atomics ABI attributes (#84597)" #90266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d5fbe29
[𝘀𝗽𝗿] initial version
ilovepi Apr 26, 2024
849a8be
Remove braces and clean up LLD test
ilovepi May 2, 2024
907f6f0
git clang-format
ilovepi May 2, 2024
0f0a918
Add flag for attributes emmission
ilovepi May 10, 2024
a5f2150
Guard with flag instead of target feature
ilovepi Jun 24, 2024
ca50a59
Update enum type and diagnostic
ilovepi Jul 1, 2024
4742ccb
Try to make the mergeAtomic API more natural
ilovepi Jul 1, 2024
b408b8e
Simplify switch logic w/ return
ilovepi Jul 1, 2024
af797bb
clang-format
ilovepi Jul 1, 2024
ae9b94b
Split linker changes into separate patch
ilovepi Jul 1, 2024
cd78da5
Rebase
ilovepi Jul 1, 2024
76c8924
Fix default value in cl::opt and handle switch case in LLD.
ilovepi Jul 1, 2024
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
Prev Previous commit
Next Next commit
Guard with flag instead of target feature 
Created using spr 1.3.4
  • Loading branch information
@ilovepi
ilovepi committed Jun 24, 2024
commit a5f2150cbbc6504a3d898b993b7a5d7a388a715f
11 changes: 9 additions & 2 deletions llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,20 @@
#include "RISCVBaseInfo.h"
#include "RISCVMCTargetDesc.h"
#include "llvm/MC/MCSymbol.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/RISCVAttributes.h"
#include "llvm/TargetParser/RISCVISAInfo.h"

using namespace llvm;

// This option controls wether or not we emit ELF attributes for ABI features,
// like RISC-V atomics or X3 usage.
static cl::opt<bool>
RiscvAbiAttr("riscv-abi-attributes",
cl::desc("Enable emitting RISC-V ELF attributes for ABI features"),
cl::init(false), cl::Hidden);
Copy link
Member

@MaskRay MaskRay Jun 29, 2024

Choose a reason for hiding this comment

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

remove cl::init(false)

Copy link
Contributor Author

@ilovepi ilovepi Jul 1, 2024

Choose a reason for hiding this comment

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

done


RISCVTargetStreamer::RISCVTargetStreamer(MCStreamer &S) : MCTargetStreamer(S) {}

void RISCVTargetStreamer::finish() { finishAttributeSection(); }
Expand Down Expand Up @@ -76,8 +84,7 @@ void RISCVTargetStreamer::emitTargetAttributes(const MCSubtargetInfo &STI,
emitTextAttribute(RISCVAttrs::ARCH, ISAInfo->toString());
}

if (STI.hasFeature(RISCV::FeatureAbiAttributes) &&
STI.hasFeature(RISCV::FeatureStdExtA)) {
if (RiscvAbiAttr && STI.hasFeature(RISCV::FeatureStdExtA)) {
unsigned AtomicABITag = STI.hasFeature(RISCV::FeatureTrailingSeqCstFence)
? RISCVAttrs::RISCVAtomicAbiTag::AtomicABI::A6S
: RISCVAttrs::RISCVAtomicAbiTag::AtomicABI::A6C;
Expand Down
3 changes: 0 additions & 3 deletions llvm/lib/Target/RISCV/RISCVFeatures.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,9 +1247,6 @@ def FeatureTrailingSeqCstFence : SubtargetFeature<"seq-cst-trailing-fence",
"true",
"Enable trailing fence for seq-cst store.">;

def FeatureAbiAttributes : SubtargetFeature<"abi-attr", "EnableAbiAttributes",
"true", "Enable emitting RISC-V ABI attributes">;

def FeatureUnalignedScalarMem
: SubtargetFeature<"unaligned-scalar-mem", "EnableUnalignedScalarMem",
"true", "Has reasonably performant unaligned scalar "
Expand Down
5 changes: 3 additions & 2 deletions llvm/test/CodeGen/RISCV/attributes.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@
; RUN: llc -mtriple=riscv64 -mattr=+m %s -o - | FileCheck --check-prefixes=CHECK,RV64M %s
; RUN: llc -mtriple=riscv64 -mattr=+zmmul %s -o - | FileCheck --check-prefixes=CHECK,RV64ZMMUL %s
; RUN: llc -mtriple=riscv64 -mattr=+m,+zmmul %s -o - | FileCheck --check-prefixes=CHECK,RV64MZMMUL %s
; RUN: llc -mtriple=riscv64 -mattr=+a,+abi-attr %s -o - | FileCheck --check-prefixes=CHECK,RV64A,A6C %s
; RUN: llc -mtriple=riscv64 -mattr=+a,+seq-cst-trailing-fence,+abi-attr %s -o - | FileCheck --check-prefixes=CHECK,RV64A,A6S %s
; RUN: llc -mtriple=riscv64 -mattr=+a --riscv-abi-attributes %s -o - | FileCheck --check-prefixes=CHECK,RV64A,A6C %s
; RUN: llc -mtriple=riscv64 -mattr=+a,+seq-cst-trailing-fence --riscv-abi-attributes %s -o - | FileCheck --check-prefixes=CHECK,RV64A,A6S %s
; RUN: llc -mtriple=riscv64 -mattr=+b %s -o - | FileCheck --check-prefixes=CHECK,RV64B %s
; RUN: llc -mtriple=riscv64 -mattr=+f %s -o - | FileCheck --check-prefixes=CHECK,RV64F %s
; RUN: llc -mtriple=riscv64 -mattr=+d %s -o - | FileCheck --check-prefixes=CHECK,RV64D %s
; RUN: llc -mtriple=riscv64 -mattr=+c %s -o - | FileCheck --check-prefixes=CHECK,RV64C %s
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.