[llvm] r316097 - AMDGPU: Rename MaxFlatWorkgroupSize to MaxFlatWorkGroupSize for consistency
Konstantin Zhuravlyov via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 18 10:31:09 PDT 2017
Author: kzhuravl
Date: Wed Oct 18 10:31:09 2017
New Revision: 316097
URL: http://llvm.org/viewvc/llvm-project?rev=316097&view=rev
Log:
AMDGPU: Rename MaxFlatWorkgroupSize to MaxFlatWorkGroupSize for consistency
Differential Revision: https://reviews.llvm.org/D38957
Modified:
llvm/trunk/docs/AMDGPUUsage.rst
llvm/trunk/include/llvm/Support/AMDGPUKernelDescriptor.h
llvm/trunk/include/llvm/Support/AMDGPUMetadata.h
llvm/trunk/lib/Support/AMDGPUMetadata.cpp
llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
llvm/trunk/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll
llvm/trunk/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
llvm/trunk/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s
Modified: llvm/trunk/docs/AMDGPUUsage.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/AMDGPUUsage.rst?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/docs/AMDGPUUsage.rst (original)
+++ llvm/trunk/docs/AMDGPUUsage.rst Wed Oct 18 10:31:09 2017
@@ -1208,7 +1208,7 @@ non-AMD key names should be prefixed by
registers used by
each work-item for
GFX6-GFX9
- "MaxFlatWorkgroupSize" integer Maximum flat
+ "MaxFlatWorkGroupSize" integer Maximum flat
work-group size
supported by the
kernel in work-items.
@@ -1451,7 +1451,7 @@ CP microcode requires the Kernel descrit
then additional space must
be added to this value for
the call stack.
- 95:64 4 bytes MaxFlatWorkgroupSize Maximum flat work-group
+ 95:64 4 bytes MaxFlatWorkGroupSize Maximum flat work-group
size supported by the
kernel in work-items.
96 1 bit IsDynamicCallStack Indicates if the generated
Modified: llvm/trunk/include/llvm/Support/AMDGPUKernelDescriptor.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/AMDGPUKernelDescriptor.h?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/AMDGPUKernelDescriptor.h (original)
+++ llvm/trunk/include/llvm/Support/AMDGPUKernelDescriptor.h Wed Oct 18 10:31:09 2017
@@ -109,7 +109,7 @@ enum ComputePgmRsrc2 {
struct KernelDescriptor final {
uint32_t GroupSegmentFixedSize;
uint32_t PrivateSegmentFixedSize;
- uint32_t MaxFlatWorkgroupSize;
+ uint32_t MaxFlatWorkGroupSize;
uint64_t IsDynamicCallStack : 1;
uint64_t IsXNACKEnabled : 1;
uint64_t Reserved0 : 30;
Modified: llvm/trunk/include/llvm/Support/AMDGPUMetadata.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/AMDGPUMetadata.h?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/AMDGPUMetadata.h (original)
+++ llvm/trunk/include/llvm/Support/AMDGPUMetadata.h Wed Oct 18 10:31:09 2017
@@ -238,8 +238,8 @@ constexpr char WavefrontSize[] = "Wavefr
constexpr char NumSGPRs[] = "NumSGPRs";
/// \brief Key for Kernel::CodeProps::Metadata::mNumVGPRs.
constexpr char NumVGPRs[] = "NumVGPRs";
-/// \brief Key for Kernel::CodeProps::Metadata::mMaxFlatWorkgroupSize.
-constexpr char MaxFlatWorkgroupSize[] = "MaxFlatWorkgroupSize";
+/// \brief Key for Kernel::CodeProps::Metadata::mMaxFlatWorkGroupSize.
+constexpr char MaxFlatWorkGroupSize[] = "MaxFlatWorkGroupSize";
/// \brief Key for Kernel::CodeProps::Metadata::mIsDynamicCallStack.
constexpr char IsDynamicCallStack[] = "IsDynamicCallStack";
/// \brief Key for Kernel::CodeProps::Metadata::mIsXNACKEnabled.
@@ -268,7 +268,7 @@ struct Metadata final {
/// \brief Total number of VGPRs used by a workitem. Optional.
uint16_t mNumVGPRs = 0;
/// \brief Maximum flat work-group size supported by the kernel. Optional.
- uint32_t mMaxFlatWorkgroupSize = 0;
+ uint32_t mMaxFlatWorkGroupSize = 0;
/// \brief True if the generated machine code is using a dynamically sized
/// call stack. Optional.
bool mIsDynamicCallStack = false;
Modified: llvm/trunk/lib/Support/AMDGPUMetadata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/AMDGPUMetadata.cpp?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/lib/Support/AMDGPUMetadata.cpp (original)
+++ llvm/trunk/lib/Support/AMDGPUMetadata.cpp Wed Oct 18 10:31:09 2017
@@ -142,8 +142,8 @@ struct MappingTraits<Kernel::CodeProps::
MD.mNumSGPRs, uint16_t(0));
YIO.mapOptional(Kernel::CodeProps::Key::NumVGPRs,
MD.mNumVGPRs, uint16_t(0));
- YIO.mapOptional(Kernel::CodeProps::Key::MaxFlatWorkgroupSize,
- MD.mMaxFlatWorkgroupSize, uint32_t(0));
+ YIO.mapOptional(Kernel::CodeProps::Key::MaxFlatWorkGroupSize,
+ MD.mMaxFlatWorkGroupSize, uint32_t(0));
YIO.mapOptional(Kernel::CodeProps::Key::IsDynamicCallStack,
MD.mIsDynamicCallStack, false);
YIO.mapOptional(Kernel::CodeProps::Key::IsXNACKEnabled,
Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp Wed Oct 18 10:31:09 2017
@@ -1179,7 +1179,7 @@ AMDGPU::HSAMD::Kernel::CodeProps::Metada
HSACodeProps.mWavefrontSize = STM.getWavefrontSize();
HSACodeProps.mNumSGPRs = CurrentProgramInfo.NumSGPR;
HSACodeProps.mNumVGPRs = CurrentProgramInfo.NumVGPR;
- HSACodeProps.mMaxFlatWorkgroupSize = MFI.getMaxFlatWorkGroupSize();
+ HSACodeProps.mMaxFlatWorkGroupSize = MFI.getMaxFlatWorkGroupSize();
HSACodeProps.mIsDynamicCallStack = ProgramInfo.DynamicCallStack;
HSACodeProps.mIsXNACKEnabled = STM.isXNACKEnabled();
Modified: llvm/trunk/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/attr-amdgpu-flat-work-group-size.ll Wed Oct 18 10:31:09 2017
@@ -133,10 +133,10 @@ attributes #3 = {"amdgpu-flat-work-group
; HSAMD: Version: [ 1, 0 ]
; HSAMD: Kernels:
; HSAMD: - Name: min_64_max_64
-; HSAMD: MaxFlatWorkgroupSize: 64
+; HSAMD: MaxFlatWorkGroupSize: 64
; HSAMD: - Name: min_64_max_128
-; HSAMD: MaxFlatWorkgroupSize: 128
+; HSAMD: MaxFlatWorkGroupSize: 128
; HSAMD: - Name: min_128_max_128
-; HSAMD: MaxFlatWorkgroupSize: 128
+; HSAMD: MaxFlatWorkGroupSize: 128
; HSAMD: - Name: min_1024_max_2048
-; HSAMD: MaxFlatWorkgroupSize: 2048
+; HSAMD: MaxFlatWorkGroupSize: 2048
Modified: llvm/trunk/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/hsa-metadata-kernel-code-props.ll Wed Oct 18 10:31:09 2017
@@ -20,7 +20,7 @@
; GFX700: NumVGPRs: 4
; GFX800: NumVGPRs: 6
; GFX900: NumVGPRs: 6
-; CHECK: MaxFlatWorkgroupSize: 256
+; CHECK: MaxFlatWorkGroupSize: 256
define amdgpu_kernel void @test(
half addrspace(1)* %r,
half addrspace(1)* %a,
Modified: llvm/trunk/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s?rev=316097&r1=316096&r2=316097&view=diff
==============================================================================
--- llvm/trunk/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s (original)
+++ llvm/trunk/test/MC/AMDGPU/hsa-metadata-kernel-code-props.s Wed Oct 18 10:31:09 2017
@@ -13,7 +13,7 @@
// CHECK: PrivateSegmentFixedSize: 16
// CHECK: KernargSegmentAlign: 16
// CHECK: WavefrontSize: 64
-// CHECK: MaxFlatWorkgroupSize: 256
+// CHECK: MaxFlatWorkGroupSize: 256
.amd_amdgpu_hsa_metadata
Version: [ 1, 0 ]
Printf: [ '1:1:4:%d\n', '2:1:8:%g\n' ]
@@ -26,5 +26,5 @@
PrivateSegmentFixedSize: 16
KernargSegmentAlign: 16
WavefrontSize: 64
- MaxFlatWorkgroupSize: 256
+ MaxFlatWorkGroupSize: 256
.end_amd_amdgpu_hsa_metadata
More information about the llvm-commits
mailing list