Skip to content

Commit 05183b9

Browse files
author
Salinas, David
authored
[clang][AMDGPU] Enable module splitting by default (llvm#128509) (llvm#1535)
2 parents 538b36b + 38e98c3 commit 05183b9

File tree

8 files changed

+94
-4
lines changed

8 files changed

+94
-4
lines changed

‎clang/include/clang/Driver/Options.td‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,6 +1480,8 @@ def fhip_emit_relocatable : Flag<["-"], "fhip-emit-relocatable">,
14801480
HelpText<"Compile HIP source to relocatable">;
14811481
def fno_hip_emit_relocatable : Flag<["-"], "fno-hip-emit-relocatable">,
14821482
HelpText<"Do not override toolchain to compile HIP source to relocatable">;
1483+
def flto_partitions_EQ : Joined<["--"], "flto-partitions=">, Group<hip_Group>,
1484+
HelpText<"Number of partitions to use for parallel full LTO codegen. Use 1 to disable partitioning.">;
14831485
}
14841486

14851487
// Clang specific/exclusive options for OpenACC.

‎clang/lib/Driver/ToolChains/AMDGPU.cpp‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,11 @@ void amdgpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
631631
getToolChain().AddFilePathLibArgs(Args, CmdArgs);
632632
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
633633
if (C.getDriver().isUsingLTO()) {
634-
addLTOOptions(getToolChain(), Args, CmdArgs, Output, Inputs[0],
635-
C.getDriver().getLTOMode() == LTOK_Thin);
634+
const bool ThinLTO = (C.getDriver().getLTOMode() == LTOK_Thin);
635+
addLTOOptions(getToolChain(), Args, CmdArgs, Output, Inputs[0], ThinLTO);
636+
637+
if (!ThinLTO)
638+
addFullLTOPartitionOption(C.getDriver(), Args, CmdArgs);
636639
} else if (Args.hasArg(options::OPT_mcpu_EQ)) {
637640
CmdArgs.push_back(Args.MakeArgString(
638641
"-plugin-opt=mcpu=" +
@@ -760,6 +763,33 @@ llvm::SmallVector<std::string, 12> amdgpu::dlr::getCommonDeviceLibNames(
760763
FastRelaxedMath, CorrectSqrt, ABIVer, isOpenMP);
761764
}
762765

766+
static unsigned getFullLTOPartitions(const Driver &D, const ArgList &Args) {
767+
const Arg *A = Args.getLastArg(options::OPT_flto_partitions_EQ);
768+
// In the absence of an option, use 8 as the default.
769+
if (!A)
770+
return 8;
771+
int Value = 0;
772+
if (StringRef(A->getValue()).getAsInteger(10, Value) || (Value < 1)) {
773+
D.Diag(diag::err_drv_invalid_int_value)
774+
<< A->getAsString(Args) << A->getValue();
775+
return 1;
776+
}
777+
778+
return Value;
779+
}
780+
781+
void amdgpu::addFullLTOPartitionOption(const Driver &D,
782+
const llvm::opt::ArgList &Args,
783+
llvm::opt::ArgStringList &CmdArgs) {
784+
// TODO: Should this be restricted to fgpu-rdc only ? Currently we'll
785+
// also do it for non gpu-rdc LTO
786+
787+
if (unsigned NumParts = getFullLTOPartitions(D, Args); NumParts > 1) {
788+
CmdArgs.push_back(
789+
Args.MakeArgString("--lto-partitions=" + Twine(NumParts)));
790+
}
791+
}
792+
763793
/// AMDGPU Toolchain
764794
AMDGPUToolChain::AMDGPUToolChain(const Driver &D, const llvm::Triple &Triple,
765795
const ArgList &Args)

‎clang/lib/Driver/ToolChains/AMDGPU.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ const char *getLldCommandArgs(
8282
const std::optional<std::string> OutputFilePrefix = std::nullopt);
8383
} // end namespace dlr
8484

85+
void addFullLTOPartitionOption(const Driver &D, const llvm::opt::ArgList &Args,
86+
llvm::opt::ArgStringList &CmdArgs);
8587
} // end namespace amdgpu
8688
} // end namespace tools
8789

‎clang/lib/Driver/ToolChains/HIPAMD.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
123123

