Skip to content

Commit 867a538

Browse files
author
Martin Wehking
committed
Rename devicelib files
Use AMD and NVIDIA target triples in the names of our generated devicelib files to be more concise.
1 parent b0db6dd commit 867a538

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@ SYCL::getDeviceLibraries(const Compilation &C, const llvm::Triple &TargetTriple,
276276
}
277277

278278
if (TargetTriple.isNVPTX() && IgnoreSingleLibs)
279-
LibraryList.push_back(Args.MakeArgString("devicelib--cuda.bc"));
279+
LibraryList.push_back(Args.MakeArgString("devicelib-nvptx64-nvidia-cuda.bc"));
280280

281281
if (TargetTriple.isAMDGCN() && IgnoreSingleLibs)
282-
LibraryList.push_back(Args.MakeArgString("devicelib--amd.bc"));
282+
LibraryList.push_back(Args.MakeArgString("devicelib-amdgcn-amd-amdhsa.bc"));
283283

284284
if (IgnoreSingleLibs)
285285
return LibraryList;

‎clang/test/Driver/Inputs/SYCL/lib/devicelib--amd.bc‎ renamed to ‎clang/test/Driver/Inputs/SYCL/lib/devicelib-amdgcn-amd-amdhsa.bc‎

File renamed without changes.

‎clang/test/Driver/Inputs/SYCL/lib/devicelib--cuda.bc‎ renamed to ‎clang/test/Driver/Inputs/SYCL/lib/devicelib-nvptx64-nvidia-cuda.bc‎

File renamed without changes.

‎clang/test/Driver/sycl-device-lib-amdgcn.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
// RUN: -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906 %s 2>&1 \
1111
// RUN: | FileCheck -check-prefix=CHK-NO-DEVLIB %s
1212

13-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--amd.bc", ir, (device-sycl, gfx906)
13+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-amdgcn-amd-amdhsa.bc", ir, (device-sycl, gfx906)
1414
// CHK-NO-DEVLIB: [[LIB1:[0-9]+]]: input, "{{.*}}libsycl-itt-user-wrappers.bc", ir, (device-sycl, gfx906)
15-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--amd.bc", ir, (device-sycl, gfx906)
15+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-amdgcn-amd-amdhsa.bc", ir, (device-sycl, gfx906)
1616
// CHK-NO-DEVLIB: [[LIB2:[0-9]+]]: input, "{{.*}}libsycl-itt-compiler-wrappers.bc", ir, (device-sycl, gfx906)
17-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--amd.bc", ir, (device-sycl, gfx906)
17+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-amdgcn-amd-amdhsa.bc", ir, (device-sycl, gfx906)
1818
// CHK-NO-DEVLIB: [[LIB3:[0-9]+]]: input, "{{.*}}libsycl-itt-stubs.bc", ir, (device-sycl, gfx906)
19-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--amd.bc", ir, (device-sycl, gfx906)
19+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-amdgcn-amd-amdhsa.bc", ir, (device-sycl, gfx906)
2020
// CHK-NO-DEVLIB: {{[0-9]+}}: linker, {{{.*}}[[LIB1]], [[LIB2]], [[LIB3]]{{.*}}}, ir, (device-sycl, gfx906)
2121

2222
// Check that the -fsycl-device-lib flag has no effect when "all" is specified.
@@ -39,7 +39,7 @@
3939
// RUN: | FileCheck -check-prefixes=CHK-UNUSED-WARN,CHK-ALL %s
4040

4141
// CHK-UNUSED-WARN: warning: argument unused during compilation: '-fno-sycl-device-lib='
42-
// CHK-ALL: [[DEVLIB:[0-9]+]]: input, "{{.*}}devicelib--amd.bc", ir, (device-sycl, gfx906)
42+
// CHK-ALL: [[DEVLIB:[0-9]+]]: input, "{{.*}}devicelib-amdgcn-amd-amdhsa.bc", ir, (device-sycl, gfx906)
4343
// CHK-ALL: {{[0-9]+}}: linker, {{{.*}}[[DEVLIB]]{{.*}}}, ir, (device-sycl, gfx906)
4444

4545
// Check that llvm-link uses the "-only-needed" flag.
@@ -48,4 +48,4 @@
4848
// RUN: -fsycl -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906 %s 2>&1 \
4949
// RUN: | FileCheck -check-prefix=CHK-ONLY-NEEDED %s
5050

51-
// CHK-ONLY-NEEDED: llvm-link"{{.*}}"-only-needed"{{.*}}"{{.*}}devicelib--amd.bc"{{.*}}
51+
// CHK-ONLY-NEEDED: llvm-link"{{.*}}"-only-needed"{{.*}}"{{.*}}devicelib-amdgcn-amd-amdhsa.bc"{{.*}}

