Skip to content

[AMDGPU] Miscellaneous clang-format changes #75186

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
Dec 12, 2023
Merged

[AMDGPU] Miscellaneous clang-format changes #75186

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
2 changes: 2 additions & 0 deletions llvm/lib/Target/AMDGPU/AMDGPUArgumentUsageInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ struct KernArgPreloadDescriptor : public ArgDescriptor {
};

struct AMDGPUFunctionArgInfo {
// clang-format off
enum PreloadedValue {
// SGPRS:
PRIVATE_SEGMENT_BUFFER = 0,
Expand All @@ -120,6 +121,7 @@ struct AMDGPUFunctionArgInfo {
WORKITEM_ID_Z = 19,
FIRST_VGPR_VALUE = WORKITEM_ID_X
};
// clang-format on

// Kernel input registers setup for the HSA ABI in allocation order.

Expand Down
36 changes: 17 additions & 19 deletions llvm/lib/Target/AMDGPU/AMDGPURemoveIncompatibleFunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,23 @@ const SubtargetSubTypeKV *getGPUInfo(const GCNSubtarget &ST,
return nullptr;
}

constexpr unsigned FeaturesToCheck[] = {
AMDGPU::FeatureGFX11Insts,
AMDGPU::FeatureGFX10Insts,
AMDGPU::FeatureGFX9Insts,
AMDGPU::FeatureGFX8Insts,
AMDGPU::FeatureDPP,
AMDGPU::Feature16BitInsts,
AMDGPU::FeatureDot1Insts,
AMDGPU::FeatureDot2Insts,
AMDGPU::FeatureDot3Insts,
AMDGPU::FeatureDot4Insts,
AMDGPU::FeatureDot5Insts,
AMDGPU::FeatureDot6Insts,
AMDGPU::FeatureDot7Insts,
AMDGPU::FeatureDot8Insts,
AMDGPU::FeatureExtendedImageInsts,
AMDGPU::FeatureSMemRealTime,
AMDGPU::FeatureSMemTimeInst
};
constexpr unsigned FeaturesToCheck[] = {AMDGPU::FeatureGFX11Insts,
AMDGPU::FeatureGFX10Insts,
AMDGPU::FeatureGFX9Insts,
AMDGPU::FeatureGFX8Insts,
AMDGPU::FeatureDPP,
AMDGPU::Feature16BitInsts,
AMDGPU::FeatureDot1Insts,
AMDGPU::FeatureDot2Insts,
AMDGPU::FeatureDot3Insts,
AMDGPU::FeatureDot4Insts,
AMDGPU::FeatureDot5Insts,
AMDGPU::FeatureDot6Insts,
AMDGPU::FeatureDot7Insts,
AMDGPU::FeatureDot8Insts,
AMDGPU::FeatureExtendedImageInsts,
AMDGPU::FeatureSMemRealTime,
AMDGPU::FeatureSMemTimeInst};

FeatureBitset expandImpliedFeatures(const FeatureBitset &Features) {
FeatureBitset Result = Features;
Expand Down
3 changes: 3 additions & 0 deletions llvm/lib/Target/AMDGPU/SIDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,6 +1026,8 @@ enum Register_Flag : uint8_t {

} // namespace AMDGPU

// clang-format off

#define R_00B028_SPI_SHADER_PGM_RSRC1_PS 0x00B028
#define S_00B028_VGPRS(x) (((x) & 0x3F) << 0)
#define S_00B028_SGPRS(x) (((x) & 0x0F) << 6)
Expand Down Expand Up @@ -1134,6 +1136,7 @@ enum Register_Flag : uint8_t {
#define G_00B848_FWD_PROGRESS(x) (((x) >> 31) & 0x1)
#define C_00B848_FWD_PROGRESS 0x7FFFFFFF

// clang-format on

// Helpers for setting FLOAT_MODE
#define FP_ROUND_ROUND_TO_NEAREST 0
Expand Down