124124
addLinkerCompressDebugSectionsOption(TC, Args, LldArgs);
125125

126+
amdgpu::addFullLTOPartitionOption(D, Args, LldArgs);
127+
126128
// Given that host and device linking happen in separate processes, the device
127129
// linker doesn't always have the visibility as to which device symbols are
128130
// needed by a program, especially for the device symbol dependencies that are

‎clang/test/Driver/amdgpu-toolchain.c‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
// AS_LINK_UR: ld.lld{{.*}} "--no-undefined"{{.*}} "--unresolved-symbols=ignore-all"
2020

2121
// RUN: %clang -### --target=amdgcn-amd-amdhsa -mcpu=gfx90a:xnack+:sramecc- -nogpulib \
22-
// RUN: -L. -flto -fconvergent-functions %s 2>&1 | FileCheck -check-prefixes=LTO,MCPU %s
22+
// RUN: -L. -flto -fconvergent-functions %s 2>&1 | FileCheck -check-prefix=LTO %s
23+
// LTO: clang{{.*}} "-flto=full"{{.*}}"-fconvergent-functions"
24+
// LTO: ld.lld{{.*}}"-L."{{.*}}"-plugin-opt=mcpu=gfx90a"{{.*}}"--lto-partitions={{[0-9]+}}"{{.*}}"-plugin-opt=-mattr=-sramecc,+xnack"
25+
2326
// RUN: %clang -### --target=amdgcn-amd-amdhsa -mcpu=gfx90a:xnack+:sramecc- -nogpulib \
2427
// RUN: -L. -fconvergent-functions %s 2>&1 | FileCheck -check-prefix=MCPU %s
25-
// LTO: clang{{.*}} "-flto=full"{{.*}}"-fconvergent-functions"
2628
// MCPU: ld.lld{{.*}}"-L."{{.*}}"-plugin-opt=mcpu=gfx90a"{{.*}}"-plugin-opt=-mattr=-sramecc,+xnack"
2729

2830
// RUN: %clang -### --target=amdgcn-amd-amdhsa -mcpu=gfx906 -nogpulib \
@@ -36,3 +38,17 @@
3638
// RUN: %clang -target amdgcn-amd-amdhsa -march=gfx90a -stdlib -startfiles \
3739
// RUN: -nogpulib -nogpuinc -### %s 2>&1 | FileCheck -check-prefix=STARTUP %s
3840
// STARTUP: ld.lld{{.*}}"-lc" "-lm" "{{.*}}crt1.o"
41+
42+
// Check --flto-partitions
43+
44+
// RUN: %clang -### --target=amdgcn-amd-amdhsa -mcpu=gfx90a -nogpulib \
45+
// RUN: -L. -flto --flto-partitions=42 %s 2>&1 | FileCheck -check-prefix=LTO_PARTS %s
46+
// LTO_PARTS: ld.lld{{.*}}"-L."{{.*}}"-plugin-opt=mcpu=gfx90a"{{.*}}"--lto-partitions=42"
47+
48+
// RUN: not %clang -### --target=amdgcn-amd-amdhsa -mcpu=gfx90a -nogpulib \
49+
// RUN: -L. -flto --flto-partitions=a %s 2>&1 | FileCheck -check-prefix=LTO_PARTS_INV0 %s
50+
// LTO_PARTS_INV0: clang: error: invalid integral value 'a' in '--flto-partitions=a'
51+
52+
// RUN: not %clang -### --target=amdgcn-amd-amdhsa -mcpu=gfx90a -nogpulib \
53+
// RUN: -L. -flto --flto-partitions=0 %s 2>&1 | FileCheck -check-prefix=LTO_PARTS_INV1 %s
54+
// LTO_PARTS_INV1: clang: error: invalid integral value '0' in '--flto-partitions=0'