‎clang/test/Driver/sycl-device-lib-nvptx.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
// RUN: -fsycl-targets=nvptx64-nvidia-cuda %s 2>&1 \
1111
// RUN: | FileCheck -check-prefix=CHK-NO-DEVLIB %s
1212

13-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--cuda.bc", ir, (device-sycl, sm_50)
13+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-nvptx64-nvidia-cuda.bc", ir, (device-sycl, sm_50)
1414
// CHK-NO-DEVLIB: [[LIB1:[0-9]+]]: input, "{{.*}}libsycl-itt-user-wrappers.bc", ir, (device-sycl, sm_50)
15-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--cuda.bc", ir, (device-sycl, sm_50)
15+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-nvptx64-nvidia-cuda.bc", ir, (device-sycl, sm_50)
1616
// CHK-NO-DEVLIB: [[LIB2:[0-9]+]]: input, "{{.*}}libsycl-itt-compiler-wrappers.bc", ir, (device-sycl, sm_50)
17-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--cuda.bc", ir, (device-sycl, sm_50)
17+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-nvptx64-nvidia-cuda.bc", ir, (device-sycl, sm_50)
1818
// CHK-NO-DEVLIB: [[LIB3:[0-9]+]]: input, "{{.*}}libsycl-itt-stubs.bc", ir, (device-sycl, sm_50)
19-
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib--cuda.bc", ir, (device-sycl, sm_50)
19+
// CHK-NO-DEVLIB-NOT: {{[0-9]+}}: input, "{{.*}}devicelib-nvptx64-nvidia-cuda.bc", ir, (device-sycl, sm_50)
2020
// CHK-NO-DEVLIB: {{[0-9]+}}: linker, {{{.*}}[[LIB1]], [[LIB2]], [[LIB3]]{{.*}}}, ir, (device-sycl, sm_50)
2121

2222
// Check that the -fsycl-device-lib flag has no effect when "all" is specified.
@@ -39,12 +39,12 @@
3939
// RUN: | FileCheck -check-prefixes=CHK-UNUSED-WARN,CHK-ALL %s
4040

4141
// CHK-UNUSED-WARN: warning: argument unused during compilation: '-fno-sycl-device-lib='
42-
// CHK-ALL: [[DEVLIB:[0-9]+]]: input, "{{.*}}devicelib--cuda.bc", ir, (device-sycl, sm_50)
42+
// CHK-ALL: [[DEVLIB:[0-9]+]]: input, "{{.*}}devicelib-nvptx64-nvidia-cuda.bc", ir, (device-sycl, sm_50)
4343
// CHK-ALL: {{[0-9]+}}: linker, {{{.*}}[[DEVLIB]]{{.*}}}, ir, (device-sycl, sm_50)
4444

4545
// Check that llvm-link uses the "-only-needed" flag.
4646
// Not using the flag breaks kernel bundles.
4747
// RUN: %clangxx -### -nocudalib -fno-sycl-libspirv --sysroot=%S/Inputs/SYCL -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s 2>&1 \
4848
// RUN: | FileCheck -check-prefix=CHK-ONLY-NEEDED %s
4949

50-
// CHK-ONLY-NEEDED: llvm-link"{{.*}}"-only-needed"{{.*}}"{{.*}}devicelib--cuda.bc"{{.*}}
50+
// CHK-ONLY-NEEDED: llvm-link"{{.*}}"-only-needed"{{.*}}"{{.*}}devicelib-nvptx64-nvidia-cuda.bc"{{.*}}

‎clang/test/Driver/sycl-offload-amdgcn.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
// CHK-PHASES-NO-CC: 7: backend, {6}, assembler, (host-sycl)
3838
// CHK-PHASES-NO-CC: 8: assembler, {7}, object, (host-sycl)
3939
// CHK-PHASES-NO-CC: 9: linker, {4}, ir, (device-sycl, gfx906)
40-
// CHK-PHASES-NO-CC: 10: input, "{{.*}}devicelib--amd.bc", ir, (device-sycl, gfx906)
40+
// CHK-PHASES-NO-CC: 10: input, "{{.*}}devicelib-amdgcn-amd-amdhsa.bc", ir, (device-sycl, gfx906)
4141
// CHK-PHASES-NO-CC: 11: linker, {9, 10}, ir, (device-sycl, gfx906)
4242
// CHK-PHASES-NO-CC: 12: sycl-post-link, {11}, ir, (device-sycl, gfx906)
4343
// CHK-PHASES-NO-CC: 13: file-table-tform, {12}, ir, (device-sycl, gfx906)

‎libdevice/cmake/modules/SYCLLibdevice.cmake‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ endforeach()
7171
# Additional compilation options are needed for compiling each device library.
7272
set(devicelib_arch)
7373
if ("NVPTX" IN_LIST LLVM_TARGETS_TO_BUILD)
74-
list(APPEND devicelib_arch cuda)
75-
set(compile_opts_cuda "-fsycl-targets=nvptx64-nvidia-cuda"
74+
list(APPEND devicelib_arch nvptx64-nvidia-cuda)
75+
set(compile_opts_nvptx64-nvidia-cuda "-fsycl-targets=nvptx64-nvidia-cuda"
7676
"-Xsycl-target-backend" "--cuda-gpu-arch=sm_50" "-nocudalib")
77-
set(opt_flags_cuda "-O3" "--nvvm-reflect-enable=false")
77+
set(opt_flags_nvptx64-nvidia-cuda "-O3" "--nvvm-reflect-enable=false")
7878
endif()
7979
if("AMDGPU" IN_LIST LLVM_TARGETS_TO_BUILD)
80-
list(APPEND devicelib_arch amd)
81-
set(compile_opts_amd "-nogpulib" "-fsycl-targets=amdgcn-amd-amdhsa"
80+
list(APPEND devicelib_arch amdgcn-amd-amdhsa)
81+
set(compile_opts_amdgcn-amd-amdhsa "-nogpulib" "-fsycl-targets=amdgcn-amd-amdhsa"
8282
"-Xsycl-target-backend" "--offload-arch=gfx940")
83-
set(opt_flags_amd "-O3" "--amdgpu-oclc-reflect-enable=false")
83+
set(opt_flags_amdgcn-amd-amdhsa "-O3" "--amdgpu-oclc-reflect-enable=false")
8484
endif()
8585

8686

@@ -181,14 +181,14 @@ function(add_devicelibs filename)
181181
endforeach()
182182

183183
foreach(arch IN LISTS devicelib_arch)
184-
compile_lib(${filename}--${arch}
184+
compile_lib(${filename}-${arch}
185185
FILETYPE bc
186186
SRC ${ARG_SRC}
187187
DEPENDENCIES ${ARG_DEPENDENCIES}
188188
EXTRA_OPTS ${ARG_EXTRA_OPTS} ${bc_device_compile_opts}
189189
${compile_opts_${arch}})
190190

191-
append_to_property(${bc_binary_dir}/${filename}--${arch}.bc
191+
append_to_property(${bc_binary_dir}/${filename}-${arch}.bc
192192
PROPERTY_NAME BC_DEVICE_LIBS_${arch})
193193
endforeach()
194194
endfunction()
@@ -471,7 +471,7 @@ foreach(arch IN LISTS devicelib_arch)
471471
endforeach()
472472
endforeach()
473473

474-
# Create one large bitcode file for the CUDA and AMD targets.
474+
# Create one large bitcode file for the NVPTX and AMD targets.
475475
# Use all the files collected in the respective global properties.
476476
foreach(arch IN LISTS devicelib_arch)
477477
get_property(BC_DEVICE_LIBS_${arch} GLOBAL PROPERTY BC_DEVICE_LIBS_${arch})
@@ -486,15 +486,15 @@ foreach(arch IN LISTS devicelib_arch)
486486

487487
# Run the optimizer on the resulting bitcode file and call prepare_builtins
488488
# on it, which strips away debug and arch information.
489-
process_bc(devicelib--${arch}.bc
489+
process_bc(devicelib-${arch}.bc
490490
LIB_TGT builtins_${arch}.opt
491491
IN_FILE ${builtins_link_lib_${arch}}
492492
OUT_DIR ${bc_binary_dir}
493493
OPT_FLAGS ${opt_flags_${arch}}
494494
DEPENDENCIES device_lib_device_${arch})
495-
add_dependencies(libsycldevice-bc prepare-devicelib--${arch}.bc)
495+
add_dependencies(libsycldevice-bc prepare-devicelib-${arch}.bc)
496496
set(complete_${arch}_libdev
497-
$<TARGET_PROPERTY:prepare-devicelib--${arch}.bc,TARGET_FILE>)
497+
$<TARGET_PROPERTY:prepare-devicelib-${arch}.bc,TARGET_FILE>)
498498
install( FILES ${complete_${arch}_libdev}
499499
DESTINATION ${install_dest_bc}
500500
COMPONENT libsycldevice)

0 commit comments

Comments
 (0)