‎clang/test/Driver/hip-toolchain-rdc-flto-partitions.hip‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// RUN: %clang -### --target=x86_64-linux-gnu \
2+
// RUN: -x hip --cuda-gpu-arch=gfx803 --flto-partitions=42 \
3+
// RUN: --no-offload-new-driver --emit-static-lib -nogpulib \
4+
// RUN: -fuse-ld=lld -B%S/Inputs/lld -fgpu-rdc -nogpuinc \
5+
// RUN: %S/Inputs/hip_multiple_inputs/a.cu \
6+
// RUN: %S/Inputs/hip_multiple_inputs/b.hip \
7+
// RUN: 2>&1 | FileCheck %s --check-prefix=FIXED-PARTS
8+
9+
// FIXED-PARTS-NOT: "*.llvm-link"
10+
// FIXED-PARTS-NOT: ".*opt"
11+
// FIXED-PARTS-NOT: ".*llc"
12+
// FIXED-PARTS: [[LLD: ".*lld.*"]] {{.*}} "-plugin-opt=-amdgpu-internalize-symbols"
13+
// FIXED-PARTS-SAME: "-plugin-opt=mcpu=gfx803"
14+
// FIXED-PARTS-SAME: "--lto-partitions=42"
15+
// FIXED-PARTS-SAME: "-o" "{{.*out}}" "{{.*bc}}"
16+
17+
// RUN: not %clang -### --target=x86_64-linux-gnu \
18+
// RUN: -x hip --cuda-gpu-arch=gfx803 --flto-partitions=a \
19+
// RUN: --no-offload-new-driver --emit-static-lib -nogpulib \
20+
// RUN: -fuse-ld=lld -B%S/Inputs/lld -fgpu-rdc -nogpuinc \
21+
// RUN: %S/Inputs/hip_multiple_inputs/a.cu \
22+
// RUN: %S/Inputs/hip_multiple_inputs/b.hip \
23+
// RUN: 2>&1 | FileCheck %s --check-prefix=LTO_PARTS_INV0
24+
25+
// LTO_PARTS_INV0: clang: error: invalid integral value 'a' in '--flto-partitions=a'
26+
27+
// RUN: not %clang -### --target=x86_64-linux-gnu \
28+
// RUN: -x hip --cuda-gpu-arch=gfx803 --flto-partitions=0 \
29+
// RUN: --no-offload-new-driver --emit-static-lib -nogpulib \
30+
// RUN: -fuse-ld=lld -B%S/Inputs/lld -fgpu-rdc -nogpuinc \
31+
// RUN: %S/Inputs/hip_multiple_inputs/a.cu \
32+
// RUN: %S/Inputs/hip_multiple_inputs/b.hip \
33+
// RUN: 2>&1 | FileCheck %s --check-prefix=LTO_PARTS_INV1
34+
35+
// LTO_PARTS_INV1: clang: error: invalid integral value '0' in '--flto-partitions=0'

‎clang/test/Driver/hip-toolchain-rdc-static-lib.hip‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
// CHECK-NOT: ".*llc"
5050
// CHECK: [[LLD: ".*lld.*"]] {{.*}} "-plugin-opt=-amdgpu-internalize-symbols"
5151
// CHECK-SAME: "-plugin-opt=mcpu=gfx803"
52+
// CHECK-SAME: "--lto-partitions={{[0-9]+}}"
5253
// CHECK-SAME: "-o" "[[IMG_DEV1:.*out]]" [[A_BC1]] [[B_BC1]]
5354

5455
// generate image for device side path on gfx900
@@ -77,6 +78,7 @@
7778
// CHECK-NOT: ".*llc"
7879
// CHECK: [[LLD]] {{.*}} "-plugin-opt=-amdgpu-internalize-symbols"
7980
// CHECK-SAME: "-plugin-opt=mcpu=gfx900"
81+
// CHECK-SAME: "--lto-partitions={{[0-9]+}}"
8082
// CHECK-SAME: "--whole-archive"
8183
// CHECK-SAME: "-o" "[[IMG_DEV2:.*out]]" [[A_BC2]] [[B_BC2]]
8284
// CHECK-SAME: "--no-whole-archive"

‎clang/test/Driver/hip-toolchain-rdc.hip‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
// CHECK-NOT: ".*llc"
148148
// CHECK: {{".*lld.*"}} {{.*}} "-plugin-opt=-amdgpu-internalize-symbols"
149149
// CHECK-SAME: "-plugin-opt=mcpu=gfx900"
150+
// CHECK-SAME: "--lto-partitions={{[0-9]+}}"
150151
// CHECK-SAME: "-o" "[[IMG_DEV2:.*.out]]" [[A_BC2]] [[B_BC2]]
151152

152153
// combine images generated into hip fat binary object

0 commit comments

Comments
 (0)